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

- Added helper message with the functions success and error

Browse Source 
- Added methods _success and _error to classes FHC_model and APIv1_Controller
This commit is contained in:
paolo
2016-06-16 12:15:52 +02:00
parent 6536ff155c
commit 0c2c0468af
3 changed files with 59 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/APIv1_Controller.php
+22 -2
View File
@@ -7,10 +7,30 @@ class APIv1_Controller extends REST_Controller
function __construct()
{
parent::__construct();
//$this->load->library('session'); // -> autoload
//$this->load->library('database'); -> autoload
$this->load->helper('Message');
}
/** ---------------------------------------------------------------
* Success
*
* @param mixed $retval
* @return array
*/
protected function _success($retval, $message = null)
{
return success($retval, $message);
}
/** ---------------------------------------------------------------
* General Error
*
* @return array
*/
protected function _error($retval, $message = null)
{
return error($retval, $message);
}
/**
*
* @param type $data
application/core/FHC_Model.php
+6 -15
View File
@@ -10,6 +10,7 @@ class FHC_Model extends CI_Model
$this->load->helper('language');
$this->lang->load('fhc_model');
$this->lang->load('fhcomplete');
$this->load->helper('Message');
$uid = null;
@@ -46,14 +47,9 @@ class FHC_Model extends CI_Model
* @param mixed $retval
* @return array
*/
protected function _success($retval, $message = FHC_SUCCESS)
protected function _success($retval, $message = null)
{
$return = new stdClass();
$return->error = EXIT_SUCCESS;
$return->fhcCode = $message;
$return->msg = lang('fhc_' . $message);
$return->retval = $retval;
return $return;
return success($retval, $message);
}
/** ---------------------------------------------------------------
@@ -61,13 +57,8 @@ class FHC_Model extends CI_Model
*
* @return array
*/
protected function _error($retval = '', $message = FHC_MODEL_ERROR)
protected function _error($retval, $message = null)
{
$return = new stdClass();
$return->error = EXIT_MODEL;
$return->fhcCode = $message;
$return->msg = lang('fhc_' . $message);
$return->retval = $retval;
return $return;
return error($retval, $message);
}
}
}
application/helpers/message_helper.php
+31
View File
@@ -0,0 +1,31 @@
<?php
/** ---------------------------------------------------------------
* General Error
*
* @return array
*/
function success($retval, $message = FHC_SUCCESS)
{
$return = new stdClass();
$return->error = EXIT_SUCCESS;
$return->fhcCode = $message;
$return->msg = lang('fhc_' . $message);
$return->retval = $retval;
return $return;
}
/** ---------------------------------------------------------------
* General Error
*
* @return array
*/
function error($retval = '', $message = FHC_MODEL_ERROR)
{
$return = new stdClass();
$return->error = EXIT_MODEL;
$return->fhcCode = $message;
$return->msg = lang('fhc_' . $message);
$return->retval = $retval;
return $return;
}