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

- Added method chkRights to DB_Model

Browse Source 
- Added method toPhp to DB_Model to convert array and boolean types from PostgresSQL to php
- Added method execQuery to DB_Model to execute a query (it calls toPhp)
- Added method pgsqlArrayToPhpArray to convert a pgsql array to php
- Updated DB_Model methods to using chkRights (and toPhp where it is needed)
- Removed methods escapeArray and _pgsqlArrayToPhpArray from controller APIv1_Controller
- Removed escapeArray from controllers Dokumentstudiengang and Dokument
- Updated models to use execQuery (and chkRights where it is needed)
This commit is contained in:
bison-paolo
2016-10-17 17:07:51 +02:00
parent 19ff69110d
commit f3b79cd731
17 changed files with 327 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/system/Recipient_model.php
+5 -26
View File
@@ -47,11 +47,7 @@ class Recipient_model extends DB_Model
$parametersArray = array($message_id, $person_id);
// Get data of the messages to sent
$result = $this->db->query($query, $parametersArray);
if (is_object($result))
return success($result->result());
else
return error($this->db->error(), FHC_DB_ERROR);
return $this->execQuery($query, $parametersArray);
}
/**
@@ -85,11 +81,7 @@ class Recipient_model extends DB_Model
WHERE r.token = ?
LIMIT 1';
$result = $this->db->query($sql, array(MSG_STATUS_DELETED, $token));
if (is_object($result))
return success($result->result());
else
return error($this->db->error(), FHC_DB_ERROR);
return $this->execQuery($sql, array(MSG_STATUS_DELETED, $token));
}
/**
@@ -147,11 +139,7 @@ class Recipient_model extends DB_Model
$sql = sprintf($sql, 'WHERE person_id = ? AND message_id NOT IN (SELECT message_id FROM public.tbl_msg_status WHERE status >= 3 AND person_id = ?)');
}
$result = $this->db->query($sql, $parametersArray);
if (is_object($result))
return success($result->result());
else
return error($this->db->error(), FHC_DB_ERROR);
return $this->execQuery($sql, $parametersArray);
}
/**
@@ -204,11 +192,7 @@ class Recipient_model extends DB_Model
if (! $all)
$sql .= ' AND (status < 3 OR status IS NULL)';
$result = $this->db->query($sql, array($uid));
if (is_object($result))
return success($result->result());
else
return error($this->db->error(), FHC_DB_ERROR);
return $this->execQuery($sql, array($uid));
}
/**
@@ -273,11 +257,6 @@ class Recipient_model extends DB_Model
array_push($parametersArray, $limit);
}
// Get data of the messages to sent
$result = $this->db->query($query, $parametersArray);
if (is_object($result))
return success($result->result());
else
return error($this->db->error(), FHC_DB_ERROR);
return $this->execQuery($query, $parametersArray);
}
}