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

ACL-Fix

Browse Source
This commit is contained in:
Paminger
2016-05-01 11:53:15 +02:00
parent 2dada5200c
commit 8cb8782586
16 changed files with 326 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/constants.php
+19
View File
@@ -1,6 +1,24 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
/*
|--------------------------------------------------------------------------
| FH-Complete Constants
|--------------------------------------------------------------------------
|
| These constants are used for internal messages. It are also be used
| and translated in the language files.
|
*/
define('FHC_SUCCESS', 0); // General Success Message
define('FHC_ERROR', 1); // General Error Message
define('FHC_MODEL_ERROR', 2); // Model Error
define('FHC_DB_ERROR', 3); // Database Error
define('FHC_NODBTABLE', 4); // No DB-Table is set
define('FHC_NORIGHT', 5); // No rights
/*
|--------------------------------------------------------------------------
| File and Directory Modes
@@ -75,6 +93,7 @@ define('SHOW_DEBUG_BACKTRACE', TRUE);
*/
define('EXIT_SUCCESS', 0); // no errors
define('EXIT_ERROR', 1); // generic error
define('EXIT_MODEL', 2); // model error
define('EXIT_CONFIG', 3); // configuration error
define('EXIT_UNKNOWN_FILE', 4); // file not found
define('EXIT_UNKNOWN_CLASS', 5); // unknown class
application/config/fhcomplete.php
+4 -4
View File
@@ -2,7 +2,7 @@
$config['fhc_version'] = '3.2';
// status return message codes
define('FHC_SUCCESS', 0);
define('FHC_ERR_GENERAL', 1);
$config['fhc_acl'] = array
(
'public.tbl_prestudent' => 'basis/person'
);
application/controllers/Vilesci.php
+4 -26
View File
@@ -1,7 +1,7 @@
<?php
defined('BASEPATH') || exit('No direct script access allowed');
class Vilesci extends CI_Controller
class Vilesci extends FHC_Controller
{
/**
@@ -22,30 +22,8 @@ class Vilesci extends CI_Controller
*/
public function index()
{
// ToDo: check if update is needed
if (false && $this->dbupdate())
echo 'System-DB needs update!';
else
{
$this->load->view('templates/header');
$this->load->view('vilesci_frameset');
$this->load->view('templates/footer');
}
}
/**
*
* @return bool
*/
private function __dbupdate()
{
// Check for update (codeigniter migration)
$this->load->library('migration');
if ($this->migration->current() === false)
show_error($this->migration->error_string());
if ($this->migration->current() != $this->migration->latest())
return true;
else
return false;
$this->load->view('templates/header');
$this->load->view('vilesci_frameset');
$this->load->view('templates/footer');
}
}
application/core/DB_Model.php
+102 -12
View File
@@ -2,28 +2,118 @@
class DB_Model extends FHC_Model
{
protected $dbTable = NULL; // Name of the DB-Table for CI-Insert, -Update, ...
protected $dbTable; // Name of the DB-Table for CI-Insert, -Update, ...
protected $pk; // Name of the PrimaryKey for DB-Update, Load, ...
protected $acl; // Name of the PrimaryKey for DB-Update, Load, ...
// Addon ID, stored to let to check the permissions
private $_addonID;
function __construct()
function __construct($dbTable = null, $pk = null)
{
parent::__construct();
$this->dbTable = $dbTable;
$this->pk = $pk;
$this->load->database();
$this->lang->load('fhc_db');
$this->acl = $this->config->item('fhc_acl');
}
/** ---------------------------------------------------------------
* Insert Data into DB-Table
*
* @param array $data DataArray for Insert
* @return array
*/
public function insert($data)
{
if(!is_null($this->dbTable))
{
$this->db->insert($this->dbTable, $data);
return TRUE;
}
// Check Class-Attributes
if(is_null($this->dbTable))
return $this->_error(lang('fhc_'.FHC_NODBTABLE), FHC_MODEL_ERROR);
// Check rights
if (! $this->fhc_db_acl->isBerechtigt((string)($this->acl[$this->dbTable]), 'i'))
return $this->_error(lang('fhc_'.FHC_NORIGHT), FHC_MODEL_ERROR);
// DB-INSERT
if ($this->db->insert($this->dbTable, $data))
return $this->_success($this->db->insert_id());
else
{
return FALSE;
}
return $this->_error($this->db->error(), FHC_DB_ERROR);
}
/** ---------------------------------------------------------------
* Replace Data in DB-Table
*
* @param array $data DataArray for Replacement
* @return array
*/
public function replace($data)
{
// Check Class-Attributes
if(is_null($this->dbTable))
return $this->_error(lang('fhc_'.FHC_NODBTABLE), FHC_MODEL_ERROR);
// Check rights
if (! $this->fhc_db_acl->isBerechtigt((string)($this->acl[$this->dbTable]), 'ui'))
return $this->_error(lang('fhc_'.FHC_NORIGHT), FHC_MODEL_ERROR);
// DB-REPLACE
if ($this->db->replace($this->dbTable, $data))
return $this->_success($this->db->insert_id());
else
return $this->_error($this->db->error(), FHC_DB_ERROR);
}
/** ---------------------------------------------------------------
* Update Data in DB-Table
*
* @param string $id PK for DB-Table
* @param array $data DataArray for Insert
* @return array
*/
public function update($id, $data)
{
// Check Class-Attributes
if(is_null($this->dbTable))
return $this->_error(lang('fhc_'.FHC_NODBTABLE), FHC_MODEL_ERROR);
if(is_null($this->pk))
return $this->_error(lang('fhc_'.FHC_NOPK), FHC_MODEL_ERROR);
// Check rights
if (! $this->fhc_db_acl->isBerechtigt((string)($this->acl[$this->dbTable]), 'u'))
return $this->_error(lang('fhc_'.FHC_NORIGHT), FHC_MODEL_ERROR);
// DB-UPDATE
$this->db->where($this->pk, $id);
if ($this->db->update($this->dbTable, $data))
return $this->_success($id);
else
return $this->_error($this->db->error(), FHC_DB_ERROR);
}
/** ---------------------------------------------------------------
* Replace Data in DB-Table
*
* @param array $data DataArray for Replacement
* @return array
*/
public function load($id)
{
// Check Class-Attributes
if(is_null($this->dbTable))
return $this->_error(lang('fhc_'.FHC_NODBTABLE), FHC_MODEL_ERROR);
if(is_null($this->pk))
return $this->_error(lang('fhc_'.FHC_NOPK), FHC_MODEL_ERROR);
// Check rights
if (! $this->fhc_db_acl->isBerechtigt((string)($this->acl[$this->dbTable]), 's'))
return $this->_error(lang('fhc_'.FHC_NORIGHT), FHC_MODEL_ERROR);
// DB-SELECT
if ($this->db->get_where($this->dbTable, array($this->pk => $id)))
return $this->_success($id);
else
return $this->_error($this->db->error(), FHC_DB_ERROR);
}
/** ---------------------------------------------------------------
@@ -61,4 +151,4 @@ class DB_Model extends FHC_Model
{
return $this->_addonID;
}
}
}
application/core/FHC_Model.php
+22 -18
View File
@@ -4,13 +4,17 @@ defined('BASEPATH') OR exit('No direct script access allowed');
class FHC_Model extends CI_Model
{
//protected errormsg;
function __construct()
function __construct($uid = null)
{
parent::__construct();
$this->load->helper('language');
$this->load->helper('fhc_db_acl');
$this->lang->load('fhc_model');
//$this->load->helper('fhc_db_acl');
$this->lang->load('fhcomplete');
//$this->load->library('FHC_DB_ACL');
//$this->load->library('session');
if (is_null($uid))
$uid = $this->session->uid;
$this->load->library('FHC_DB_ACL',array('uid' => $uid));
}
/** ---------------------------------------------------------------
@@ -19,14 +23,14 @@ class FHC_Model extends CI_Model
* @param mixed $retval
* @return array
*/
protected function _success($retval = '', $message = FHC_SUCCESS)
protected function _success($retval, $message = FHC_SUCCESS)
{
return array(
'err' => 0,
'code' => FHC_SUCCESS,
'msg' => lang('fhc_' . $message),
'retval' => $retval
);
$return = new stdClass();
$return->error = EXIT_SUCCESS;
$return->code = $message;
$return->msg = lang('fhc_' . $message);
$return->retval = $retval;
return $return;
}
/** ---------------------------------------------------------------
@@ -34,13 +38,13 @@ class FHC_Model extends CI_Model
*
* @return array
*/
protected function _general_error($retval = '', $message = FHC_ERR_GENERAL)
protected function _error($retval = '', $message = FHC_MODEL_ERROR)
{
return array(
'err' => 1,
'code' => FHC_ERR_GENERAL,
'msg' => lang('fhc_' . $message),
'retval' => $retval
);
$return = new stdClass();
$return->error = EXIT_MODEL;
$return->code = $message;
$return->msg = lang('fhc_' . $message);
$return->retval = $retval;
return $return;
}
}
}
application/language/de-AT/fhc_db_lang.php
-2
View File
@@ -1,2 +0,0 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
application/language/de-AT/fhc_model_lang.php
+7
View File
@@ -0,0 +1,7 @@
<?php
if ( ! defined('BASEPATH'))
exit('No direct script access allowed');
// DB-Errormessages
$lang['fhc_'.FHC_MODEL_ERROR] = 'Fehler in Model';
$lang['fhc_'.FHC_NODBTABLE] = '"dbTable" ist nicht gesetzt!';
application/language/de-AT/fhcomplete_lang.php
+1 -1
View File
@@ -2,4 +2,4 @@
// Account Creation
$lang['fhc_'.FHC_SUCCESS] = 'Erfolgreich';
$lang['fhc_'.FHC_ERR_GENERAL] = 'Fehler';
$lang['fhc_'.FHC_ERROR] = 'Fehler';
application/language/en-US/fhc_db_lang.php
-2
View File
@@ -1,2 +0,0 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
application/language/en-US/fhc_model_lang.php
+7
View File
@@ -0,0 +1,7 @@
<?php
if ( ! defined('BASEPATH'))
exit('No direct script access allowed');
// DB-Errormessages
$lang['fhc_'.FHC_MODEL_ERROR] = 'Error in Model';
$lang['fhc_'.FHC_NODBTABLE] = 'dbTable is not set!';
application/language/en-US/fhcomplete_lang.php
+1 -1
View File
@@ -2,4 +2,4 @@
// Account Creation
$lang['fhc_'.FHC_SUCCESS] = 'Success';
$lang['fhc_'.FHC_ERR_GENERAL] = 'Error';
$lang['fhc_'.FHC_ERROR] = 'Error';
application/libraries/FHC_DB_ACL.php
+2 -2
View File
@@ -43,10 +43,10 @@ class FHC_DB_ACL
* @param string $password
* @return bool
*/
function __construct($uid)
function __construct($param)
{
$this->bb = new benutzerberechtigung();
$this->uid = $uid;
$this->uid = $param['uid'];
}
function isBerechtigt($berechtigung_kurzbz, $art=null, $oe_kurzbz=null, $kostenstelle_id=null)
application/models/person/Prestudent_model.php
+30
View File
@@ -0,0 +1,30 @@
<?php
class Prestudent_model extends DB_Model
{
/**
*
*/
public function __construct()
{
parent::__construct();
$this->dbTable='public.tbl_prestudent';
$this->pk='prestudent_id';
}
/**
*
*/
public function loadPrestudentPerson($prestudentID)
{
$this->db->select('*')
->from('public.tbl_prestudent')
->join('public.tbl_person', 'person_id')
->where('prestudent_id', $prestudentID);
return $this->db->get()->result_array();
}
}
ci_db_extra.php
Executable
+119
View File
@@ -0,0 +1,119 @@
<?php
trait db_extra
{
protected $db_result=null;
public function db_query($sql)
{
if ($this->db_result=$this->db->simple_query($sql))
return $this->db_result;
else
{
$this->errormsg.='Abfrage in Datenbank fehlgeschlagen! '.$this->db_last_error();
return false;
}
}
public function db_fetch_object($result = null, $i=null)
{
if(is_null($result))
{
if(is_null($i))
return pg_fetch_object($this->db_result);
else
return pg_fetch_object($this->db_result, $i);
}
else
{
if(is_null($i))
return pg_fetch_object($result);
else
return pg_fetch_object($result, $i);
}
}
public function db_add_param($var, $type=FHC_STRING, $nullable=true)
{
if($var==='' && $type!=FHC_BOOLEAN)
{
if($nullable)
return 'null';
else
return "''";
}
switch($type)
{
case FHC_INTEGER:
$var = $this->db_escape($var);
if(!is_numeric($var) && $var!=='')
die('Invalid Integer Parameter detected:'.$var);
$var = $this->db_null_value($var, false);
break;
case FHC_BOOLEAN:
if($var===true)
$var='true';
elseif($var===false)
$var='false';
elseif($var=='' && $nullable)
$var = 'null';
else
die('Invalid Boolean Parameter detected');
break;
case FHC_STRING:
default:
$var = $this->db_escape($var);
$var = $this->db_null_value($var);
break;
}
return $var;
}
public function db_escape($var)
{
return pg_escape_string($var);
}
public function db_null_value($var, $qoute=true)
{
if($qoute)
return ($var!==''?$this->db_qoute($var):'null');
else
return ($var!==''?$var:'null');
}
public function db_qoute($var)
{
return "'".$var."'";
}
public function db_parse_bool($var)
{
if($var=='t')
return true;
elseif($var=='f')
return false;
elseif($var=='')
return '';
else
die('Invalid DB Boolean. Wrong DB-Engine?');
}
/**
* Bereitet ein Array von Elementen auf, damit es in der IN-Klausel eines
* Select Befehls verwendet werden kann.
*/
public function db_implode4SQL($array)
{
$string = '';
foreach($array as $row)
{
if($string!='')
$string.=',';
$string.=$this->db_add_param($row);
}
return $string;
}
}
ci_hack.php
+1 -117
View File
@@ -369,121 +369,5 @@ require_once(dirname(__FILE__).'/application/core/FHC_Model.php');
$model=new CI_Model();
// Traits
trait db_extra
{
protected $db_result=null;
require_once(dirname(__FILE__).'db_extra.php');
public function db_query($sql)
{
if ($this->db_result=$this->db->simple_query($sql))
return $this->db_result;
else
{
$this->errormsg.='Abfrage in Datenbank fehlgeschlagen! '.$this->db_last_error();
return false;
}
}
public function db_fetch_object($result = null, $i=null)
{
if(is_null($result))
{
if(is_null($i))
return pg_fetch_object($this->db_result);
else
return pg_fetch_object($this->db_result, $i);
}
else
{
if(is_null($i))
return pg_fetch_object($result);
else
return pg_fetch_object($result, $i);
}
}
public function db_add_param($var, $type=FHC_STRING, $nullable=true)
{
if($var==='' && $type!=FHC_BOOLEAN)
{
if($nullable)
return 'null';
else
return "''";
}
switch($type)
{
case FHC_INTEGER:
$var = $this->db_escape($var);
if(!is_numeric($var) && $var!=='')
die('Invalid Integer Parameter detected:'.$var);
$var = $this->db_null_value($var, false);
break;
case FHC_BOOLEAN:
if($var===true)
$var='true';
elseif($var===false)
$var='false';
elseif($var=='' && $nullable)
$var = 'null';
else
die('Invalid Boolean Parameter detected');
break;
case FHC_STRING:
default:
$var = $this->db_escape($var);
$var = $this->db_null_value($var);
break;
}
return $var;
}
public function db_escape($var)
{
return pg_escape_string($var);
}
public function db_null_value($var, $qoute=true)
{
if($qoute)
return ($var!==''?$this->db_qoute($var):'null');
else
return ($var!==''?$var:'null');
}
public function db_qoute($var)
{
return "'".$var."'";
}
public function db_parse_bool($var)
{
if($var=='t')
return true;
elseif($var=='f')
return false;
elseif($var=='')
return '';
else
die('Invalid DB Boolean. Wrong DB-Engine?');
}
/**
* Bereitet ein Array von Elementen auf, damit es in der IN-Klausel eines
* Select Befehls verwendet werden kann.
*/
public function db_implode4SQL($array)
{
$string = '';
foreach($array as $row)
{
if($string!='')
$string.=',';
$string.=$this->db_add_param($row);
}
return $string;
}
}
include/studiengang.class.php
+7 -2
View File
@@ -25,7 +25,12 @@
require_once(dirname(__FILE__).'/datum.class.php');
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
// look if get_instance() is declared
if (function_exists('get_instance'))
require_once(dirname(__FILE__).'/../ci_db_extra.php');
else
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/lehre/Studiengang_model.php');
class studiengang extends Studiengang_model
@@ -908,4 +913,4 @@ class studiengang extends Studiengang_model
return false;
}
}
}
}