blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-22 09:22:22 +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/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;
}
}
}