Index: trunk/core/kernel/startup.php
===================================================================
diff -u -r1560 -r1635
--- trunk/core/kernel/startup.php (.../startup.php) (revision 1560)
+++ trunk/core/kernel/startup.php (.../startup.php) (revision 1635)
@@ -18,8 +18,28 @@
if( defined('DEBUG_MODE')&&DEBUG_MODE ) include_once(KERNEL_PATH.'/utility/debugger.php');
}
+safeDefine('INPORTAL_TAGS', true);
+
+$reg = '/'.preg_quote (DOC_ROOT, '/').'/i';
+define('BASE_PATH', $base_path = ereg_replace('/admin', '', preg_replace($reg, '', str_replace('\\', '/', FULL_PATH))));
+
+safeDefine( 'SERVER_NAME', $_SERVER['SERVER_NAME']);
+safeDefine( 'KERNEL_PATH', DOC_ROOT.BASE_PATH.'/kernel4');
+safeDefine( 'PROTOCOL', 'http://');
+
$vars = parse_portal_ini(FULL_PATH.'/config.php');
+if ($vars === false) {
+ global $rootURL;
+ echo 'In-Portal is probably not installed, or configuration file is missing.
';
+ echo 'Please use the installation script to fix the problem.
';
+ if ( !preg_match('/admin/', __FILE__) ) $ins = '/admin';
+
+ echo 'Go to installation script
';
+ flush();
+ exit;
+}
+
define('SQL_TYPE', $vars['DBType']);
define('SQL_SERVER', $vars['DBHost']);
define('SQL_USER', $vars['DBUser']);
@@ -29,15 +49,6 @@
ini_set('memory_limit', '50M');
-safeDefine('INPORTAL_TAGS', true);
-
-$reg = '/'.preg_quote (DOC_ROOT, '/').'/i';
-define('BASE_PATH', $base_path = ereg_replace('/admin', '', preg_replace($reg, '', str_replace('\\', '/', FULL_PATH))));
-
-safeDefine( 'SERVER_NAME', $_SERVER['SERVER_NAME']);
-safeDefine( 'KERNEL_PATH', DOC_ROOT.BASE_PATH.'/kernel4');
-safeDefine( 'PROTOCOL', 'http://');
-
define('MODULES_PATH', DOC_ROOT.BASE_PATH);
define('EXPORT_PATH', DOC_ROOT.BASE_PATH.'/admin/export');
define('GW_CLASS_PATH', MODULES_PATH.'/in-commerce/units/gateways/gw_classes'); // Payment Gateway Classes Path