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

- All permission functionalities now are in the library PermissionLib

Browse Source 
- All return messages functions are in the message helper and it is loaded by the core classes
- Added the missing constant FHC_NOPK
- Updated all the interested classes with the new permission method
- Updated all the interested classes with the new return message functions
This commit is contained in:
bison-paolo
2016-10-13 17:53:12 +02:00
parent 40f51d035f
commit 8e0ca12deb
24 changed files with 403 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/system/Message_model.php
+18 -18
View File
@@ -1,6 +1,6 @@
<?php
if ( ! defined("BASEPATH")) exit("No direct script access allowed");
if ( ! defined('BASEPATH')) exit('No direct script access allowed');
class Message_model extends DB_Model
{
@@ -10,8 +10,8 @@ class Message_model extends DB_Model
public function __construct()
{
parent::__construct();
$this->dbTable = "public.tbl_msg_message";
$this->pk = "message_id";
$this->dbTable = 'public.tbl_msg_message';
$this->pk = 'message_id';
}
/**
@@ -19,15 +19,15 @@ class Message_model extends DB_Model
*/
public function getMessagesByPerson($person_id, $all)
{
// Check wrights
if (! $this->fhc_db_acl->isBerechtigt($this->getBerechtigungKurzbz("public.tbl_msg_message"), "s"))
return $this->_error(lang("fhc_".FHC_NORIGHT)." -> ".$this->getBerechtigungKurzbz("public.tbl_msg_message"), FHC_MODEL_ERROR);
if (! $this->fhc_db_acl->isBerechtigt($this->getBerechtigungKurzbz("public.tbl_person"), "s"))
return $this->_error(lang("fhc_".FHC_NORIGHT)." -> ".$this->getBerechtigungKurzbz("public.tbl_person"), FHC_MODEL_ERROR);
if (! $this->fhc_db_acl->isBerechtigt($this->getBerechtigungKurzbz("public.tbl_msg_status"), "s"))
return $this->_error(lang("fhc_".FHC_NORIGHT)." -> ".$this->getBerechtigungKurzbz("public.tbl_msg_status"), FHC_MODEL_ERROR);
// Checks if the operation is permitted by the API caller
if (($chkRights = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
return $chkRights;
if (($chkRights = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
return $chkRights;
if (($chkRights = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
return $chkRights;
$sql = "SELECT m.message_id,
$sql = 'SELECT m.message_id,
m.person_id,
m.subject,
m.body,
@@ -51,23 +51,23 @@ class Message_model extends DB_Model
%s
ORDER BY insertamum DESC
) s ON (m.message_id = s.message_id AND m.person_id = s.person_id)
WHERE m.person_id = ?";
WHERE m.person_id = ?';
$parametersArray = array($person_id);
if ($all == "true")
if ($all == 'true')
{
$sql = sprintf($sql, "");
$sql = sprintf($sql, '');
}
else
{
$sql = sprintf($sql, "WHERE status >= 3");
$sql = sprintf($sql, 'WHERE status >= 3');
}
$result = $this->db->query($sql, $parametersArray);
if (is_object($result))
return $this->_success($result->result());
return success($result->result());
else
return $this->_error($this->db->error(), FHC_DB_ERROR);
return error($this->db->error(), FHC_DB_ERROR);
}
}
}