Changeset 2929

Timestamp:

05/03/11 01:41:09 (2 years ago)

Author:

xals

Message:

Merge r2926 et r2927 dans branche stable-1.0

Location:

alternc/branches/stable-1.0

Files:

• . (modified) (1 prop)
• bureau/admin/styles/style.css (modified) (1 diff)
• bureau/class/m_mysql.php (modified) (3 diffs)
• etc/alternc/functions_hosting (modified) (1 prop)
• etc/alternc/templates/apache2/url.conf (modified) (1 prop)
• etc/alternc/templates/apache2/vhost.conf (modified) (1 prop)
• src/functions_dns.sh (modified) (1 prop)
• src/functions_hosting.sh (modified) (1 prop)

alternc/branches/stable-1.0/bureau/admin/styles/style.css

@@ -282 +282 @@
         text-decoration: none;
         border: 1px solid #F1F8FD;
+  line-height: 0.75em;
 }
 

alternc/branches/stable-1.0/bureau/class/m_mysql.php

@@ -402 +402 @@
     global $db,$err,$bro,$cuid;
     $err->log("mysql","get_userslist");
-    $db->query("SELECT name FROM dbusers WHERE uid='$cuid';");
+    $db->query("SELECT name FROM dbusers WHERE uid='$cuid' ORDER BY name;");
     if (!$db->num_rows()) {
       $err->raise("mysql",19);
@@ -562 +562 @@
         $r[]=array("db"=>$dblist[$i]["name"], "select"=>"N", "insert"=>"N", "update"=>"N", "delete"=>"N", "create"=>"N", "drop"=>"N", "references"=>"N", "index"=>"N", "alter"=>"N", "Create_tmp"=>"N", "lock"=>"N" );
     }
-
+    
     return $r;
   }
-
 
   /* ------------------------------------------------------------ */
@@ -646 +645 @@
       $c=$this->get_dblist();
       if (is_array($c)) {
-        return count($c);
+              return count($c);
       } else {
-        return 0;
+              return 0;
       }
     } elseif ($name=="mysql_users") {