From 3845bdf8e696fcd5a72af0b722ff5ea5c3875cf1 Mon Sep 17 00:00:00 2001 From: Joe Presbrey Date: Tue, 24 Apr 2007 21:54:39 +0000 Subject: [PATCH] Use nDatabasesHard instead of MAXDBS git-svn-id: svn://presbrey.mit.edu/sql/web/dev@126 a142d4bd-2cfb-0310-9673-cb33a7e74f58 --- lib/proc.lib.php | 2 +- lib/security.lib.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/proc.lib.php b/lib/proc.lib.php index adf8252..865d498 100644 --- a/lib/proc.lib.php +++ b/lib/proc.lib.php @@ -16,7 +16,7 @@ class proc { $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 && !isAdmin()) { + } 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.'; diff --git a/lib/security.lib.php b/lib/security.lib.php index 98fdd51..ee5cf37 100644 --- a/lib/security.lib.php +++ b/lib/security.lib.php @@ -126,6 +126,9 @@ class User { function isOverQuota() { return $this->exists()?($this->info['bOverQuota']>0?true:false):''; } + function getDBQuotaHard() { + return $this->exists()?$this->info['nDatabasesHard']:0; + } function getBytes() { if($this->exists()) { $arr['nBytes'] = $this->info['nBytes']; -- 2.45.0