maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

start api implementation

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-02-15 07:47:35 +01:00
parent 5c30961d3c
commit dd371c72a2
9 changed files with 339 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/classes/database/class.Database.php
View File

@@ -67,11 +67,11 @@ class Database {
* @param array $params (optional)
* @param bool $showerror suppress errordisplay (default true)
*/
public static function pexecute(&$stmt, $params = null, $showerror = true) {
public static function pexecute(&$stmt, $params = null, $showerror = true, $json_response = false) {
try {
$stmt->execute($params);
} catch (PDOException $e) {
self::_showerror($e, $showerror);
self::_showerror($e, $showerror, $json_response);
}
}
@@ -86,8 +86,8 @@ class Database {
*
* @return array
*/
public static function pexecute_first(&$stmt, $params = null, $showerror = true) {
self::pexecute($stmt, $params, $showerror);
public static function pexecute_first(&$stmt, $params = null, $showerror = true, $json_response = false) {
self::pexecute($stmt, $params, $showerror, $json_response);
return $stmt->fetch(PDO::FETCH_ASSOC);
}
@@ -309,7 +309,7 @@ class Database {
* @param PDOException $error
* @param bool $showerror if set to false, the error will be logged but we go on
*/
private static function _showerror($error, $showerror = true) {
private static function _showerror($error, $showerror = true, $json_response = false) {
global $userinfo, $theme, $linker;
// include userdata.inc.php
@@ -367,6 +367,10 @@ class Database {
@fwrite($errlog, "|TRACE\n".$error_trace."\n");
@fclose($errlog);
if ($showerror && $json_response) {
throw new Exception($error_message, 500);
}
if ($showerror) {
if (empty($sql['debug'])) {
$error_trace = '';