move SQL to use external joe libraries

[sql-web.git] / lib / dbaccess.lib.php

diff --git a/lib/dbaccess.lib.php b/lib/dbaccess.lib.php
index 696cdfe71d76e3d77210f4ce8913d43d2415ac41..19952608ba034cd9627ca56ff2a8c9cbda068c5d 100644 (file)
--- a/lib/dbaccess.lib.php
+++ b/lib/dbaccess.lib.php
@@ -1,6 +1,9 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
-require_once('joe.lib.php');
+require_once('joe/util.lib.php');
 
 function DBMaster($sql) {
        sessTime($sql);
@@ -12,14 +15,14 @@ function DBSlave($sql) {
        sessTime($sql);
        $res = mysql_query($sql);
        sessTime();
-       if (mysql_error()) die($sql."<br />\n".mysql_error());
+       if (mysql_error()) trigger_error($sql."<br />\n".mysql_error(),E_USER_ERROR);
        return $res;
 }
 
 function DBSelect($sql) { return DBSlave($sql); }
 function DBInsert($sql) {
        DBMaster($sql);
-       if (mysql_error()) die($sql."<br />\n".mysql_error());
+       if (mysql_error()) trigger_error($sql."<br />\n".mysql_error(),E_USER_ERROR);
        return mysql_insert_id();
 }
 function DBUpdate($sql) { DBInsert($sql); }
@@ -63,7 +66,7 @@ function checkQuotas($userId=null) {
                $DBId = $db['DatabaseId'];
                $arr['dLastCheck'] = 'NOW()';
                $arr['nBytes'] = calcDBSize($db['Name']);
-               $sql = sprintf("UPDATE DB %s WHERE DatabaseId = '%s'",
+               $sql = sprintf("UPDATE DB SET %s WHERE DatabaseId = '%s'",
                                                buildSQLSet($arr),
                                                mysql_escape_string($DBId));
                DBUpdate($sql);