Changeset 103

Timestamp:

11/28/06 20:20:08 (16 years ago)

Author:

exi

Message:

Fixed kill_export to allow corporation export.
Fixed installer config to not contain several php ending tags.
The sql importer now only executes lines which does not only contain whitespaces and will wait 20s on error for next importstep.

Location:

dev

Files:

• common/kill_export.php (modified) (2 diffs)
• install/config.tpl (modified) (1 diff)
• install/install_step4.php (modified) (2 diffs)

dev/common/kill_export.php

@@ -45 +45 @@
         $ext = $_SESSION['kill_export']['ext'];
     }
-    if (!strstr($dir, getcwd()))
+    if (!strstr(stripslashes($dir), stripslashes(getcwd())))
     {
         $dir = getcwd().$dir;
@@ -280 +280 @@
             elseif ($typ == 'c')
             {
-                $klist->addInvolvedCorp(new Corp($id));
-                $llist->addVictimCorp(new Corp($id));
+                $klist->addInvolvedCorp(new Corporation($id));
+                $llist->addVictimCorp(new Corporation($id));
             }
             elseif ($typ == 'p')

dev/install/config.tpl

@@ -62 +62 @@
 define('DB_PASS', '{$pass}');
 
-// please make sure that there is no space behind ?>
+// please make sure that there is no space behind the closing tag
 ?>

dev/install/install_step4.php

@@ -82 +82 @@
     $i = 0;
     $did = false;
+    $errors = false;
     if (!isset($_SESSION['doopt']))
     {
@@ -97 +98 @@
                 foreach ($querys as $query)
                 {
-                    $id = mysql_query($query);
+                    if (trim($query))
+                    {
+                        $id = mysql_query($query);
+                    }
                 }
                 if ($id)
                 {
                     echo 'done<br/>';
+                    echo '<meta http-equiv="refresh" content="1; URL=?step=4&sub=data" />';
+                    echo 'Automatic reload in 1s for next chunk. <a href="?step=4&sub=data">Manual Link</a><br/>';
                 }
                 else
                 {
                     echo 'error: '.mysql_error().'<br/>';
+                    echo '<meta http-equiv="refresh" content="20; URL=?step=4&sub=data" />';
+                    echo 'Automatic reload in 20s for next chunk because of the error occured. <a href="?step=4&sub=data">Manual Link</a><br/>';
                 }
                 $_SESSION['sqlinsert']++;
-                echo '<meta http-equiv="refresh" content="1; URL=?step=4&sub=data" />';
-                echo 'Automatic reload in 1s for next chunk. <a href="?step=4&sub=data">Manual Link</a><br/>';
+
                 $did = true;
                 break 2;