projects / atutor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7e3ae54)
http://www.atutor.ca/atutor/mantis/view.php?id=2608
authorjoel kronenberg <joel.kronenberg@utoronto.ca>
Tue, 4 Jul 2006 14:37:10 +0000 (14:37 -0000)
committerjoel kronenberg <joel.kronenberg@utoronto.ca>
Tue, 4 Jul 2006 14:37:10 +0000 (14:37 -0000)
docs/install/include/header.php patch | blob | history
docs/install/include/upgrade_header.php patch | blob | history

diff --git a/docs/install/include/header.php b/docs/install/include/header.php
index 44dd8ec..bb15572 100644 (file)
--- a/docs/install/include/header.php
+++ b/docs/install/include/header.php
@@ -22,29 +22,14 @@ if ($step < 4) {
        }
 }
 
-$install_steps[0] = array(     'name' => 'Introduction',
-                                                       'file' => 'index.php');
-
-$install_steps[1] = array(     'name' => 'Terms of Use',
-                                                       'file' => 'step1.php');
-
-$install_steps[2] = array(     'name' => 'Database',
-                                                       'file' => 'step2.php');
-
-$install_steps[3] = array(     'name' => 'Accounts &amp; Preferences');
-
-//$install_steps[4] = array(   'name' => 'Personal Account &amp; Defaults',
-//                                                     'file' => 'step4.php');
-
-$install_steps[4] = array(     'name' => 'Content Directory');
-
-$install_steps[5] = array(     'name' => 'Save Configuration');
-
-$install_steps[6] = array(     'name' => 'Anonymous Usage Collection');
-
-$install_steps[7] = array(     'name' => 'Done!',
-                                                       'file' => 'step5.php');
-
+$install_steps[0] = array('name' => 'Introduction');
+$install_steps[1] = array('name' => 'Terms of Use');
+$install_steps[2] = array('name' => 'Database');
+$install_steps[3] = array('name' => 'Accounts &amp; Preferences');
+$install_steps[4] = array('name' => 'Content Directory');
+$install_steps[5] = array('name' => 'Save Configuration');
+$install_steps[6] = array('name' => 'Anonymous Usage Collection');
+$install_steps[7] = array('name' => 'Done!');
 
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="en">
diff --git a/docs/install/include/upgrade_header.php b/docs/install/include/upgrade_header.php
index 488ca9b..e6ceb5b 100644 (file)
--- a/docs/install/include/upgrade_header.php
+++ b/docs/install/include/upgrade_header.php
@@ -13,6 +13,16 @@ if (!defined('AT_INCLUDE_PATH')) { exit; }
 \r
 error_reporting(E_ALL ^ E_NOTICE);\r
 \r
+if ($step < 5) {\r
+       error_reporting(0);\r
+       include('../include/config.inc.php');\r
+       error_reporting(E_ALL ^ E_NOTICE);\r
+       if (defined('AT_INSTALL')) {\r
+               echo 'ATutor appears to have been installed already.';\r
+               exit;\r
+       }\r
+}\r
+\r
 $new_version = $new_version ? $new_version : $_POST['step1']['new_version'];\r
 \r
 $install_steps[0] = array('name' => 'Introduction');\r
Course Management Learning Management Tools