From f1a4587ef143b2f731b1aba0ceccfb810e78aebe Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Fri, 1 Feb 2013 07:59:37 +0000
Subject: [PATCH] Bugfixes

---
 bureau/admin/ftp_edit.php  | 2 ++
 bureau/admin/mail_edit.php | 2 +-
 bureau/admin/main.php      | 1 +
 bureau/class/m_mysql.php   | 4 ++++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bureau/admin/ftp_edit.php b/bureau/admin/ftp_edit.php
index bdd99af6..95c38097 100644
--- a/bureau/admin/ftp_edit.php
+++ b/bureau/admin/ftp_edit.php
@@ -41,6 +41,8 @@ if ( !isset($is_include) ) {
 
 if (!$id && !$create) {
   $error=_("Neither a creation nor a edition");
+  echo "<h3>"._("Create a FTP account")."</h3>";
+  echo "<p class=\"error\">$error</p>";
   include_once("foot.php");
   exit();
 }
diff --git a/bureau/admin/mail_edit.php b/bureau/admin/mail_edit.php
index 590ac289..450632ae 100644
--- a/bureau/admin/mail_edit.php
+++ b/bureau/admin/mail_edit.php
@@ -82,7 +82,7 @@ if (isset($error)) {
 <p><?php printf(_('This mailbox is currently using %1$s / %2$s'),format_size($used),format_size($quotabytes)); ?></p>
 <?php } ?>
 <?php if ($mailbox_action=="DELETE") { ?>
-<p><span class="error"><?php __("This mailbox is pending deletion. You can recover its mails by setting it to 'Yes' NOW!"); ?></span></p>
+<p class="error"><?php __("This mailbox is pending deletion. You can recover its mails by setting it to 'Yes' NOW!"); ?></p>
 <?php } ?>
 </td>
     <td>
diff --git a/bureau/admin/main.php b/bureau/admin/main.php
index e7596526..0435ce33 100644
--- a/bureau/admin/main.php
+++ b/bureau/admin/main.php
@@ -44,6 +44,7 @@ if ($mem->user["lastfail"]) {
 	printf(_("%1\$d login failed since last login")."<br />",$mem->user["lastfail"]);
 }
 
+if (!empty($error) ) { echo "<p class='error'>$error</p>";$error=''; } 
 ?>
 <center>
 <?php
diff --git a/bureau/class/m_mysql.php b/bureau/class/m_mysql.php
index 29f4608e..2e05d969 100644
--- a/bureau/class/m_mysql.php
+++ b/bureau/class/m_mysql.php
@@ -476,6 +476,10 @@ class m_mysql {
   function restore($file,$stdout,$id) { 
     // TODO don't work with the separated sql serveur for dbusers
     global $err,$bro,$mem,$L_MYSQL_HOST;
+    if (empty($file)) {
+      $err->raise("mysql",_("No file specified"));
+      return false; 
+    }
     if (!$r=$this->get_mysql_details($id)) { 
       return false; 
     }