Remove debug

This commit is contained in:
FusionPBX 2023-05-08 22:30:39 -06:00 committed by GitHub
parent 651c8ba971
commit 9e4e8558e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 73 additions and 92 deletions

View File

@ -375,7 +375,6 @@
case 'username': case 'username':
case 'where': case 'where':
case 'debug': case 'debug':
return $this->$name;
case 'count': case 'count':
return $this->count(); return $this->count();
default: default:
@ -880,9 +879,7 @@
$message["message"] = "Bad Request"; $message["message"] = "Bad Request";
$message["code"] = "400"; $message["code"] = "400";
$message["error"]["message"] = $e->getMessage(); $message["error"]["message"] = $e->getMessage();
if ($this->debug["sql"]) { $message["sql"] = $sql;
$message["sql"] = $sql;
}
if (is_array($parameters)) { if (is_array($parameters)) {
$message["parameters"] = $parameters; $message["parameters"] = $parameters;
} }
@ -1271,9 +1268,8 @@
$message["details"][$m]["message"] = "OK"; $message["details"][$m]["message"] = "OK";
$message["details"][$m]["code"] = "200"; $message["details"][$m]["code"] = "200";
//$message["details"][$m]["uuid"] = $parent_key_value; //$message["details"][$m]["uuid"] = $parent_key_value;
if ($this->debug["sql"]) { $message["details"][$m]["sql"] = $sql;
$message["details"][$m]["sql"] = $sql;
}
$this->message = $message; $this->message = $message;
$m++; $m++;
unset($sql); unset($sql);
@ -1286,9 +1282,8 @@
$message["details"][$m]["name"] = $this->name; $message["details"][$m]["name"] = $this->name;
$message["details"][$m]["message"] = $e->getMessage(); $message["details"][$m]["message"] = $e->getMessage();
$message["details"][$m]["code"] = "400"; $message["details"][$m]["code"] = "400";
if ($this->debug["sql"]) { $message["details"][$m]["sql"] = $sql;
$message["details"][$m]["sql"] = $sql;
}
$this->message = $message; $this->message = $message;
$m++; $m++;
} }
@ -1402,51 +1397,56 @@
$this->connect(); $this->connect();
} }
//return if the table name is not set
if (empty($this->table)) {
return;
}
//sanitize the table name //sanitize the table name
//$this->table = self::sanitize($this->table); // no longer needed //$this->table = self::sanitize($this->table); // no longer needed
//get the number of rows //get the number of rows
$sql = "select count(*) as num_rows from ".$this->table." "; $sql = "select count(*) as num_rows from ".$this->table." ";
if ($this->where) { $i = 0;
$i = 0; if (is_array($this->where)) {
if (is_array($this->where)) { foreach($this->where as $row) {
foreach($this->where as $row) { //sanitize the name
//sanitize the name $row['name'] = self::sanitize($row['name']);
$row['name'] = self::sanitize($row['name']);
//validate the operator //validate the operator
switch ($row['operator']) { switch ($row['operator']) {
case "<": break; case "<": break;
case ">": break; case ">": break;
case "<=": break; case "<=": break;
case ">=": break; case ">=": break;
case "=": break; case "=": break;
case "<>": break; case "<>": break;
case "!=": break; case "!=": break;
default: default:
//invalid operator //invalid operator
return -1; return -1;
}
//build the sql
if ($i == 0) {
$sql .= "where ".$row['name']." ".$row['operator']." :".$row['name']." ";
}
else {
$sql .= "and ".$row['name']." ".$row['operator']." :".$row['name']." ";
}
//add the name and value to the params array
$params[$row['name']] = $row['value'];
//increment $i
$i++;
} }
//build the sql
if ($i == 0) {
$sql .= "where ".$row['name']." ".$row['operator']." :".$row['name']." ";
}
else {
$sql .= "and ".$row['name']." ".$row['operator']." :".$row['name']." ";
}
//add the name and value to the params array
$params[$row['name']] = $row['value'];
//increment $i
$i++;
} }
} }
//unset($this->where); //should not be objects resposibility //unset($this->where); //should not be objects resposibility
$prep_statement = $this->db->prepare($sql); $prep_statement = $this->db->prepare($sql);
if ($prep_statement) { if ($prep_statement) {
if (!isset($params)) { $params = null; }
$prep_statement->execute($params); $prep_statement->execute($params);
$row = $prep_statement->fetch(PDO::FETCH_ASSOC); $row = $prep_statement->fetch(PDO::FETCH_ASSOC);
if ($row['num_rows'] > 0) { if ($row['num_rows'] > 0) {
@ -1515,9 +1515,8 @@
$message["message"] = "Bad Request"; $message["message"] = "Bad Request";
$message["code"] = "400"; $message["code"] = "400";
$message["error"]["message"] = $e->getMessage(); $message["error"]["message"] = $e->getMessage();
if ($this->debug["sql"]) { $message["sql"] = $sql;
$message["sql"] = $sql;
}
if (is_array($parameters)) { if (is_array($parameters)) {
$message["parameters"] = $parameters; $message["parameters"] = $parameters;
} }
@ -1610,9 +1609,8 @@
$message["details"][$m]["name"] = $this->name; $message["details"][$m]["name"] = $this->name;
$message["details"][$m]["message"] = "OK"; $message["details"][$m]["message"] = "OK";
$message["details"][$m]["code"] = "200"; $message["details"][$m]["code"] = "200";
if ($this->debug["sql"]) { $message["details"][$m]["sql"] = $sql;
$message["details"][$m]["sql"] = $sql;
}
$this->message = $message; $this->message = $message;
$this->result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $this->result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
unset($prep_statement); unset($prep_statement);
@ -1623,9 +1621,8 @@
$message["details"][$m]["name"] = $this->name; $message["details"][$m]["name"] = $this->name;
$message["details"][$m]["message"] = $e->getMessage(); $message["details"][$m]["message"] = $e->getMessage();
$message["details"][$m]["code"] = "400"; $message["details"][$m]["code"] = "400";
if ($this->debug["sql"]) { $message["details"][$m]["sql"] = $sql;
$message["details"][$m]["sql"] = $sql;
}
$this->message = $message; $this->message = $message;
$this->result = ''; $this->result = '';
$m++; $m++;
@ -2176,11 +2173,9 @@
$message["details"][$m]["message"] = "OK"; $message["details"][$m]["message"] = "OK";
$message["details"][$m]["code"] = "200"; $message["details"][$m]["code"] = "200";
$message["details"][$m]["uuid"] = $parent_key_value; $message["details"][$m]["uuid"] = $parent_key_value;
if ($this->debug["sql"]) { $message["details"][$m]["sql"] = $sql;
$message["details"][$m]["sql"] = $sql; if (is_array($params)) {
if (is_array($params)) { $message["details"][$m]["params"] = $params;
$message["details"][$m]["params"] = $params;
}
} }
unset($params); unset($params);
$this->message = $message; $this->message = $message;
@ -2194,11 +2189,9 @@
$message["details"][$m]["message"] = $e->getMessage(); $message["details"][$m]["message"] = $e->getMessage();
$message["details"][$m]["code"] = "400"; $message["details"][$m]["code"] = "400";
$message["details"][$m]["array"] = $array; $message["details"][$m]["array"] = $array;
if ($this->debug["sql"]) { $message["details"][$m]["sql"] = $sql;
$message["details"][$m]["sql"] = $sql; if (is_array($params)) {
if (is_array($params)) { $message["details"][$m]["params"] = $params;
$message["details"][$m]["params"] = $params;
}
} }
unset($params); unset($params);
$this->message = $message; $this->message = $message;
@ -2282,11 +2275,9 @@
$message["details"][$m]["message"] = "OK"; $message["details"][$m]["message"] = "OK";
$message["details"][$m]["code"] = "200"; $message["details"][$m]["code"] = "200";
$message["details"][$m]["uuid"] = $parent_key_value; $message["details"][$m]["uuid"] = $parent_key_value;
if ($this->debug["sql"]) { $message["details"][$m]["sql"] = $sql;
$message["details"][$m]["sql"] = $sql; if (is_array($params)) {
if (is_array($params)) { $message["details"][$m]["params"] = $params;
$message["details"][$m]["params"] = $params;
}
} }
unset($params); unset($params);
$this->message = $message; $this->message = $message;
@ -2300,11 +2291,9 @@
$message["details"][$m]["name"] = $this->name; $message["details"][$m]["name"] = $this->name;
$message["details"][$m]["message"] = $e->getMessage(); $message["details"][$m]["message"] = $e->getMessage();
$message["details"][$m]["code"] = "400"; $message["details"][$m]["code"] = "400";
if ($this->debug["sql"]) { $message["details"][$m]["sql"] = $sql;
$message["details"][$m]["sql"] = $sql; if (is_array($params)) {
if (is_array($params)) { $message["details"][$m]["params"] = $params;
$message["details"][$m]["params"] = $params;
}
} }
unset($params); unset($params);
$this->message = $message; $this->message = $message;
@ -2468,11 +2457,9 @@
$message["details"][$m]["message"] = "OK"; $message["details"][$m]["message"] = "OK";
$message["details"][$m]["code"] = "200"; $message["details"][$m]["code"] = "200";
$message["details"][$m]["uuid"] = $child_key_value; $message["details"][$m]["uuid"] = $child_key_value;
if ($this->debug["sql"]) { $message["details"][$m]["sql"] = $sql;
$message["details"][$m]["sql"] = $sql; if (is_array($params)) {
if (is_array($params)) { $message["details"][$m]["params"] = $params;
$message["details"][$m]["params"] = $params;
}
} }
unset($params); unset($params);
$this->message = $message; $this->message = $message;
@ -2487,11 +2474,9 @@
$message["details"][$m]["name"] = $key; $message["details"][$m]["name"] = $key;
$message["details"][$m]["message"] = $e->getMessage(); $message["details"][$m]["message"] = $e->getMessage();
$message["details"][$m]["code"] = "400"; $message["details"][$m]["code"] = "400";
if ($this->debug["sql"]) { $message["details"][$m]["sql"] = $sql;
$message["details"][$m]["sql"] = $sql; if (is_array($params)) {
if (is_array($params)) { $message["details"][$m]["params"] = $params;
$message["details"][$m]["params"] = $params;
}
} }
unset($params); unset($params);
$this->message = $message; $this->message = $message;
@ -2622,11 +2607,9 @@
$message["details"][$m]["message"] = "OK"; $message["details"][$m]["message"] = "OK";
$message["details"][$m]["code"] = "200"; $message["details"][$m]["code"] = "200";
$message["details"][$m]["uuid"] = $child_key_value; $message["details"][$m]["uuid"] = $child_key_value;
if ($this->debug["sql"]) { $message["details"][$m]["sql"] = $sql;
$message["details"][$m]["sql"] = $sql; if (is_array($params)) {
if (is_array($params)) { $message["details"][$m]["params"] = $params;
$message["details"][$m]["params"] = $params;
}
} }
unset($params); unset($params);
$this->message = $message; $this->message = $message;
@ -2641,11 +2624,9 @@
$message["details"][$m]["name"] = $key; $message["details"][$m]["name"] = $key;
$message["details"][$m]["message"] = $e->getMessage(); $message["details"][$m]["message"] = $e->getMessage();
$message["details"][$m]["code"] = "400"; $message["details"][$m]["code"] = "400";
if ($this->debug["sql"]) { $message["details"][$m]["sql"] = $sql;
$message["details"][$m]["sql"] = $sql; if (is_array($params)) {
if (is_array($params)) { $message["details"][$m]["params"] = $params;
$message["details"][$m]["params"] = $params;
}
} }
unset($params); unset($params);
$this->message = $message; $this->message = $message;