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

Merge origin/ci into ci

Browse Source
This commit is contained in:
paolo
2016-06-24 13:22:43 +02:00
parent 9a4f5480c4 74186cc5c6
commit c2c4620af9
5 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/DB_Model.php
+20 -10
View File
@@ -137,9 +137,11 @@ class DB_Model extends FHC_Model
return $this->_error(lang('fhc_'.FHC_NOPK), FHC_MODEL_ERROR);
// Check rights
if (! $this->fhc_db_acl->isBerechtigt($this->acl[$this->dbTable], 's'))
return $this->_error(lang('fhc_'.FHC_NORIGHT).' -> '.$this->acl[$this->dbTable], FHC_MODEL_ERROR);
// Check rights only if this method is called from a model
//var_dump(get_called_class());
if (substr(get_called_class(), -6) == '_model')
if (! $this->fhc_db_acl->isBerechtigt($this->acl[$this->dbTable], 's'))
return $this->_error(lang('fhc_'.FHC_NORIGHT).' -> '.$this->acl[$this->dbTable], FHC_MODEL_ERROR);
// DB-SELECT
// Check for composite Primary Key
@@ -173,8 +175,11 @@ class DB_Model extends FHC_Model
return $this->_error(lang('fhc_'.FHC_NODBTABLE), FHC_MODEL_ERROR);
// Check rights
if (! $this->fhc_db_acl->isBerechtigt($this->acl[$this->dbTable], 's'))
return $this->_error(lang('fhc_'.FHC_NORIGHT).' -> '.$this->acl[$this->dbTable], FHC_MODEL_ERROR);
// Check rights only if this method is called from a model
//var_dump(get_called_class());
if (substr(get_called_class(), -6) == '_model')
if (! $this->fhc_db_acl->isBerechtigt($this->acl[$this->dbTable], 's'))
return $this->_error(lang('fhc_'.FHC_NORIGHT).' -> '.$this->acl[$this->dbTable], FHC_MODEL_ERROR);
// DB-SELECT
if (is_null($where))
@@ -199,8 +204,11 @@ class DB_Model extends FHC_Model
return $this->_error(lang('fhc_'.FHC_NODBTABLE), FHC_MODEL_ERROR);
// Check rights for joined table
if (! $this->fhc_db_acl->isBerechtigt($this->acl[$joinTable], 's'))
return $this->_error(lang('fhc_'.FHC_NORIGHT).' -> '.$this->acl[$joinTable], FHC_MODEL_ERROR);
// Check rights only if this method is called from a model
//var_dump(get_called_class());
if (substr(get_called_class(), -6) == '_model')
if (! $this->fhc_db_acl->isBerechtigt($this->acl[$joinTable], 's'))
return $this->_error(lang('fhc_'.FHC_NORIGHT).' -> '.$this->acl[$joinTable], FHC_MODEL_ERROR);
$this->db->join($joinTable, $cond, $type);
@@ -270,9 +278,11 @@ class DB_Model extends FHC_Model
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[$this->dbTable], 'd'))
return $this->_error(lang('fhc_'.FHC_NORIGHT).' -> '.$this->acl[$this->dbTable], FHC_MODEL_ERROR);
// Check rights only if this method is called from a model
//var_dump(get_called_class());
if (substr(get_called_class(), -6) == '_model')
if (! $this->fhc_db_acl->isBerechtigt($this->acl[$this->dbTable], 'd'))
return $this->_error(lang('fhc_'.FHC_NORIGHT).' -> '.$this->acl[$this->dbTable], FHC_MODEL_ERROR);
// DB-DELETE
// Check for composite Primary Key
include/benutzer.class.php
+6
View File
@@ -51,6 +51,12 @@ class benutzer extends person
*/
public function load($uid = null)
{
if (empty($uid))
{
$this->errormsg = "UID not set!";
return false;
}
$qry = "SELECT * FROM public.tbl_benutzer WHERE uid=".$this->db_add_param($uid);
if($this->db_query($qry))
include/berechtigung.class.php
+6
View File
@@ -52,6 +52,12 @@ class berechtigung extends Berechtigung_model
*/
public function load($berechtigung_kurzbz = null)
{
if (empty($berechtigung_kurzbz))
{
$this->errormsg = "berechtigung not set!";
return false;
}
$result = parent::load($berechtigung_kurzbz);
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
include/funktion.class.php
+3 -2
View File
@@ -111,7 +111,8 @@ class funktion extends Funktion_model
*/
public function load($funktion_kurzbz = null)
{
if ($funktion_kurzbz == '')
if (empty($funktion_kurzbz) || $funktion_kurzbz == '')
{
$this->errormsg = 'funktion_bz darf nicht leer sein';
return false;
@@ -218,4 +219,4 @@ class funktion extends Funktion_model
}
}
}
?>
?>
include/studiensemester.class.php
+6
View File
@@ -61,6 +61,12 @@ class studiensemester extends Studiensemester_model
*/
public function load($studiensemester_kurzbz = null)
{
if (empty($studiensemester_kurzbz))
{
$this->errormsg = "studiensemester not set!";
return false;
}
$result = parent::load($studiensemester_kurzbz);
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))