blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-21 17:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci

Browse Source 
Conflicts:
	application/views/templates/footer.php
	application/views/templates/header.php
This commit is contained in:
Paminger
2016-06-21 11:28:46 +02:00
parent dbe19fafb5 6dc145d618
commit 6e62fbdcd4
9 changed files with 462 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/content/DmsFS_model.php
+13
View File
@@ -0,0 +1,13 @@
<?php
class DmsFS_model extends FS_Model
{
/**
* Constructor
*/
public function __construct()
{
parent::__construct();
$this->filepath = DMS_PATH;
}
}
application/models/content/DmsVersion_model.php
+53
View File
@@ -0,0 +1,53 @@
<?php
class DmsVersion_model extends DB_Model
{
/**
* Constructor
*/
public function __construct()
{
parent::__construct();
$this->dbTable = 'campus.tbl_dms_version';
$this->pk = array('dms_id', 'version');
$this->hasSequence = false;
}
/**
*
*/
public function filterFields($dms, $dms_id = null, $fileName = null)
{
$fieldsArray = array(
'version',
'mimetype',
'name',
'beschreibung',
'letzterzugriff',
'insertamum',
'insertvon',
'updateamum',
'updatevon'
);
$returnArray = array();
foreach ($fieldsArray as $value)
{
if (isset($dms[$value]))
{
$returnArray[$value] = $dms[$value];
}
}
if (isset($dms_id))
{
$returnArray['dms_id'] = $dms_id;
}
if (isset($fileName))
{
$returnArray['filename'] = $fileName;
}
return $returnArray;
}
}
application/models/content/Dms_model.php
+14 -31
View File
@@ -12,39 +12,22 @@ class Dms_model extends DB_Model
$this->pk = 'dms_id';
}
public function insertDmsVersion($data)
/**
*
*/
public function filterFields($dms)
{
$tableName = 'campus.tbl_dms_version';
$fieldsArray = array('oe_kurzbz', 'dokument_kurzbz', 'kategorie_kurzbz');
$returnArray = array();
// Check rights
if (! $this->fhc_db_acl->isBerechtigt($this->acl[$tableName], 'i'))
return $this->_error(lang('fhc_'.FHC_NORIGHT).' -> '.$this->acl[$tableName], FHC_MODEL_ERROR);
// DB-INSERT
if ($this->db->insert($tableName, $data))
return $this->_success($this->db->insert_id());
else
return $this->_error($this->db->error(), FHC_DB_ERROR);
}
public function updateDmsVersion($id, $data)
{
$tableName = 'campus.tbl_dms_version';
foreach ($fieldsArray as $value)
{
if (isset($dms[$value]))
{
$returnArray[$value] = $dms[$value];
}
}
// Check Class-Attributes
if (is_null($this->pk))
return $this->_error(lang('fhc_'.FHC_NOPK), FHC_MODEL_ERROR);
// Check rights
if (! $this->fhc_db_acl->isBerechtigt($this->acl[$tableName], 'u'))
return $this->_error(lang('fhc_'.FHC_NORIGHT).' -> '.$this->acl[$tableName], FHC_MODEL_ERROR);
// DB-UPDATE
$this->db->where('dms_id', $id);
if ($this->db->update($tableName, $data))
return $this->_success($id);
else
return $this->_error($this->db->error(), FHC_DB_ERROR);
return $returnArray;
}
}