Cosmetic, as usual

bureau/admin/dom_edit.inc.php

@@ -76,13 +76,9 @@ $dom->unlock();
         <?php 
 
         switch ($dt['target']) {
-          case "NONE":
-          default:
-            break;
           case "DIRECTORY": ?>
             <input type="text" class="int" name="t_<?php echo $dt['name']?>" id="t_<?php echo $dt['name']?>" value="<?php ehe($targval); ?>" size="28" onKeyPress="getElementById('r_<?php echo $dt['name']?>').checked=true;" />
-						<?php display_browser( $targval , "main.t_".$dt['name'] ); ?>
+            <?php display_browser( $targval , "main.t_".$dt['name'] ); 
-						<?php
             break;
           case "URL": ?>
               <input type="text" class="int" name="t_<?php echo $dt['name']?>" id="t_<?php echo $dt['name']?>" value="<?php ehe( (empty($targval)?'http://':$targval) ); ?>" size="50" onKeyPress="getElementById('r_<?php echo $dt['name']?>').checked=true;" />
@@ -104,6 +100,9 @@ $dom->unlock();
               <input type="text" class="int" name="t_<?php echo $dt['name']?>" id="t_<?php echo $dt['name']?>" value="<?php ehe($targval);?>" size="32" onKeyPress="getElementById('r_<?php echo $dt['name']?>').checked=true;" /> 
             <small><?php __("(enter a domain name or subdomain)"); ?></small><?php
               break;
+          case "NONE":
+          default:
+            break;
         } // switch ?>
       </td>
     </tr>

bureau/class/db_mysql.php

@@ -27,6 +27,7 @@ class DB_Sql {
   /* public: result array and current row number */
   var $Record   = array();
   var $Row;
+  var $num_rows;
 
   /* public: current error number and error text */
   var $Errno    = 0;

bureau/class/m_action.php

@@ -176,7 +176,7 @@ class m_action {
      * @global m_mysql $db
      * @global m_err $err
      * @param string $type
-     * @param m_user $user
+     * @param string|integer $user wich user do we impersonate?
      * @param mixed $parameters
      * @return boolean
      */
@@ -226,7 +226,7 @@ class m_action {
      * @param type $all
      * @return boolean
      */
-    function get_old($all = null) {
+    function get_old() {
         global $err, $db;
 
         $purge = "select * from actions where TO_DAYS(curdate()) - TO_DAYS(creation) > 2;";

bureau/class/m_dom.php

@@ -1091,6 +1091,7 @@ class m_dom {
       $err->raise("dom",_("The domain name is syntaxically incorrect"));
       return false;
     }
+    $r=array();
     $r["name"]=$dom;
     $db->query("SELECT * FROM domaines WHERE compte='$cuid' AND domaine='$dom'");
     if ($db->num_rows()==0) {
@@ -1509,6 +1510,7 @@ class m_dom {
   if (!$db->next_record()) {
     return false;
   }
+  $res=array();
   do {
     $res[]=$db->Record;
   } while ($db->next_record());

bureau/class/m_mysql.php

@@ -1072,12 +1072,13 @@ class m_mysql {
     global $db,$err,$cuid;
     $err->log("mysql","export");
     $db->query("SELECT login, pass, db, bck_mode, bck_dir, bck_history, bck_gzip FROM db WHERE uid='$cuid';");
+    $str="";
     if ($db->next_record()) {
-      $str =" <sql>\n";
+      $str.=" <sql>\n";
       $str.="   <login>".$db->Record["login"]."</login>\n";
       $str.="   <pass>".$db->Record["pass"]."</pass>\n";
       do {
-        $filename=$tmpdir."/mysql.".$db->Record["db"].".sql.gz";
+        $filename=$tmpdir."/mysql.".$db->Record["db"].".sql.gz"; // FIXME not used
         $str.="   <database>".($db->Record["db"])."</database>\n";
         $str.="   <password>".($db->Record["pass"])."</password>\n";
         if ($s["bck_mode"]!=0) { // FIXME what is $s ?

phpunit/bootstrap.php

@@ -145,7 +145,7 @@ $queryList = array(
 foreach ($queryList as $exec_command) {
     exec($exec_command,$output,$return_var);
     if(  $return_var){
-        throw new \Exception("[!] Mysql exec error : $exec_command \n Error : \n ".print_r($output,1));
+        throw new \Exception("[!] Mysql exec error : $exec_command \n Error : \n ".print_r($output,true));
     }
 }
 $db                                     = new \DB_system($user,$database,$password);