diff --git a/bureau/admin/menu_adm.php b/bureau/admin/menu_adm.php index 61f8567f..9ce08242 100644 --- a/bureau/admin/menu_adm.php +++ b/bureau/admin/menu_adm.php @@ -1,13 +1,9 @@
diff --git a/bureau/admin/menu_brouteur.php b/bureau/admin/menu_brouteur.php index 5f08273d..c1fdb68e 100644 --- a/bureau/admin/menu_brouteur.php +++ b/bureau/admin/menu_brouteur.php @@ -1,13 +1,8 @@
<?php __(" /> 
-
\ No newline at end of file +
diff --git a/bureau/admin/menu_cron.php b/bureau/admin/menu_cron.php index 86fb2298..6c490963 100644 --- a/bureau/admin/menu_cron.php +++ b/bureau/admin/menu_cron.php @@ -1,13 +1,9 @@ getquota("cron"); -if ($q['t'] > 0) { +if ($q['t'] > 0 || $q['u'] > 0) { ?>
diff --git a/bureau/admin/menu_dom.php b/bureau/admin/menu_dom.php index 6985dbdd..41d122ff 100644 --- a/bureau/admin/menu_dom.php +++ b/bureau/admin/menu_dom.php @@ -1,13 +1,9 @@ getquota("dom"); -if ($q["t"] > 0) +if ($q["t"] > 0 || $q['u'] > 0) { ?> diff --git a/bureau/admin/menu_ftp.php b/bureau/admin/menu_ftp.php index b3321251..83f9e7b4 100644 --- a/bureau/admin/menu_ftp.php +++ b/bureau/admin/menu_ftp.php @@ -1,13 +1,9 @@ getquota("ftp"); -if ($q["t"] > 0) { +if ($q["t"] > 0 || $q['u'] > 0) { ?>
diff --git a/bureau/admin/menu_ip.php b/bureau/admin/menu_ip.php index 7294be02..8397363a 100644 --- a/bureau/admin/menu_ip.php +++ b/bureau/admin/menu_ip.php @@ -1,13 +1,9 @@ getquota("mail"); $r = $quota->getquota("dom"); -if ($q["t"] > 0 && $r["u"] > 0) { +if ($q["t"] > 0 || $r["u"] > 0) { ?>
diff --git a/bureau/admin/menu_mem.php b/bureau/admin/menu_mem.php index 0bc158c4..311e57bc 100644 --- a/bureau/admin/menu_mem.php +++ b/bureau/admin/menu_mem.php @@ -1,13 +1,9 @@
@@ -33,4 +26,4 @@
<?php __(" /> 
-
\ No newline at end of file +
diff --git a/bureau/admin/menu_piwik.php b/bureau/admin/menu_piwik.php index a900a472..6eb433a3 100644 --- a/bureau/admin/menu_piwik.php +++ b/bureau/admin/menu_piwik.php @@ -1,13 +1,9 @@ getquota("piwik"); -if (!empty($piwik->piwik_server_uri) && $q["t"] > 0 && $r["u"] > 0) { +if (!empty($piwik->piwik_server_uri) && ($q["t"] > 0 || $r["u"] > 0)) { ?>
<?php __(" />  (/)
diff --git a/bureau/admin/menu_quota.php b/bureau/admin/menu_quota.php index 9dbd3cf5..33bab1d3 100644 --- a/bureau/admin/menu_quota.php +++ b/bureau/admin/menu_quota.php @@ -1,13 +1,9 @@
@@ -47,6 +40,7 @@ $first=true; while (list($key,$val)=each($qlist)) { $col=3-$col; + // FIXME: rewrite it if (($key == 'bw_web' || $key == 'web') && (isset($q[$key]["t"]) && $q[$key]["t"] > 0)) { if ($first) { echo '
' . _("Quotas") . '
'; diff --git a/bureau/admin/menu_sql.php b/bureau/admin/menu_sql.php index bf905a15..be57b5b2 100644 --- a/bureau/admin/menu_sql.php +++ b/bureau/admin/menu_sql.php @@ -1,13 +1,9 @@ getquota("mysql"); -if ($q["t"]) { +if ($q["t"] > 0 || $q['u'] >0) { ?>
diff --git a/bureau/admin/menu_sta2.php b/bureau/admin/menu_sta2.php index bb361da5..57a02065 100644 --- a/bureau/admin/menu_sta2.php +++ b/bureau/admin/menu_sta2.php @@ -1,13 +1,9 @@ getquota("sta2"); $r = $quota->getquota("dom"); -if ($q["t"] > 0 && $r["u"] > 0) { +if ($q["t"] > 0 || $r["u"] > 0) { ?>
<?php __(" />  (/)
diff --git a/bureau/admin/menu_web.php b/bureau/admin/menu_web.php index de3d19ba..ef47551e 100644 --- a/bureau/admin/menu_web.php +++ b/bureau/admin/menu_web.php @@ -1,14 +1,10 @@
<?php __(" /> 
-
\ No newline at end of file +
diff --git a/bureau/class/m_cron.php b/bureau/class/m_cron.php index 17b0b972..ed21e1cd 100644 --- a/bureau/class/m_cron.php +++ b/bureau/class/m_cron.php @@ -152,26 +152,18 @@ class m_cron { return $r; } - - /*---------------------------------------------------------------------------*/ - /** hook for quota name - */ - function hook_quota_names() { - return array("cron"=>_("Scheduled tasks")); - } - - /*---------------------------------------------------------------------------*/ /** hook for quota computation */ function hook_quota_get() { global $cuid,$db,$err; $err->log("cron","alternc_get_quota"); + $q=Array("name"=>"cron", "description"=>_("Scheduled tasks"), "used"=>0); $db->query("select count(*) as cnt from cron where uid = $cuid;"); if ($db->next_record()) { - return $db->f('cnt'); + $q['used']=$db->f('cnt'); } - return false; + return $q; } diff --git a/bureau/class/m_dom.php b/bureau/class/m_dom.php index 3c219be0..1e4a82c8 100644 --- a/bureau/class/m_dom.php +++ b/bureau/class/m_dom.php @@ -85,14 +85,6 @@ class m_dom { function m_dom() { } - /* ----------------------------------------------------------------- */ - /** - * Quota name - */ - function hook_quota_names() { - return array("dom"=>_("Domain name")); - } - /* ----------------------------------------------------------------- */ /** * Retourne un tableau contenant les types de domaines @@ -1280,14 +1272,15 @@ class m_dom { * @return integer the number of service used or false if an error occured * @access private */ - function hook_quota_get($name) { + function hook_quota_get() { global $db,$err,$cuid; - if ($name=="dom") { - $err->log("dom","get_quota"); - $db->query("SELECT COUNT(*) AS cnt FROM domaines WHERE compte='$cuid'"); - $db->next_record(); - return $db->f("cnt"); - } else return false; + $err->log("dom","get_quota"); + $q=Array("name"=>"dom", "description"=>_("Domain name"), "used"=>0); + $db->query("SELECT COUNT(*) AS cnt FROM domaines WHERE compte='$cuid'"); + if ($db->next_record() ) { + $q['used']=$db->f("cnt"); + } + return $q; } diff --git a/bureau/class/m_ftp.php b/bureau/class/m_ftp.php index c34c57eb..ab7327dd 100644 --- a/bureau/class/m_ftp.php +++ b/bureau/class/m_ftp.php @@ -38,14 +38,6 @@ class m_ftp { function m_ftp() { } - /* ----------------------------------------------------------------- */ - /** - * Quota name - */ - function alternc_quota_names() { - return "ftp"; - } - /* ----------------------------------------------------------------- */ /** @@ -365,14 +357,15 @@ class m_ftp { * @return integer the number of service used or false if an error occured * @access private */ - function alternc_get_quota($name) { + function hook_quota_get() { global $db,$err,$cuid; - if ($name=="ftp") { - $err->log("ftp","getquota"); - $db->query("SELECT COUNT(*) AS cnt FROM ftpusers WHERE uid='$cuid'"); - $db->next_record(); - return $db->f("cnt"); - } else return false; + $err->log("ftp","getquota"); + $q=Array("name"=>"ftp", "description"=>_("FTP accounts"), "used"=>0); + $db->query("SELECT COUNT(*) AS cnt FROM ftpusers WHERE uid='$cuid'"); + if ($db->next_record()) { + $q['used']=$db->f("cnt"); + } + return $q; } diff --git a/bureau/class/m_mail.php b/bureau/class/m_mail.php index 9ce2f803..a4a77520 100644 --- a/bureau/class/m_mail.php +++ b/bureau/class/m_mail.php @@ -65,15 +65,6 @@ class m_mail { */ var $total; - - /* ----------------------------------------------------------------- */ - /** Quota list (hook for quota class, returns an array of hashes) - */ - function hook_quota_names() { - return array("mail"=>_("Email addresses")); - } - - /* ----------------------------------------------------------------- */ /** get_quota (hook for quota class), returns the number of used * service for a quota-bound service @@ -81,15 +72,15 @@ class m_mail { * @return the number of used service for the specified quota, * or false if I'm not the one for the named quota */ - function hook_quota_get($name) { + function hook_quota_get() { global $db,$err,$cuid; - if ($name=="mail") { - $err->log("mail","getquota"); - $db->query("SELECT COUNT(*) AS cnt FROM address a, domaines d WHERE a.domain_id=d.id AND d.compte=$cuid AND a.type='';"); - $db->next_record(); - return $db->f("cnt"); + $err->log("mail","getquota"); + $q=Array("name"=>"mail", "description"=>_("Email addresses"), "used"=>0); + $db->query("SELECT COUNT(*) AS cnt FROM address a, domaines d WHERE a.domain_id=d.id AND d.compte=$cuid AND a.type='';"); + if ($db->next_record()) { + $q['used']=$db->f("cnt"); } - return false; + return $q; } diff --git a/bureau/class/m_piwik.php b/bureau/class/m_piwik.php index ab635597..e8f41f9d 100644 --- a/bureau/class/m_piwik.php +++ b/bureau/class/m_piwik.php @@ -48,15 +48,6 @@ class m_piwik { } } - - /** - * Quota name - */ - function hook_quota_names() { - return array("piwik"=>_("Statistics through Piwik accounts")); - } - - /* ----------------------------------------------------------------- */ /** hook called when an AlternC account is deleted */ @@ -72,14 +63,14 @@ class m_piwik { * @return integer the number of service used or false if an error occured * @access private */ - function hook_quota_get($name) { + function hook_quota_get() { global $db, $cuid; - if ($name=="piwik") { - $db->query("SELECT COUNT(id) AS nb FROM piwik_users WHERE uid='$cuid'"); - $db->next_record(); - return $db->f('nb'); - } else - return false; + $db->query("SELECT COUNT(id) AS nb FROM piwik_users WHERE uid='$cuid'"); + $q=Array("name"=>"piwik", "description"=>_("Statistics through Piwik accounts"), "used"=>0); + if ($db->next_record()) { + $q['used']=$db->f('nb'); + } + return $q; } diff --git a/bureau/class/m_quota.php b/bureau/class/m_quota.php index da39ad8a..0d8f95e1 100644 --- a/bureau/class/m_quota.php +++ b/bureau/class/m_quota.php @@ -74,32 +74,10 @@ class m_quota { while (list($key,$val)=each($this->disk)) { $qlist[$key]=_("quota_".$key); // those are specific disks quotas. } - // TODO: old hook method FIXME: remove this when unused - foreach($classes as $c) { - if (method_exists($GLOBALS[$c],"alternc_quota_names")) { - $res=$GLOBALS[$c]->alternc_quota_names(); // returns a string or an array. - if($res != "") { - if (is_array($res)) { - foreach($res as $k) { - $qlist[$k]=_("quota_".$k); - $this->clquota[$k]=$c; - } - } else { - $qlist[$res]=_("quota_".$res); - $this->clquota[$res]=$c; - } - } - } + + foreach($this->getquota() as $qq) { + $qlist[$qq['name']]=$qq['description']; } - // New Hook - $qname=$hooks->invoke("hook_quota_names"); // return strings or arrays - foreach($qname as $res) - if ($res && is_array($res)) { - foreach($res as $k=>$v) { - $qlist[$k]=$v; - $this->clquota[$k]=$k; - } - } return $qlist; } @@ -116,48 +94,27 @@ class m_quota { // This function is called many time each webpage, so I cache the result $this->quotas = $get_quota_cache[$cuid]; } else { - $this->qlist(); // Generate the quota list. - $db->query("select * from quotas where uid='$cuid';"); - if ($db->num_rows()==0) { - return array("t"=>0, "u"=>0); - } else { - while ($db->next_record()) { - $ttmp[$db->f("name")]=$db->Record; - } - foreach($this->clquota as $k=>$v) { - if (!isset($ttmp[$k])) { - $ttmp[$k]=array("name" => $k, "total" => 0); - } - } - // TODO: old hook method FIXME: remove when unused - foreach ($ttmp as $tt) { - if (! isset( $this->clquota[$tt["name"]] )) continue; - if (method_exists($GLOBALS[$this->clquota[$tt["name"]]],"alternc_get_quota")) { - $this->quotas[$tt["name"]] = - array( - "t"=>$tt["total"], - "u"=> $GLOBALS[$this->clquota[$tt["name"]]]->alternc_get_quota($tt["name"]) - ); - } - } - // New Hook : - foreach ($ttmp as $tt) { - $res=$hooks->invoke("hook_quota_get",array($tt["name"])); - foreach($res as $r) { - if ($r!==false) { - $this->quotas[$tt["name"]]=array("t"=>$tt["total"],"u"=>$r); - } - } + $res=$hooks->invoke("hook_quota_get"); + foreach($res as $r) { + $this->quotas[$r['name']]=$r; + $this->quotas[$r['name']]['u']=$r['used']; // retrocompatibilité + $this->quotas[$r['name']]['t']=0; // Default quota = 0 } reset($this->disk); while (list($key,$val)=each($this->disk)) { $a=array(); exec("/usr/lib/alternc/quota_get ".$cuid ,$a); - $this->quotas[$val]=array("t"=>$a[1],"u"=>$a[0]); + $this->quotas[$val]=array("name"=>"$val", 'description'=>_("quota_".$val), "t"=>$a[1],"u"=>$a[0]); } + + // Get the allowed quota from database. + $db->query("select name, total from quotas where uid='$cuid';"); + while ( $db->next_record() ) { + $this->quotas[$db->f('name')]['t']=$db->f('total'); + } + $get_quota_cache[$cuid] = $this->quotas; } - } if ($ressource) { if (isset($this->quotas[$ressource]) ) { @@ -262,7 +219,6 @@ class m_quota { function addtype($type) { global $db,$err; $qlist=$this->qlist(); - reset($qlist); if(empty($type)) return false; $type=strtolower($type); if (!preg_match("#^[a-z0-9]*$#",$type)) { @@ -301,7 +257,6 @@ class m_quota { function deltype($type) { global $db; $qlist=$this->qlist(); - reset($qlist); if($db->query("UPDATE membres SET type='default' WHERE type='$type'") && $db->query("DELETE FROM defquotas WHERE type='$type'")) { diff --git a/bureau/class/m_sta2.php b/bureau/class/m_sta2.php index 284d97ce..93223a4c 100644 --- a/bureau/class/m_sta2.php +++ b/bureau/class/m_sta2.php @@ -47,16 +47,6 @@ class m_sta2 { function m_sta2() { } - /* ----------------------------------------------------------------- */ - /** Hook function that returns the quota names for this class - * - * @return string the quota names for this class - */ - function alternc_quota_names() { - return "sta2"; - } - - /* ----------------------------------------------------------------- */ /** Returns the list of domains and/or subdomains for this account * @@ -271,14 +261,15 @@ class m_sta2 { * @return integer the number of service used or false if an error occured * @access private */ - function alternc_get_quota($name) { + function hook_quota_get() { global $db,$err,$cuid; - if ($name=="sta2") { - $err->log("sta2","get_quota"); - $db->query("SELECT COUNT(*) AS cnt FROM stats2 WHERE mid='$cuid'"); - $db->next_record(); - return $db->f("cnt"); - } else return false; + $err->log("sta2","get_quota"); + $q=Array("name"=>"sta2", "description"=>_("RAW Statistics"), "used"=>0); + $db->query("SELECT COUNT(*) AS cnt FROM stats2 WHERE mid='$cuid'"); + if ($db->next_record()) { + $q['used']=$db->f("cnt"); + } + return $q; } diff --git a/install/upgrades/1.1.sql b/install/upgrades/1.1.sql index 0a52320e..cdb45d0f 100644 --- a/install/upgrades/1.1.sql +++ b/install/upgrades/1.1.sql @@ -214,3 +214,6 @@ CREATE TABLE IF NOT EXISTS `piwik_sites` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; +-- No longer MySQL User quotas +DELETE FROM defquotas WHERE quota = 'mysql_users'; +DELETE FROM quotas WHERE name = 'mysql_users';