Changeset 1711 for branches/3.4/install.php

Timestamp:

08/30/08 12:49:26 (4 months ago)

Author:

vollmerk

Message:

improve error reporting on install and add in use existing database option

Files:

• branches/3.4/install.php (modified) (5 diffs)

branches/3.4/install.php

@@ -62 +62 @@
 if ($_SERVER['HTTPS'] == 'on') { $http_type = "https://"; }
 else { $http_type = "http://"; }
-$php_self = $http_type . $_SERVER['HTTP_HOST'] . "/" . preg_replace("/^\/(.+\.php)\/?.*/","$1",$_SERVER['PHP_SELF']);
+define('WEB_PATH',$http_type . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) . '/' . basename($_SERVER['PHP_SELF']));  
+define('WEB_ROOT',$http_type . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF'])); 
 
 /* Catch the Current Action */
@@ -76 +77 @@
                 $charset  = $_REQUEST['charset'];
                 
-                header ("Location: " . $php_self . "?action=show_create_config&local_db=$database&local_host=$hostname&htmllang=$htmllang&charset=$charset");
+                header ("Location: " . WEB_PATH . "?action=show_create_config&local_db=$database&local_host=$hostname&htmllang=$htmllang&charset=$charset");
                 
         break;
@@ -132 +133 @@
                 }
 
-                if ($_SERVER['HTTPS'] == 'on') { $http_type = "https://"; }
-                else { $http_type = "http://"; }
-
-                $web_path = $http_type . $_SERVER['HTTP_HOST'] . $results['web_path'];
-
-                header ("Location: " . $web_path . "/login.php");
+                header ("Location: " . WEB_ROOT . "/login.php");
         break;  
         case 'show_create_account':
@@ -145 +141 @@
                 /* Make sure we've got a valid config file */
                 if (!check_config_values($results)) { 
+                        Error::add('general',_('Error: Config file not found or Unreadable')); 
                         require_once Config::get('prefix') . '/templates/show_install_config.inc.php'; 
                         break;
@@ -212 +209 @@
                 /* Do some basic tests here... most common error, no mysql */
                 if (!function_exists('mysql_query')) { 
-                        header ("Location: test.php");
+                        header ("Location: " . WEB_PATH . "/test.php");
                 }
                 $htmllang = "en_US";