move SQL to use external joe libraries

git-svn-id: svn://presbrey.mit.edu/sql/web/dev@120 a142d4bd-2cfb-0310-9673-cb33a7e74f58

diff --git a/lib/dbaccess.lib.php b/lib/dbaccess.lib.php
index 150aeabb552c252621c9862e5ac93e718fb7f3cb..19952608ba034cd9627ca56ff2a8c9cbda068c5d 100644 (file)
--- a/lib/dbaccess.lib.php
+++ b/lib/dbaccess.lib.php
@@ -3,7 +3,7 @@
        (c) 2005 Joe Presbrey
 */
 
-require_once('joe.lib.php');
+require_once('joe/util.lib.php');
 
 function DBMaster($sql) {
        sessTime($sql);
@@ -66,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);

diff --git a/lib/mitsql.lib.php b/lib/mitsql.lib.php
index 519e2d2c16e0b9dec215910ea613cbca7b22f340..4d915b5de183167f4fe33c3763f8d87af19926de 100755 (executable)
--- a/lib/mitsql.lib.php
+++ b/lib/mitsql.lib.php
@@ -5,7 +5,7 @@
        written for SIPB/MIT SQL service
 */
 
-require_once('joe.lib.php');
+require_once('joe/util.lib.php');
 require_once('dbaccess.lib.php');
 
 require_once('mitsql.cfg.php');

diff --git a/lib/security.lib.php b/lib/security.lib.php
index 0b7c384da06da09ec7a4860dd72c5b40037de23f..bb32be66c55a1d1ed3bda5186532a296699ae589 100644 (file)
--- a/lib/security.lib.php
+++ b/lib/security.lib.php
@@ -73,7 +73,7 @@ class Login {
         is_null($name) || $arr['Name'] = $name;
         is_null($email) || $arr['Email'] = $email;
                $upd = buildSQLSet($arr);
-        $sql = sprintf("UPDATE User %s WHERE UserId = '%s'",
+        $sql = sprintf("UPDATE User SET %s WHERE UserId = '%s'",
                         $upd, mysql_escape_string($this->getUserId()));
                if (!empty($upd) && $upd != 'SET')
                        DBUpdate($sql);
@@ -136,7 +136,7 @@ class User {
     }
        function setPassword($pwd) {
                $arr['Password'] = base64_encode($pwd);
-        $sql = sprintf("UPDATE User %s WHERE UserId = '%s'",
+        $sql = sprintf("UPDATE User SET %s WHERE UserId = '%s'",
                         buildSQLSet($arr), mysql_escape_string($this->getUserId()));
         DBUpdate($sql);
                $sql = sprintf('SET PASSWORD FOR \'%s\'@\'%%\'=PASSWORD(\'%s\')',
@@ -149,7 +149,7 @@ class User {
                $arr['Password'] = base64_encode($pwd);
                $arr['bEnabled'] = 1;
                $arr['dSignup'] = 'NOW()';
-        $sql = sprintf("UPDATE User %s WHERE UserId = '%s'",
+        $sql = sprintf("UPDATE User SET %s WHERE UserId = '%s'",
                         buildSQLSet($arr), mysql_escape_string($this->getUserId()));
         DBUpdate($sql);
 
@@ -358,7 +358,7 @@ function addDB($dbname,$userid) {
                } else {
                        return false;
                }
-               $sql = sprintf("UPDATE DB %s WHERE DB.DatabaseId = '%s'",
+               $sql = sprintf("UPDATE DB SET %s WHERE DB.DatabaseId = '%s'",
                                                buildSQLSet($arr),
                                                $DBId);
                DBUpdate($sql);
@@ -389,7 +389,7 @@ function delDB($dbname) {
        DBCreate(sprintf('DROP DATABASE `%s`', mysql_escape_string($dbname)));
 
        $arr['bEnabled'] = 0;
-       $sql = sprintf("UPDATE DB %s WHERE DB.Name = '%s'",
+       $sql = sprintf("UPDATE DB SET %s WHERE DB.Name = '%s'",
                                        buildSQLSet($arr),
                                        $dbname);
        DBUpdate($sql);