--- nfo/site/htdocs/index.php	2004/08/30 04:21:55	1.4
+++ nfo/site/htdocs/index.php	2004/09/03 11:12:05	1.9
@@ -4,35 +4,69 @@
 --- Main index and content access page.
 --------------------------------------------------------------------------------
 --- rabit, 01:28 24.08.2004
---- $Id: index.php,v 1.4 2004/08/30 04:21:55 rabit Exp $
+--- $Id: index.php,v 1.9 2004/09/03 11:12:05 joko Exp $
 ------------------------------------------------------------------------------*/
 
 include('inc/common/common.php.inc');
 
+common_benchmark_addstep('start');
+
 //------------------------------------------------------------------------------
-//- GET/POST variable encapsulation:
+//- Web authorisation:
 
-$contentkeyname = (isset($_GET['ck']) ? $_GET['ck'] : '');
+if(isset($_POST['un'])) {
 
-$language_id = (isset($_GET['li']) ? $_GET['li'] : '');
+  $common_sessiondata['userdata']['name'] = $_POST['un'];
 
-$outputtype = (isset($_GET['ot']) ? $_GET['ot'] : '');
+  if(isset($_POST['pw'])) {
 
-//------------------------------------------------------------------------------
+    $common_sessiondata['userdata']['password'] = $_POST['pw'];
 
-if(!$contentkeyname) $contentkeyname = 'Home';
+    common_checkauthorisation();
 
-if(!$language_id) $language_id = 1;
+  }
 
-if(!$outputtype) $outputtype = 'html';
+}
+
+common_benchmark_addstep('authorisation test');
 
 //------------------------------------------------------------------------------
+//- GET/POST variable encapsulation:
+
+$request_contentkey = (isset($_GET['ck']) ? $_GET['ck'] : '');
+$request_outputtype = (isset($_GET['ot']) ? $_GET['ot'] : '');
+
+if(isset($_GET['li']))
+ $common_sessiondata['userdata']['language_id'] = intval($_GET['li']);
+
+//- Variable defaults:
+
+if(!$request_contentkey) $request_contentkey = 'Home';
+
+if(!$request_outputtype) $request_outputtype = 'html';
+
+if(isset($common_sessiondata['userdata']['language_id'])) {
 
+  // Set language ID from the users session data.
+  $language_id = $common_sessiondata['userdata']['language_id'];
+
+} else {
+
+  $language_id = 1; // Default language ID.
+
+}
+
+common_benchmark_addstep('GET/POST variable processing');
+
+//------------------------------------------------------------------------------
 // Dispatching the output content type:
 
-switch($outputtype) {
+switch($request_outputtype) {
+
+  case 'wml': // WML output
 
-  case 'xml': // XML output
+    include($common['site']['incroot'] . 'otdef/otd_wml1.php.inc');
+    common_benchmark_addstep('OTD_WML1 included');
 
     break;
 
@@ -42,11 +76,16 @@
 
   default:
 
-    // Generate a HTML page:
-    common_page($contentkeyname, $language_id);
+    include($common['site']['incroot'] . 'otdef/otd_html1.php.inc');
+    common_benchmark_addstep('OTD_HTML1 included');
 
 }
 
 //------------------------------------------------------------------------------
+// Render output:
+
+if(isset($otd_render)) $otd_render($request_contentkey, $language_id);
+
+//------------------------------------------------------------------------------
 
 ?>