From ca33bbff5905dc816a7c81247d6ec0a55c4aed57 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Sun, 3 Mar 2013 13:23:22 +0000
Subject: [PATCH] Permet de restaurer un dump SQL depuis l'explorateur de
 fichier.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Plus facile pour sélectionner un dump ;)
---
 bureau/admin/bro_main.php    | 33 +++++++++++++++++++++++++++++----
 bureau/admin/sql_restore.php |  5 +++--
 bureau/class/m_bro.php       | 10 ++++++++++
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/bureau/admin/bro_main.php b/bureau/admin/bro_main.php
index 0f356cb1..7b8a02d4 100644
--- a/bureau/admin/bro_main.php
+++ b/bureau/admin/bro_main.php
@@ -284,16 +284,27 @@ if (count($c)) {
     <input type="submit" class="ina" name="actrename" value="<?php __("Rename"); ?>" />
     <input type="submit" class="ina" name="actperms" value="<?php __("Permissions"); ?>" /> 
     &nbsp; |&nbsp;
-  <input type="submit" class="ina" name="actcopy" value="<?php __("Copy"); ?>" />
-    <input type="submit" class="ina" name="actmove" value="<?php __("Move"); ?>" />
+  <input type="submit" class="ina" name="actcopy" value="<?php __("Copy"); ?>" onClick=" return actmoveto_not_empty();"/>
+    <input type="submit" class="ina" name="actmove" value="<?php __("Move"); ?>" onClick=" return actmoveto_not_empty();"/>
     <?php __("To"); ?> 
-    <input type="text" class="int" name="actmoveto" value="" />
+    <input type="text" class="int" id='actmoveto' name="actmoveto" value="" />
     <?php display_browser( "" , "main.actmoveto" ); ?>
 
     </td></tr>
 
     </table>
 
+<script type="text/javascript">
+function actmoveto_not_empty() {
+  if ( $('#actmoveto').val() =='' ) {
+    alert("<?php __("Please select a destination folder");?>");
+    return false;
+  }
+  return true;
+}
+</script>
+
+
 
     <?php
     switch ($p["listmode"]) {
@@ -356,6 +367,20 @@ if (count($c)) {
               echo _("Extract");
               echo "</a>";
             }
+            $ez = $bro->is_sqlfile($R,$c[$i]["name"]);
+            if ($ez) {
+              echo " <a href=\"javascript:;\" onClick=\"$('#rest_db_$i').toggle();\">";
+              echo _("Restore SQL");
+              echo "</a>";
+              echo "<div id='rest_db_$i' style='display:none;'><fieldset><legend>"._("Restore SQL")."</legend>"._("In which database to you want to restore this dump?");
+              echo "<br/>";
+              echo "<input type='hidden' name ='filename' value='".htmlentities($R."/".$c[$i]["name"])."' />";
+              $dbl=array(); foreach ($mysql->get_dblist() as $v) { $dbl[]=$v['db'];}
+              echo "<select id='db_name_$i'>"; eoption($dbl,'',true); echo "</select>" ;
+              echo "<a href='javascript:;' onClick='window.location=\"sql_restore.php?filename=".urlencode($R."/".$c[$i]["name"])."&id=\"+encodeURIComponent($(\"#db_name_$i\").val()) ;'>"._("Restore it")."</a>";
+              echo "</form>";
+              echo "</fieldset></div>";
+            }
 
             echo "</td>\n";
           } else {           // DOSSIER :
@@ -365,7 +390,7 @@ if (count($c)) {
             }
             echo "<td><b><a href=\"";
             echo "bro_main.php?R=".urlencode($R."/".$c[$i]["name"]);
-            echo "\">".htmlentities($c[$i]["name"])."/</a></b></td>\n";
+            echo "\">"; ehe($c[$i]["name"]) ;"/</a></b></td>\n";
             echo "  <td>".format_size($c[$i]["size"])."</td>";
             echo "<td>".format_date(_('%3$d-%2$d-%1$d %4$d:%5$d'),date("Y-m-d h:i:s",$c[$i]["date"]))."<br /></td>";
             if ($p["showtype"]) {
diff --git a/bureau/admin/sql_restore.php b/bureau/admin/sql_restore.php
index 94484202..5e16c869 100644
--- a/bureau/admin/sql_restore.php
+++ b/bureau/admin/sql_restore.php
@@ -31,7 +31,8 @@ require_once("../class/config.php");
 include_once("head.php");
 
 $fields = array (
-	"id"     => array ("request", "string", ""),
+	"id"           => array ("request", "string", ""),
+	"filename"     => array ("request", "string", ""),
 );
 getFields($fields);
 
@@ -59,7 +60,7 @@ echo "</p>";
 <form action="sql_dorestore.php" method="post">
 <input type="hidden" name="id" value="<?php echo $id ?>" />
 <p><label for="restfile"><?php __("Please enter the path and the filename containing SQL data to be restored."); ?></label></p>
-<p><input type="text" class="int" id="restfile" name="restfile" size="35" maxlength="255" value="" /> <input class="inb" type="submit" name="submit" onClick='return restfilenotempty();' value="<?php __("Restore my database"); ?>" /></p>
+<p><input type="text" class="int" id="restfile" name="restfile" size="35" maxlength="255" value="<?php ehe($filename); ?>" /> <input class="inb" type="submit" name="submit" onClick='return restfilenotempty();' value="<?php __("Restore my database"); ?>" /></p>
 </form>
 <script type="text/javascript">
   function restfilenotempty() {
diff --git a/bureau/class/m_bro.php b/bureau/class/m_bro.php
index 8b955846..d8df885a 100644
--- a/bureau/class/m_bro.php
+++ b/bureau/class/m_bro.php
@@ -819,6 +819,16 @@ class m_bro {
     return false;
   }
 
+  // return true if file is a sql dump (end with .sql or .sql.gz)
+  function is_sqlfile($dir,$name) {
+    if ($parts = explode(".", $name)) {
+      $ext = array_pop($parts);
+      $ext2 = array_pop($parts) . '.'.$ext;
+      if ( $ext=='sql' or $ext2=='sql.gz') return true;
+    }
+    return false;
+  }
+
 
   /* ----------------------------------------------------------------- */
   /**