updated checkQuotas

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

diff --git a/lib/dbaccess.lib.php b/lib/dbaccess.lib.php
index 150aeabb552c252621c9862e5ac93e718fb7f3cb..a9550b3d9d058372e0d4118dcaa8d82da59c8f71 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);
@@ -59,14 +59,21 @@ function checkQuotas($userId=null) {
        if (empty($userId)) {
                $sql = 'SELECT DatabaseId,Name FROM DB WHERE bEnabled=1';
        } else {
-               $sql = sprintf("SELECT DB.DatabaseId,Name FROM DB INNER JOIN DBOwner ON DB.DatabaseId = DBOwner.DatabaseId WHERE bEnabled=1 AND UserId = '%s'", mysql_escape_string($userId));
+               if (is_array($userId)) {
+                       $sql_userId = sprintf("UserId IN ('%s')", implode("','",array_map('mysql_escape_string',$userId)));
+               } elseif (is_numeric($userId)) {
+                       $sql_userId = sprintf("UserId = '%s'", mysql_escape_string($userId));
+               } else {
+                       die('userId parameter error in checkQuotas');
+               }
+               $sql = sprintf("SELECT DB.DatabaseId,Name FROM DB INNER JOIN DBOwner ON DB.DatabaseId = DBOwner.DatabaseId WHERE bEnabled=1 AND %s", $sql_userId);
        }
        $databases = fetchRows(DBSelect($sql),'Name');
        foreach($databases as $db) {
                $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);
@@ -79,7 +86,7 @@ function checkQuotas($userId=null) {
                                  AND DB.bEnabled=1
                                GROUP BY UserId
                                ), dLastCheck = NOW()";
-       if (!empty($userId)) $sql .= sprintf(" WHERE UserId = '%s'", mysql_escape_string($userId));
+       if (!empty($userId)) $sql .= " WHERE $sql_userId";
        DBUpdate($sql);
        $sql = "UPDATE UserStat SET nDatabases = (
                                SELECT COUNT(*)
@@ -89,7 +96,7 @@ function checkQuotas($userId=null) {
                                  AND DB.bEnabled=1
                                GROUP BY UserId
                                ), dLastCheck = NOW()";
-       if (!empty($userId)) $sql .= sprintf(" WHERE UserId = '%s'", mysql_escape_string($userId));
+       if (!empty($userId)) $sql .= " WHERE $sql_userId";
        DBUpdate($sql);
 }