[TEP-COMMIT] CVS: catalog/catalog/install/includes application.php,1.5,1.6

Update of /pack/cvsroots/oscommerce/catalog/catalog/install/includes
In directory sunsite.dk:/tmp/cvs-serv4284/includes

Modified Files:
	application.php 
Log Message:
make the installation and upgrade procedure multilingual

separate the sample database data from the database structure - installing
the sample data is now an option during the installation procedure


Index: application.php
===================================================================
RCS file: /pack/cvsroots/oscommerce/catalog/catalog/install/includes/application.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- application.php	2003/07/09 01:11:05	1.5
+++ application.php	2004/02/16 06:59:34	1.6
@@ -5,7 +5,7 @@
   osCommerce, Open Source E-Commerce Solutions
   http://www.oscommerce.com
 
-  Copyright (c) 2003 osCommerce
+  Copyright (c) 2004 osCommerce
 
   Released under the GNU General Public License
 */
@@ -13,13 +13,23 @@
 // Set the level of error reporting
   error_reporting(E_ALL & ~E_NOTICE);
 
-// Check if register_globals is enabled.
-// Since this is a temporary measure this message is hardcoded. The requirement will be removed before 2.2 is finalized.
-  if (function_exists('ini_get')) {
-    ini_get('register_globals') or exit('FATAL ERROR: register_globals is disabled in php.ini, please enable it!');
+  if (isset($_GET['language'])) {
+    setcookie('osC_Language', $_GET['language']);
+
+    $language = $_GET['language'];
+  } elseif (isset($_COOKIE['osC_Language'])) {
+    $language = $_COOKIE['osC_Language'];
+  } else {
+    $language = 'english';
   }
 
-  require('includes/functions/general.php');
-  require('includes/functions/database.php');
-  require('includes/functions/html_output.php');
+  require('languages/' . $language . '.php');
+  require('languages/' . $language . '/' . basename($PHP_SELF));
+
+  require('../includes/functions/compatibility.php');
+  require('../includes/functions/general.php');
+  require('functions/general.php');
+  require('../includes/functions/html_output.php');
+
+  require('../includes/classes/database.php');
 ?>



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click