--- nfo/site/htdocs/index.php	2004/09/03 22:43:17	1.10
+++ nfo/site/htdocs/index.php	2004/09/05 03:09:47	1.13
@@ -1,81 +1,68 @@
-<?php
+<?php $ID = substr(
 /*------------------------------------------------------------------------------
 --- www.netfrag.org
 --- Main index and content access page.
 --------------------------------------------------------------------------------
 --- rabit, 01:28 24.08.2004
---- $Id: index.php,v 1.10 2004/09/03 22:43:17 joko Exp $
 ------------------------------------------------------------------------------*/
+   '$Id: index.php,v 1.13 2004/09/05 03:09:47 rabit Exp $'
+//------------------------------------------------------------------------------
+, 5, -2);
+//------------------------------------------------------------------------------
 
 include('inc/common/common.php.inc');
 
 common_benchmark_addstep('start');
 
 //------------------------------------------------------------------------------
-//- Web authorisation:
+//- User Agent <-> Output Type:
 
-if(isset($_POST['un'])) {
+$common['client']['session_enabled'] = 1;
 
-  $common_sessiondata['userdata']['name'] = $_POST['un'];
+if($_SERVER['HTTP_USER_AGENT'] == 'M3Gate/1.2') {
 
-  if(isset($_POST['pw'])) {
+  $common['client']['session_enabled'] = 0;
+  $common_sessiondata['user_prefs']['outputtype'] = 'wml';
 
-    $common_sessiondata['userdata']['password'] = $_POST['pw'];
+}
 
-    common_checkauthorisation();
+//------------------------------------------------------------------------------
+//- Web authorisation:
 
-  }
+if(isset($_POST['un']) && isset($_POST['pw'])) {
 
-}
+  common_authorise($_POST['un'], $_POST['pw']);
 
-common_benchmark_addstep('authorisation test');
+  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']);
-
+ $common_sessiondata['user_prefs']['language_id'] = $_GET['li'];
 
-//------------------------------------------------------------------------------
-//- User Agent <-> Output Type:
-$common['client']['session_enabled'] = 1;
-if ($_SERVER['HTTP_USER_AGENT'] == 'M3Gate/1.2') {
-  $common['client']['session_enabled'] = 0;
-  $request_outputtype = 'wml';
-}
+if(isset($_GET['ot']))
+ $common_sessiondata['user_prefs']['outputtype'] = $_GET['ot'];
 
-//------------------------------------------------------------------------------
+//----------------------------------------------------------
 //- 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($request_outputtype) {
+switch($common_sessiondata['user_prefs']['outputtype']) {
 
   case 'wml': // WML output
 
-    include($common['site']['incroot'] . 'otdef/otd_wml1.php.inc');
+    include($common['site']['incroot'] . 'otdef/otd_wml1/otd_wml1.php.inc');
     common_benchmark_addstep('OTD_WML1 included');
 
     break;
@@ -86,7 +73,7 @@
 
   default:
 
-    include($common['site']['incroot'] . 'otdef/otd_html1.php.inc');
+    include($common['site']['incroot'] . 'otdef/otd_html1/otd_html1.php.inc');
     common_benchmark_addstep('OTD_HTML1 included');
 
 }
@@ -94,7 +81,10 @@
 //------------------------------------------------------------------------------
 // Render output:
 
-if(isset($otd_render)) $otd_render($request_contentkey, $language_id);
+if(isset($otd_render)) $otd_render(
+ $request_contentkey,
+ $common_sessiondata['user_prefs']['language_id']
+);
 
 //------------------------------------------------------------------------------