Changeset 448 for trunk/phpbms/install

Timestamp:

03/03/09 12:35:56 (3 years ago)

Author:

brieb

Message:

* Fixed install error reporting

Files:

• trunk/phpbms/install/install_include.php (modified) (11 diffs)

trunk/phpbms/install/install_include.php

@@ -2 +2 @@
 function processSQLfile($db,$filename){
         global $dblink;
-                        
+
         $thefile = @ fopen($filename,"r");
-        if(!$thefile) 
+        if(!$thefile)
                 return "Could not open the file ".$filename.".\n";
 
@@ -29 +29 @@
         else
                 $querystatement="SELECT id FROM users WHERE login=\"".mysql_real_escape_string($user)."\" AND password=encode(\"".mysql_real_escape_string($pass)."\",\"".ENCRYPTION_SEED."\") AND accesslevel>=90";
-        
+
         $queryresult=$db->query($querystatement);
-                        
+
         if(!$queryresult)
                 return false;
@@ -44 +44 @@
 
         $ver=$db->fetchArray($queryresult);
-        return $ver["version"];                 
+        return $ver["version"];
 }
 
@@ -52 +52 @@
 
         $thedir= @ opendir("../modules/");
-        
+
         echo 'modules = Array();'."\n";
-        
+
         $modules = array();
         while($entry=readdir($thedir)){
@@ -60 +60 @@
                         if(file_exists("../modules/".$entry."/install/".$type.".php") && file_exists("../modules/".$entry."/install/version.php")){
                                 include("../modules/".$entry."/install/version.php");
-                        }                                       
+                        }
                 }
-        }               
-        
+        }
+
         foreach($modules as $name=>$module)
                 if(is_array($module)){
@@ -70 +70 @@
                                 echo 'modules["'.$name.'"]["'.$key.'"] = "'.$value.'";'."\n";
                 }
-        
+
         @ chdir ($currdirectory);
-        
+
         return $modules;
 }//end function
 
-        
+
 function showModules($modules){
         if(is_array($modules)){
@@ -92 +92 @@
         $sqlstatement="";
         $thereturn = "";
-        
+
         $createfile = @ fopen("createtables.sql","r");
-        if(!$createfile) 
-                return "Could not open SQL file: ".sqlfile;
+        if(!$createfile)
+                return "Could not open SQL file: ".$sqlfile;
         else{
                 while(!feof($createfile)) {
                         $sqlstatement.= @ fgets($createfile,1024);
                         if(strpos($sqlstatement,";")){
-                        
-                                $theresult = $db->query(trim($sqlstatement)); 
-                                
+
+                                $theresult = $db->query(trim($sqlstatement));
+
                                 if($db->error){
                                         return "Error creating tables: ".$db->error."\n\n".trim($sqlstatement);
@@ -109 +109 @@
                         }//end if;
                 }//end while
-                
-        }//end if       
+
+        }//end if
 
         return true;
@@ -117 +117 @@
 
 function importData($db,$tablename){
-        
+
         $tablefile = @ fopen($tablename.".sql","rb");
-        if(!$tablefile) 
+        if(!$tablefile)
                 return "Could not open the file ".$tablename.".sql\n";
 
@@ -125 +125 @@
         $counter=0;
         $failure = false;
-        
+
         while(!feof($tablefile)) {
                 $sqlstatement=trim(fgets($tablefile,8184));
@@ -142 +142 @@
                 }//end if;
         }//end while
-        
+
         if($failure)
                 $threturn = "Importing of some records in ".$tablename." occured.\n\n";
         else
                 $thereturn.="Import of ".$counter." record(s) for '".$tablename."' complete.\n";
-        
+
         return $thereturn;
 }//end function