Changed conf class to new db

Issue #20 Also some whitespace fixes in database.inc.php
jeroenrnl · Jul 16, 2015 · 434b379 · 434b379
1 parent e162c95
commit 434b379
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/php/classes/conf.inc.php b/php/classes/conf.inc.php
@@ -55,11 +55,12 @@ public function  getId() {
      */
     public static function loadFromDB() {
         confDefault::getConfig();
-        $sql="SELECT conf_id, value FROM " . DB_PREFIX . "conf";
+        $qry=new select(array("co" => "conf"));
+        $qry->addFields(array("conf_id", "value"));
 
-        $result=query($sql, "Cannot load configuration from database");
+        $result=query($qry, "Cannot load configuration from database");
 
-        while($row= fetch_row($result)) {
+        while($row = fetch_row($result)) {
             $key=$row[0];
             $value=$row[1];
             try {
@@ -74,9 +75,10 @@ public static function loadFromDB() {
                 /* An unknown item will automatically be deleted from the
                    database, so we can remove items without leaving a mess */
                 log::msg($e->getMessage(), log::NOTIFY, log::CONF);
-                $sql="DELETE FROM " . DB_PREFIX . "conf WHERE " .
-                    "conf_id='" . escape_string($key) . "';";
-                query($sql);
+                $qry=new delete(array("co" => "conf"));
+                $qry->where(new clause("conf_id=:confid"));
+                $qry->addParam(new param(":confid", $key, PDO::PARAM_STR));
+                query($qry);
             }
 
         }

diff --git a/php/database.inc.php b/php/database.inc.php
@@ -43,7 +43,7 @@ function query($sql, $error = false) {
     log::msg($sql, log::NOTIFY, log::SQL);
 
     // New DB
-    if($sql instanceof query) {
+    if ($sql instanceof query) {
         return db::query($sql);
     } else {
 
@@ -84,26 +84,29 @@ function num_rows($result) {
 }
 
 function fetch_row($result) {
+    if ($result instanceof PDOStatement) {
+        return $result->fetch(PDO::FETCH_NUM);
+    }
     return mysql_fetch_row($result);
 }
 
 function fetch_array($result) {
-    if($result instanceof PDOStatement) {
+    if ($result instanceof PDOStatement) {
         return $result->fetch(PDO::FETCH_ASSOC);
     }
     return mysql_fetch_array($result);
 }
 
 function fetch_assoc($result) {
-    if($result instanceof PDOStatement) {
+    if ($result instanceof PDOStatement) {
         return $result->fetch(PDO::FETCH_ASSOC);
     }
     return mysql_fetch_assoc($result);
 }
 
 
 function free_result($result) {
-    if($result instanceof PDOStatement) {
+    if ($result instanceof PDOStatement) {
         return $result->closeCursor();
     }
     return mysql_free_result($result);
@@ -115,7 +118,7 @@ function insert_id() {
 
 function result($result, $row) {
     // $row is never used
-    if($result instanceof PDOStatement) {
+    if ($result instanceof PDOStatement) {
         return $result->fetch(PDO::FETCH_BOTH)[0];
     }
     return mysql_result($result, $row);