kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge r2926 et r2927 dans branche stable-1.0

This commit is contained in:
Alexis Lahouze 2011-05-02 23:41:09 +00:00
parent 49716fe39a
commit 437cf3cfdf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bureau/admin/styles/style.css
View File

@ -281,6 +281,7 @@ img {
padding-left: 2px;
text-decoration: none;
border: 1px solid #F1F8FD;
line-height: 0.75em;
}
.menu-box li a img {

9
bureau/class/m_mysql.php
View File

@ -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");