Use nDatabasesHard instead of MAXDBS

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

diff --git a/lib/proc.lib.php b/lib/proc.lib.php
index 55a3d8f8daa2805af7bd5a06be5de20f176750e5..865d49805ed95cb059a75f9911015cb1d4e6f4ee 100644 (file)
--- a/lib/proc.lib.php
+++ b/lib/proc.lib.php
@@ -1,16 +1,22 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
 require_once('mitsql.lib.php');
 
 define('MAXDBS', 20);
 
 class proc {
-       static function newdb(&$User, $i_newdb) {
+       static function newdb(&$User, &$i_newdb) {
+               // return through $i_newdb the full name of the created db
                $msg1 = $err1 = array();
-               $dbname = $User->getUsername().DELIMETER.$i_newdb;
-               if ($User->isOverQuota()) {
+               $uname = $User->getUsername();
+               $uname = str_replace('.','',$uname);
+               $dbname = $uname.DELIMETER.$i_newdb;
+               if ($User->isOverQuota() && !isAdmin()) {
                        $err1[] = 'You are over your quota. You may not add more databases.';
-               } elseif (count($User->getDBList())>MAXDBS) {
+               } elseif (count($User->getDBList())>=$User->getDBQuotaHard() && !isAdmin()) {
                        $err1[] = 'You have too many databases. You may not add more databases.';
                } elseif (empty($i_newdb)) {
                        $err1[] = 'Your database name may not be empty.';
@@ -23,6 +29,7 @@ class proc {
                } else {
                        $msg1[] = 'Database `'.$dbname.'` created.';
                }
+               $i_newdb = $dbname;
                return array($msg1, $err1);
        }
        static function drop(&$User, $i_drop) {