Some cleanup

src/fix_dovecot_quota.php

@@ -1,17 +1,23 @@
-#!/usr/bin/php5	-q
+#!/usr/bin/php
 <?php
 require_once("/usr/share/alternc/panel/class/config_nochk.php");
 
+function usage($msg=null) {
+    if ($msg) {
+      echo "Error:\n$msg";
+    }
+    echo "usage : script -[m|l|d]\n";
+}
+
 #arguments can be a mailbox or a domain     or a login
 $options = getopt('m:l:d:');
 
-print_r($options);
 #parser les arguments correctement.
-#We check that only onei type of option is specified
+#We check that only one type of option is specified
 $nb=count($options);
 
 if ( $nb != 1 ){
-  echo "usage : script -[m|l|d]\n";
+    usage();
     exit(1);
 }
 
@@ -21,26 +27,32 @@ foreach($options as $opt => $val){
 }
 
 if ( $nb2 != 1 ){
-  echo "usage : script -[m|l|d]\n";
+    usage();
     exit(1);
 }
 
 
 #function taking a query used to select the mailbox(es) root and updating their quotas into the mailbox table
-function FixQuotaDovecot($query){
+function FixQuotaDovecot($conditions){
     global $db;
     $db2=new DB_System();
+    $query="SELECT mailbox.id,concat(path, '/Maildir/') as dir 
+            FROM 
+              mailbox 
+              join address on address.id = mailbox.address_id 
+              join domaines on domaines.id = address.domain_id
+            WHERE $conditions ;";
 
     if(!$db->query($query)){
-  	echo "failed";
+        usage("failed"); // FIXME real error
         exit(1);
     }
     while ($db->next_record()) {
         $dir=$db->f("dir");
         $id=$db->f("id");
-		$size = exec ( "/usr/bin/du -sb $dir|cut -f1" );
+        $size = exec ( "/usr/bin/du -sb $dir|cut -f1" ); // FIXME check return value
-		if(!$db2->query("UPDATE mailbox set bytes=$size where id=$id;")){
+        if(!$db2->query("UPDATE mailbox set bytes=".intval($size)." where id=".intval($id).";")){
-			echo "fail updating quota for mailbox :".$id."\n";
+            echo "Fail updating quota for mailbox : $id\n");
         }
     }
 
@@ -50,41 +62,32 @@ function FixQuotaDovecot($query){
 switch($opt){
     case "m":
         if (!filter_var($val,FILTER_VALIDATE_EMAIL)) {
-			echo " the email you entered is syntaxically incorrect\n";
+            usage("The email you entered is syntaxically incorrect");
             exit(1);
         }
-		$query="select mailbox.id,concat(path, '/Maildir/') as dir from mailbox 
+        $cond = "concat(address.address,'@',domaines.domaine) ='".$val ;
-							join address on address.id = mailbox.address_id 
-							join domaines on domaines.id = address.domain_id 
-							where concat(address.address,'@',domaines.domaine) ='".$val."';";
         break;
     case "l":
         $login=strtolower($val);
-    if (!preg_match("#^[a-z0-9]+$#",$login)) { //$
+        if (!preg_match("#^[a-z0-9]+$#",$login)) { //FIXME use an alternc function for that
-			echo " the login you entered is syntaxically incorrect\n";
+          usage("the login you entered is syntaxically incorrect");
           exit(1);
         }
-		$query=("select mailbox.id,concat(path, '/Maildir/') as dir from mailbox
+        $cond = "membres.login = ".mysql_real_escape_string($login) );
-							join address on mailbox.address_id = address.id
-							join domaines on address.domain_id = domaines.id
-							join membres on domaines.compte = membres.uid where membres.login = '".$login."';");
         break;
     case "d":
         if(checkfqdn($val) != 0){
-			echo " the domain you entered is syntaxically incorrect\n";
+            usage("The domain you entered is syntaxically incorrect");
             exit(1);
         }
-		$query="select mailbox.id,concat(path, '/Maildir/') as dir from mailbox  
+        $cond = "domaines.domaine = ".mysql_real_escape_string($val) ;
-							join address on mailbox.address_id = address.id
-							join domaines on address.domain_id = domaines.id where domaines.domaine = '".$val."' ;";
-		print_r($query);
         break;
     default:
-    echo "usage : script -[m|l|d]\n";
+        usage();
         exit(1);
 }
 
-FixQuotaDovecot($query);
+FixQuotaDovecot($cond);
 
 exit(0);