From 437cf3cfdf89c3f95edae94209e098a2458ce47e Mon Sep 17 00:00:00 2001
From: Alexis Lahouze <xals@lahouze.org>
Date: Mon, 2 May 2011 23:41:09 +0000
Subject: [PATCH] Merge r2926 et r2927 dans branche stable-1.0

---
 bureau/admin/styles/style.css | 1 +
 bureau/class/m_mysql.php      | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bureau/admin/styles/style.css b/bureau/admin/styles/style.css
index e7b7eec6..d8dccdc2 100644
--- a/bureau/admin/styles/style.css
+++ b/bureau/admin/styles/style.css
@@ -281,6 +281,7 @@ img {
 	padding-left: 2px;
 	text-decoration: none;
 	border: 1px solid #F1F8FD;
+  line-height: 0.75em;
 }
 
 .menu-box li a img {
diff --git a/bureau/class/m_mysql.php b/bureau/class/m_mysql.php
index a2f1af95..f900ddd4 100644
--- a/bureau/class/m_mysql.php
+++ b/bureau/class/m_mysql.php
@@ -401,7 +401,7 @@ class m_mysql {
   function get_userslist() {
     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);
       return false;
@@ -561,11 +561,10 @@ class m_mysql {
       else
         $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;
   }
 
-
   /* ------------------------------------------------------------ */
   /** 
    * Set the access rights of user $user to database $dbn to be rights $rights
@@ -645,9 +644,9 @@ class m_mysql {
       $err->log("mysql","alternc_get_quota");
       $c=$this->get_dblist();
       if (is_array($c)) {
-	return count($c);
+	      return count($c);
       } else {
-	return 0;
+	      return 0;
       }
     } elseif ($name=="mysql_users") {
       $err->log("mysql","alternc_get_quota");