From 03180c90189030fff9e60bd0c5d663bb12c01b81 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 19 Nov 2016 11:49:38 -0700 Subject: [PATCH] Update database.php Changes for database -> delete() keeping for the moment for backwards compatibility. --- resources/classes/database.php | 38 +++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/resources/classes/database.php b/resources/classes/database.php index ccb7e754cb..6a42876d2e 100644 --- a/resources/classes/database.php +++ b/resources/classes/database.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Copyright (C) 2010 - 2015 + Copyright (C) 2010 - 2016 All Rights Reserved. Contributor(s): @@ -473,30 +473,34 @@ include "root.php"; unset($sql); } - public function delete(){ + public function delete() { //connect to the database if needed if (!$this->db) { $this->connect(); } + //delete from the database - $sql = "delete from ".$this->table." "; - if ($this->where) { - $i = 0; - foreach($this->where as $row) { - if ($i == 0) { - $sql .= "where ".$row['name']." ".$row['operator']." '".$row['value']."' "; + if (isset($this->table) && isset($this->where)) { + $sql = "delete from ".$this->table." "; + if ($this->where) { + $i = 0; + foreach($this->where as $row) { + if ($i == 0) { + $sql .= "where ".$row['name']." ".$row['operator']." '".$row['value']."' "; + } + else { + $sql .= "and ".$row['name']." ".$row['operator']." '".$row['value']."' "; + } + $i++; } - else { - $sql .= "and ".$row['name']." ".$row['operator']." '".$row['value']."' "; - } - $i++; } + //echo $sql."
\n"; + $prep_statement = $this->db->prepare($sql); + $prep_statement->execute(); + unset($sql); + unset($this->where); + return; } - //echo $sql."
\n"; - $prep_statement = $this->db->prepare($sql); - $prep_statement->execute(); - unset($sql); - unset($this->where); } public function count() {