diff --git a/bureau/admin/sql_bck.php b/bureau/admin/sql_bck.php index e6111532..502eb92b 100755 --- a/bureau/admin/sql_bck.php +++ b/bureau/admin/sql_bck.php @@ -52,13 +52,9 @@ $fields = array ( ); getFields($fields); -if (!$r=$mysql->get_mysql_details($id)) { - $error=$err->errstr(); -} +$r=$mysql->get_mysql_details($id); -if (isset($error) && $error) { - echo "
$error
"; -} +echo $msg->msg_html_all(); if (is_array($r)) { ?> diff --git a/bureau/admin/sql_del.php b/bureau/admin/sql_del.php index 550e1050..5dce21d7 100755 --- a/bureau/admin/sql_del.php +++ b/bureau/admin/sql_del.php @@ -35,20 +35,14 @@ $fields = array ( ); getFields($fields); -if(!isset($error)){ - $error=""; -} - if ($confirm=="y" ) { reset($_POST); while (list($key,$val)=each($_POST)) { if (substr($key,0,4)=="del_") { // Effacement de la base $val $r=$mysql->del_db(substr($key,4)); - if (!$r) { - $error.=$err->errstr()."
"._("You currently have no database defined")."
"; include_once("foot.php"); @@ -57,14 +56,11 @@ if (! $r["enabled"]) {restore($restfile,true,$id)) { - $error=$err->errstr(); -} else { - $error=_("Your database has been restored, check out the previous text for error messages."); +if ($mysql->restore($restfile,true,$id)) { + $msg->raise("ok", "mysql", _("Your database has been restored, check out the previous text for error messages.")); } // if mysql->restore -echo "
$error
"; - +echo $msg->msg_html_all(); ?> diff --git a/bureau/admin/sql_getparam.php b/bureau/admin/sql_getparam.php index 7d9fda0b..9c19c262 100644 --- a/bureau/admin/sql_getparam.php +++ b/bureau/admin/sql_getparam.php @@ -34,30 +34,35 @@ $fields = array ( "dbname" => array ("request", "string", ""), ); getFields($fields); -if (!$r=$mysql->get_dblist()) { +if (!$res=$mysql->get_dblist()) { $error=$err->errstr(); } -$r=$mysql->get_defaultsparam($dbname); -if (!$r) { - $error=$err->errstr(); -} +$res=$mysql->get_defaultsparam($dbname); ?>
"; - include_once("foot.php"); - exit(); - } +echo $msg->msg_html_all(); + +if ($msg->has_msgs("error")) { + include_once("foot.php"); + exit(); +} ?>
:
+ + 1)?"Paramètres ".$i:"Paramètres"; +?>'.$mysql->dbus->HumanHostname.''; ?> | +'.$title.''; ?> | ||||
---|---|---|---|---|---|
@@ -65,7 +70,7 @@ if (!$r) { | |||||
- |
|
+
|
|
+ ||
Droits de l'utilisateur | +Sélectifs"; +} +?> +"> | +||||
@@ -95,6 +112,8 @@ if(!isset($r['user'])){
echo " ";__("You changed the MySQL User base configuration. Please refer to your configuration");echo" "; } ?> + + diff --git a/bureau/admin/sql_list.php b/bureau/admin/sql_list.php index 05f6913e..7e028572 100755 --- a/bureau/admin/sql_list.php +++ b/bureau/admin/sql_list.php @@ -38,12 +38,14 @@ $r=$mysql->get_userslist(); $error"; - } - if(!$r || empty($r)){ - echo " "._("You have no sql user at the moment.")." "; + // On regarde d'abord si on a une db existante. Sioui, on regarde si on a des utilisateurs existants + if(!$rdb || empty($rdb)){ + $msg->raise("info", "mysql", _("You have no database at the moment.")); + } else if(!$r || empty($r)){ + $msg->raise("info", "mysql", _("You have no sql user at the moment.")); } + +echo $msg->msg_html_all(); ?> - | |||||
+ | |||||
" class="inb delete" /> |
$error
"; -} +echo $msg->msg_html_all(); + include_once("foot.php"); ?> diff --git a/bureau/admin/sql_restore.php b/bureau/admin/sql_restore.php index 7b7d4ba3..1840467c 100755 --- a/bureau/admin/sql_restore.php +++ b/bureau/admin/sql_restore.php @@ -36,18 +36,14 @@ $fields = array ( ); getFields($fields); -if (!$r=$mysql->get_mysql_details($id)) { - $error=$err->errstr(); -} +$r=$mysql->get_mysql_details($id); ?>"; -} +echo $msg->msg_html_all(); if (!is_array($r)) { echo "
"._("You currently have no database defined")."
"; diff --git a/bureau/admin/sql_users_add.php b/bureau/admin/sql_users_add.php index 9a1726a6..4873da2a 100755 --- a/bureau/admin/sql_users_add.php +++ b/bureau/admin/sql_users_add.php @@ -37,21 +37,20 @@ $fields = array ( ); getFields($fields); +$c=$admin->listPasswordPolicies(); +$passwd_classcount = $c['mysql']['classcount']; + ?>