--- nfo/site/htdocs/index.php	2004/08/30 11:51:15	1.5
+++ nfo/site/htdocs/index.php	2004/09/05 03:09:47	1.13
@@ -1,48 +1,69 @@
-<?php
+<?php $ID = substr(
 /*------------------------------------------------------------------------------
 --- www.netfrag.org
 --- Main index and content access page.
 --------------------------------------------------------------------------------
 --- rabit, 01:28 24.08.2004
---- $Id: index.php,v 1.5 2004/08/30 11:51:15 rabit Exp $
 ------------------------------------------------------------------------------*/
+   '$Id: index.php,v 1.13 2004/09/05 03:09:47 rabit Exp $'
+//------------------------------------------------------------------------------
+, 5, -2);
+//------------------------------------------------------------------------------
 
 include('inc/common/common.php.inc');
 
-//------------------------------------------------------------------------------
-//- GET/POST variable encapsulation:
+common_benchmark_addstep('start');
 
-$request_contentkey = (isset($_GET['ck']) ? $_GET['ck'] : '');
-$request_outputtype = (isset($_GET['ot']) ? $_GET['ot'] : '');
+//------------------------------------------------------------------------------
+//- User Agent <-> Output Type:
 
-if(isset($_GET['li']))
- $common_sessiondata['userdata']['language_id'] = intval($_GET['li']);
+$common['client']['session_enabled'] = 1;
 
-//------------------------------------------------------------------------------
-//- Variable defaults:
+if($_SERVER['HTTP_USER_AGENT'] == 'M3Gate/1.2') {
 
-if(!$request_contentkey) $request_contentkey = 'Home';
+  $common['client']['session_enabled'] = 0;
+  $common_sessiondata['user_prefs']['outputtype'] = 'wml';
 
-if(!$request_outputtype) $request_outputtype = 'html';
+}
 
-if(isset($common_sessiondata['userdata']['language_id'])) {
+//------------------------------------------------------------------------------
+//- Web authorisation:
 
-  // Set language ID from the users session data.
-  $language_id = $common_sessiondata['userdata']['language_id'];
+if(isset($_POST['un']) && isset($_POST['pw'])) {
 
-} else {
+  common_authorise($_POST['un'], $_POST['pw']);
 
-  $language_id = 1; // Default language ID.
+  common_benchmark_addstep('authorisation test');
 
 }
 
 //------------------------------------------------------------------------------
+//- GET/POST variable encapsulation:
+
+$request_contentkey = (isset($_GET['ck']) ? $_GET['ck'] : '');
+
+if(isset($_GET['li']))
+ $common_sessiondata['user_prefs']['language_id'] = $_GET['li'];
+
+if(isset($_GET['ot']))
+ $common_sessiondata['user_prefs']['outputtype'] = $_GET['ot'];
+
+//----------------------------------------------------------
+//- Variable defaults:
+
+if(!$request_contentkey) $request_contentkey = 'Home';
+
+common_benchmark_addstep('GET/POST variable processing');
 
+//------------------------------------------------------------------------------
 // Dispatching the output content type:
 
-switch($request_outputtype) {
+switch($common_sessiondata['user_prefs']['outputtype']) {
+
+  case 'wml': // WML output
 
-  case 'xml': // XML output
+    include($common['site']['incroot'] . 'otdef/otd_wml1/otd_wml1.php.inc');
+    common_benchmark_addstep('OTD_WML1 included');
 
     break;
 
@@ -52,11 +73,19 @@
 
   default:
 
-    // Generate a HTML page:
-    common_page($request_contentkey, $language_id);
+    include($common['site']['incroot'] . 'otdef/otd_html1/otd_html1.php.inc');
+    common_benchmark_addstep('OTD_HTML1 included');
 
 }
 
 //------------------------------------------------------------------------------
+// Render output:
+
+if(isset($otd_render)) $otd_render(
+ $request_contentkey,
+ $common_sessiondata['user_prefs']['language_id']
+);
+
+//------------------------------------------------------------------------------
 
 ?>