From e91d0a601f770c40eb2448f53b099063e0491dff Mon Sep 17 00:00:00 2001
From: Nahuel Angelinetti <nahuel@altnetvision.info>
Date: Wed, 26 Apr 2006 16:55:28 +0000
Subject: [PATCH] Reparation de changements lors de la revision [1535]
 References: #265

---
 bureau/class/m_mysql.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/bureau/class/m_mysql.php b/bureau/class/m_mysql.php
index c9d91a30..8a3db32a 100644
--- a/bureau/class/m_mysql.php
+++ b/bureau/class/m_mysql.php
@@ -294,17 +294,22 @@ class m_mysql {
 
   /* ----------------------------------------------------------------- */
   /** Restore a sql backup script on a user's database.
-   * <b>TODO : </b> Add a parameter to choose which database to restore.
    */
-  function restore($file,$stdout,$r) {
+  function restore($file,$stdout,$id) { 
     global $err,$bro,$mem,$L_MYSQL_HOST;
+    if (!$r=$this->get_mysql_details($id)) { 
+      return false; 
+    } 
     if (!($fi=$bro->convertabsolute($file,0))) {
       $err->raise("mysql",9);
+      return false; 
     }
     if (substr($fi,-3)==".gz") {
-      $exe="/bin/gzip -d -c <\"$fi\" | /usr/bin/mysql -h".$L_MYSQL_HOST." -u".$r["login"]." -p".$r["pass"]." ".$r["db"];
-    } else {
-      $exe="/usr/bin/mysql -h".$L_MYSQL_HOST." -u".$r["login"]." -p".$r["pass"]." ".$r["db"]." <".$fi;
+      $exe="/bin/gzip -d -c <".escapeshellarg($fi)." | /usr/bin/mysql -h".escapeshellarg($L_MYSQL_HOST)." -u".escapeshellarg($r["login"])." -p".escapeshellarg($r["pass"])." ".escapeshellarg($r["db"]); 
+    } elseif (substr($fi,-4)==".bz2") { 
+      $exe="/bin/bunzip2 -d -c <".escapeshellarg($fi)." | /usr/bin/mysql -h".escapeshellarg($L_MYSQL_HOST)." -u".escapeshellarg($r["login"])." -p".escapeshellarg($r["pass"])." ".escapeshellarg($r["db"]); 
+    } else { 
+      $exe="/usr/bin/mysql -h".escapeshellarg($L_MYSQL_HOST)." -u".escapeshellarg($r["login"])." -p".escapeshellarg($r["pass"])." ".escapeshellarg($r["db"])." <".escapeshellarg($fi); 
     }
     $exe .= " 2>&1";