Changeset 269

Timestamp:

12/06/07 13:52:28 (13 years ago)

Author:

exi

Message:

Fixed the upgrader refering back to the install routinge.

Files:

• dev/install/install_step40.php (modified) (7 diffs)

dev/install/install_step40.php

@@ -3 +3 @@
 include('../common/includes/php_compat.php');
 include('../common/includes/class.xml.php');
-include('../config.php');
+require('../config.php');
 include('../common/includes/class.db.php');
-
 
 echo 'Reading packages...';
@@ -165 +164 @@
                 {
                     echo 'Finished importing of this file.<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/>';
+                    echo '<meta http-equiv="refresh" content="1; URL=?step=40&sub=data" />';
+                    echo 'Automatic reload in 1s for next chunk. <a href="?step=40&sub=data">Manual Link</a><br/>';
                 }
                 else
                 {
                     echo $error;
-                    echo '<meta http-equiv="refresh" content="20; URL=?step=4&sub=data" />';
+                    echo '<meta http-equiv="refresh" content="20; URL=?step=40&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/>';
                 }
@@ -245 +244 @@
                 }
                 $_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 Reload</a><br/>';
+                echo '<meta http-equiv="refresh" content="1; URL=?step=40&sub=data" />';
+                echo 'Automatic reload in 1s for next chunk. <a href="?step=40&sub=data">Manual Reload</a><br/>';
                 $did = true;
                 break 2;
@@ -277 +276 @@
         if ($stoppage)
         {
-            echo 'There has been an error with one of the tables, please <a href="?step=4&do=reset">Reset</a> and try again.<br/>';
+            echo 'There has been an error with one of the tables, please <a href="?step=40&do=reset">Reset</a> and try again.<br/>';
         }
         else
         {
             echo '<br/>All tables passed.<br/>';
-            echo 'You can now create or search your corporation/alliance: <a href="?step=5">Next Step</a><br/>';
-        }
-    }
-    echo '<br/>Use <a href="?step=4&sub=datasel&do=reset">Reset</a> to step back to the sql-opt select.<br/>';
+            echo 'You can now create or search your corporation/alliance: <a href="?step=41">Next Step</a><br/>';
+        }
+    }
+    echo '<br/>Use <a href="?step=40&sub=datasel&do=reset">Reset</a> to step back to the sql-opt select.<br/>';
 }
 ?>
@@ -303 +302 @@
 #    echo 'I will now check some table structures in case you are upgrading from a previous version... ';
 #    include('install_step4_tblchk.php');
-    echo 'Please continue with <a href="?step=4&sub=datasel">Importing Data</a><br/>';
-
-    echo '<br/><br/>In case you aborted the install and you got already data in those table you can bypass the import now by with <a href="?step=5">this link</a><br/>';
+    echo 'Please continue with <a href="?step=40&sub=datasel">Importing Data</a><br/>';
+
+    echo '<br/><br/>In case you aborted the install and you got already data in those table you can bypass the import now by with <a href="?step=41">this link</a><br/>';
     echo 'To be sure i will check some table data for you now:<br/>';
     foreach ($kb['kb3']['table'] as $line)
@@ -337 +336 @@
 elseif ($structadd)
 {
-    echo 'Some table structures have to be added, please continue with <a href="?step=4&sub=struct">Creating Tables</a><br/>';
+    echo 'Some table structures have to be added, please continue with <a href="?step=40&sub=struct">Creating Tables</a><br/>';
 }
 
@@ -344 +343 @@
 ?>
 <p>Please select optional SQL data to be inserted into the database:<br/></p>
-<form id="options" name="options" method="post" action="?step=4">
+<form id="options" name="options" method="post" action="?step=40">
 <input type="hidden" name="step" value="4">
 <input type="hidden" name="sub" value="data">