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

- Added functions isSuccess, isError and hasData in message helper

Browse Source 
- Updated the code using these new functions
This commit is contained in:
bison-paolo
2016-10-14 15:04:15 +02:00
parent f8c70df0bc
commit a20bf91193
13 changed files with 89 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/v1/codex/Nation.php
+1 -1
View File
@@ -53,7 +53,7 @@ class Nation extends APIv1_Controller
$result = $this->NationModel->addOrder('engltext');
}
if ($result->error == EXIT_SUCCESS)
if (isSuccess($result))
{
if ($this->get('ohnesperre'))
{
application/controllers/api/v1/organisation/Studiensemester.php
+1 -6
View File
@@ -118,12 +118,7 @@ class Studiensemester extends APIv1_Controller
$result = $this->StudiensemesterModel->loadWhere(array('start <=' => 'NOW()', 'ende >=' => 'NOW()'));
}
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval) &&
count($result->retval) > 0)
{
// Return $result
}
else
if (!hasData($result))
{
$this->StudiensemesterModel->addOrder('ende');
$this->StudiensemesterModel->addLimit(1);
application/controllers/api/v1/person/Person.php
+1 -1
View File
@@ -93,7 +93,7 @@ class Person extends APIv1_Controller
$person = $this->_parseData($this->post());
$validation = $this->_validate($this->post());
if (is_object($validation) && $validation->error == EXIT_SUCCESS)
if (isSuccess($validation))
{
if(isset($person["person_id"]) && !(is_null($person["person_id"])) && ($person["person_id"] != ""))
{
application/controllers/api/v1/system/Message.php
+2 -2
View File
@@ -112,7 +112,7 @@ class Message extends APIv1_Controller
{
$validation = $this->_validatePostMessage($this->post());
if (is_object($validation) && $validation->error == EXIT_SUCCESS)
if (isSuccess($validation))
{
$result = $this->messagelib->sendMessage(
isset($this->post()['person_id']) ? $this->post()['person_id'] : null,
@@ -139,7 +139,7 @@ class Message extends APIv1_Controller
{
$validation = $this->_validatePostMessageVorlage($this->post());
if (is_object($validation) && $validation->error == EXIT_SUCCESS)
if (isSuccess($validation))
{
$result = $this->messagelib->sendMessageVorlage(
isset($this->post()['sender_id']) ? $this->post()['sender_id'] : null,