kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Should fix #1439. needs testing

This commit is contained in:
Steven Mondji-Lerider 2013-02-01 15:40:13 +00:00
parent 670cb62939
commit 32346783a2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bureau/class/m_mysql.php
View File

@ -90,7 +90,7 @@ class DB_users extends DB_Sql {
// c'est pas étanche : $db se retrouve avec Database de $sql->dbu . Danger, faut comprendre pourquoi // c'est pas étanche : $db se retrouve avec Database de $sql->dbu . Danger, faut comprendre pourquoi
// Si on veux que ca marche, il faut Database=alternc. // Si on veux que ca marche, il faut Database=alternc.
//$this->Database = "mysql"; //$this->Database = "mysql";
$this->Database = "alternc"; $this->Database = "mysql_schema"; #if dbus is on a different host the alternc database will not be there and trying to use it might cause an error
$this->HumanHostname = $human_hostname; $this->HumanHostname = $human_hostname;
} }
@ -474,8 +474,7 @@ class m_mysql {
* @return boolean TRUE if the database has been restored, or FALSE if an error occurred * @return boolean TRUE if the database has been restored, or FALSE if an error occurred
*/ */
function restore($file,$stdout,$id) { function restore($file,$stdout,$id) {
// TODO don't work with the separated sql serveur for dbusers global $err,$bro,$mem,$L_MYSQL_HOST,$db;
global $err,$bro,$mem,$L_MYSQL_HOST;
if (empty($file)) { if (empty($file)) {
$err->raise("mysql",_("No file specified")); $err->raise("mysql",_("No file specified"));
return false; return false;
@ -493,11 +492,11 @@ class m_mysql {
} }
if (substr($fi,-3)==".gz") { if (substr($fi,-3)==".gz") {
$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"]); $exe="/bin/gzip -d -c <".escapeshellarg($fi)." | /usr/bin/mysql -h".escapeshellarg($this->dbus->Host)." -u".escapeshellarg($r["login"])." -p".escapeshellarg($r["pass"])." ".escapeshellarg($r["db"]);
} elseif (substr($fi,-4)==".bz2") { } elseif (substr($fi,-4)==".bz2") {
$exe="/usr/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"]); $exe="/usr/bin/bunzip2 -d -c <".escapeshellarg($fi)." | /usr/bin/mysql -h".escapeshellarg($this->dbus->Host)." -u".escapeshellarg($r["login"])." -p".escapeshellarg($r["pass"])." ".escapeshellarg($r["db"]);
} else { } else {
$exe="/usr/bin/mysql -h".escapeshellarg($L_MYSQL_HOST)." -u".escapeshellarg($r["login"])." -p".escapeshellarg($r["pass"])." ".escapeshellarg($r["db"])." <".escapeshellarg($fi); $exe="/usr/bin/mysql -h".escapeshellarg($this->dbus->Host)." -u".escapeshellarg($r["login"])." -p".escapeshellarg($r["pass"])." ".escapeshellarg($r["db"])." <".escapeshellarg($fi);
} }
$exe .= " 2>&1"; $exe .= " 2>&1";