Changeset 158

Timestamp:

02/21/06 23:45:48 (7 years ago)

Author:

anarcat

Message:

[project @ alternc: changeset 2003-10-09 00:12:41 by root]
Patch Ganjah E.

Original author: root
Date: 2003-10-09 00:12:43

Location:

bureau

Files:

• admin/sql_dorestore.php (modified) (2 diffs)
• class/m_mysql.php (modified) (4 diffs)

bureau/admin/sql_dorestore.php

@@ -1 +1 @@
 <?php
 /*
- $Id: sql_dorestore.php,v 1.2 2003/06/10 07:20:29 root Exp $
+ $Id: sql_dorestore.php,v 1.3 2003/10/09 00:12:41 root Exp $
  ----------------------------------------------------------------------
  AlternC - Web Hosting System
@@ -50 +50 @@
 }
 
+echo "<p class=\"error\">$error</p><p>&nbsp;</p>";
 } else {
 
 __("You currently have no database defined");
 
-        }
+}
 ?>
 </p>

bureau/class/m_mysql.php

@@ -1 +1 @@
 <?php
 /*
- $Id: m_mysql.php,v 1.10 2003/06/15 19:09:49 root Exp $
+ $Id: m_mysql.php,v 1.11 2003/10/09 00:12:43 root Exp $
  ----------------------------------------------------------------------
  AlternC - Web Hosting System
@@ -95 +95 @@
     $err->log("mysql","get_mysql_details");
     $dbname=$mem->user["login"].($dbn?"_":"").$dbn;
-    $db->query("SELECT pass,db, bck_mode, bck_gzip, bck_dir, bck_history FROM db WHERE uid=".$this->uid." AND db='$dbname';");
+    $db->query("SELECT login,pass,db, bck_mode, bck_gzip, bck_dir, bck_history FROM db WHERE uid=".$this->uid." AND db='$dbname';");
     if (!$db->num_rows()) {
       $err->raise("mysql",4);
-      return false;
+      return array("enabled"=>false);
     }
     $c=array();
@@ -104 +104 @@
     $size=$bro->fsize("/var/alternc/db/".$db->f("db")."/");
     list($dbu,$dbn)=explode("_",$db->f("db"));
-    return array("db"=>$db->f("db"), "name"=>$dbn,"bck"=>$db->f("bck_mode"), "dir"=>substr($db->f("bck_dir"),strlen($root)), "size"=>$size, "pass"=>$db->f("pass"), "history"=>$db->f("bck_history"), "gzip"=>$db->f("bck_gzip"));
+    return array("enabled"=>true,"login"=>$db->f("login"),"db"=>$db->f("db"), "name"=>$dbn,"bck"=>$db->f("bck_mode"), "dir"=>substr($db->f("bck_dir"),strlen($root)), "size"=>$size, "pass"=>$db->f("pass"), "history"=>$db->f("bck_history"), "gzip"=>$db->f("bck_gzip"));
   }
 
@@ -301 +301 @@
       $exe="/usr/bin/mysql -u".$r["login"]." -p".$r["pass"]." ".$r["db"]." <".$fi;
     }
+    
+    echo "<code><pre>" ;
     if ($stdout) {
-      passthru($exe);
-    } else {
-      exec ($exe);
-    }
-    return true;
-  }
-
+      passthru($exe,$ret);
+    } else {
+      exec ($exe,$ret);
+    }
+    echo "</pre></code>" ;
+    if ($ret != 0) {
+      return false ;
+    } else {
+      return true ;
+    }
+  }
+  
   function alternc_quota_check($id) {
     global $err,$quota;