Changeset 3171

Timestamp:

06/12/12 19:14:16 (11 months ago)

Author:

squidly

Message:

Bugfixes pour la gestion des quotas diques

Location:

alternc/trunk

Files:

• bureau/admin/quotas_users.php (modified) (1 diff)
• bureau/class/m_quota.php (modified) (1 diff)
• install/mysql.sql (modified) (1 diff)
• src/quota_init (modified) (1 diff)
• src/spoolsize.php (modified) (1 diff)

alternc/trunk/bureau/admin/quotas_users.php

@@ -281 +281 @@
   list($ws)=@mysql_fetch_array(mysql_query("SELECT size FROM size_web WHERE uid='".$c["uid"]."';"));
 
-        if ($totalweb)
+        if (isset($totalweb) && $totalweb){
                 $pc=intval(100*$ws/$totalweb);
-        else
+        }
+        else{
                 $pc=0;
+        }
 
 if ($mode==0) {

alternc/trunk/bureau/class/m_quota.php

@@ -182 +182 @@
       // It's a disk resource, update it with shell command
       exec("/usr/lib/alternc/quota_edit $cuid $size");
-        echo "quota set :::::ciud: $cuid :::: size: $size :::: \n ";
       // Now we check that the value has been written properly : 
-      exec("/usr/lib/alternc/quota_get ".$cuid,$a);
-        print_r($a);
+      exec("usr/lib/alternc/quota_get $cuid",$a);
     if ($size!=$a[1]) {
         $err->raise("quota",1);

alternc/trunk/install/mysql.sql

@@ -328 +328 @@
 
 INSERT IGNORE INTO defquotas (quota,value) VALUES ('dom',1);
+INSERT IGNORE INTO defquotas (quota,value) VALUES ('web',51200);
 INSERT IGNORE INTO defquotas (quota,value) VALUES ('mail',10);
 INSERT IGNORE INTO defquotas (quota,value) VALUES ('ftp',2);

alternc/trunk/src/quota_init

@@ -53 +53 @@
 while ($c=mysql_fetch_array($r)) {
         $s=mysql_query("SELECT name FROM quotas WHERE uid='$c[uid]' AND name='$name';");
-        if (!mysql_num_rows($s)) {
-                mysql_query("INSERT INTO quotas (uid,name,total) VALUES ('$c[uid]','$name','$quota');");
+        if (mysql_num_rows($s)) {
+                mysql_query("INSERT INTO quotas (uid,name,total) VALUES ('$c[uid]','$name','$quota') on DUPLICATE KEY UPDATE total=$quota;");
         }
 }

alternc/trunk/src/spoolsize.php

@@ -7 +7 @@
 
 echo "---------------------------\n Generating size-cache for mail accounts\n\n";
-$r=mysql_query("SELECT * FROM mail_users WHERE alias NOT LIKE '%@%' AND alias LIKE '%\_%';");
+$r=mysql_query("SELECT * FROM dovecot_view ;");
 while ($c=mysql_fetch_array($r)) {
-  echo $c["alias"]; flush();
-  $size=exec("/usr/lib/alternc/du.pl ".$c["path"]);
-  mysql_query("REPLACE INTO size_mail SET alias='".addslashes($c["alias"])."',size='$size';");
+  echo $c["user"]; flush();
+  $size=exec("/usr/lib/alternc/du.pl ".$c["userdb_home"]);
+  mysql_query("REPLACE INTO size_mail SET alias='".addslashes($c["user"])."',size='$size';");
   echo " done ($size KB)\n";  flush();
 }