Changeset 1536

Show
Ignore:
Timestamp:
04/26/06 18:55:28 (3 years ago)
Author:
nahuel
Message:

Reparation de changements lors de la revision [1535]
References: #265

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • alternc/trunk/bureau/class/m_mysql.php

    r1535 r1536  
    295295  /* ----------------------------------------------------------------- */ 
    296296  /** Restore a sql backup script on a user's database. 
    297    * <b>TODO : </b> Add a parameter to choose which database to restore. 
    298    */ 
    299   function restore($file,$stdout,$r) { 
     297   */ 
     298  function restore($file,$stdout,$id) {  
    300299    global $err,$bro,$mem,$L_MYSQL_HOST; 
     300    if (!$r=$this->get_mysql_details($id)) {  
     301      return false;  
     302    }  
    301303    if (!($fi=$bro->convertabsolute($file,0))) { 
    302304      $err->raise("mysql",9); 
     305      return false;  
    303306    } 
    304307    if (substr($fi,-3)==".gz") { 
    305       $exe="/bin/gzip -d -c <\"$fi\" | /usr/bin/mysql -h".$L_MYSQL_HOST." -u".$r["login"]." -p".$r["pass"]." ".$r["db"]; 
    306     } else { 
    307       $exe="/usr/bin/mysql -h".$L_MYSQL_HOST." -u".$r["login"]." -p".$r["pass"]." ".$r["db"]." <".$fi; 
     308      $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"]);  
     309    } elseif (substr($fi,-4)==".bz2") {  
     310      $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"]);  
     311    } else {  
     312      $exe="/usr/bin/mysql -h".escapeshellarg($L_MYSQL_HOST)." -u".escapeshellarg($r["login"])." -p".escapeshellarg($r["pass"])." ".escapeshellarg($r["db"])." <".escapeshellarg($fi);  
    308313    } 
    309314    $exe .= " 2>&1";