--- nfo/site/htdocs/inc/common/common.php.inc	2004/08/30 11:47:08	1.5
+++ nfo/site/htdocs/inc/common/common.php.inc	2004/09/01 08:58:40	1.7
@@ -4,7 +4,7 @@
 --- Setup and common functions include file.
 --------------------------------------------------------------------------------
 --- rabit, 04:31 24.08.2004
---- $Id: common.php.inc,v 1.5 2004/08/30 11:47:08 rabit Exp $
+--- $Id: common.php.inc,v 1.7 2004/09/01 08:58:40 rabit Exp $
 ------------------------------------------------------------------------------*/
 
 //------------------------------------------------------------------------------
@@ -24,7 +24,7 @@
 }
 
 // The starting entry in the benchmark steps list:
-common_benchmark_addstep('COMMON: start');
+common_benchmark_addstep('common: start');
 
 //----------------------------------------------------------
 //- Developer host setups:
@@ -59,11 +59,19 @@
 
 unset($hostsetups);
 
+common_benchmark_addstep('common: host setup');
+
 //----------------------------------------------------------
 //- Site variable setups:
 
+// Paths:
 $common['site']['docroot'] = $_SERVER['DOCUMENT_ROOT'] . $common['hostsetup']['urlrel'];
 $common['site']['incroot'] = $common['site']['docroot'] . 'inc/';
+$common['site']['libroot'] = $common['site']['docroot'] . 'libs/';
+
+// URLs:
+$common['site']['url'] = 'http://' . $_SERVER['HTTP_HOST'] . $common['hostsetup']['urlrel'];
+$common['site']['gfxurl'] = $common['site']['url'] . 'gfx/';
 
 //----------------------------------------------------------
 //- Page variable setups:
@@ -71,26 +79,25 @@
 $common['page']['filename'] = substr($_SERVER['PHP_SELF'], strrpos($_SERVER['PHP_SELF'], '/') + 1);
 $common['page']['url'] = $_SERVER['PHP_SELF'];
 
-common_benchmark_addstep('COMMON: setup');
+common_benchmark_addstep('common: site/page setup');
 
 //------------------------------------------------------------------------------
 //- Includes:
 
 //common_include('cfg/cfg.php.inc');
-//common_benchmark_addstep('COMMON: CFG included');
+//common_benchmark_addstep('common: CFG included');
 
-common_include('xmlcp/xmlcp.php.inc');
-common_benchmark_addstep('COMMON: XMLCP included');
+include($common['site']['incroot'] . 'xmlcp/xmlcp.php.inc');
+common_benchmark_addstep('common: XMLCP included');
 
-common_include('cms/cms.php.inc');
-common_benchmark_addstep('COMMON: CMS included');
+include($common['site']['incroot'] . 'cms/cms.php.inc');
+common_benchmark_addstep('common: CMS included');
 
 //------------------------------------------------------------------------------
 //- MySQL connection:
 
-$common['dbc']['dbconnected'] = common_dbc_connectdb();
-
-common_benchmark_addstep('COMMON: connect database');
+common_dbc_connectdb();
+common_benchmark_addstep('common: connect database');
 
 //------------------------------------------------------------------------------
 //- Session setup:
@@ -101,34 +108,42 @@
 // This is neccessary to make the $_SESSION global available:
 session_start();
 
-common_benchmark_addstep('COMMON: session init');
+common_benchmark_addstep('common: session init');
 
 if(!isset($_SESSION['common_sessiondata'])) {
 
   // The session variable isn't set, create it:
 
-  common_benchmark_addstep('COMMON: New session: start');
+  common_benchmark_addstep('common: New session: start');
 
   $common_sessiondata = array(
 
    'birthtime' => time(),
    'firstrequest' => 1, // Mark the very first page request.
 
+   // Empty user data sub array:
+   'userdata' => array(
+    'name' => '',
+    'password' => '',
+    'authorised' => false,
+   ),
+
+   // Content related additional data:
    'additionaldata' => array()
 
   );
 
-  common_benchmark_addstep('COMMON: New session: create session');
+  common_benchmark_addstep('common: New session: create session');
 
   // Protocol the visitors hit and store the columns insertion ID:
   $common_sessiondata['hit_id'] = common_protocolhit();
 
-  common_benchmark_addstep('COMMON: New session: protocol hit');
+  common_benchmark_addstep('common: New session: protocol hit');
 
   // Store a reference to the session data array:
   $_SESSION['common_sessiondata'] = &$common_sessiondata;
 
-  common_benchmark_addstep('COMMON: New session: store session/end');
+  common_benchmark_addstep('common: New session: store session/end');
 
 } else {
 
@@ -142,9 +157,9 @@
 
   $sql = "UPDATE hits SET requestcount=requestcount+1 WHERE id='" . $common_sessiondata['hit_id'] . "';";
 
-  mysql_query($sql);
+  common_dbc_query($sql);
 
-  common_benchmark_addstep('COMMON: session/hit data updated');
+  common_benchmark_addstep('common: session/hit data updated');
 
 }
 
@@ -158,6 +173,58 @@
 //------------------------------------------------------------------------------
 //- Functions:
 
+function common_checkauthorisation() {
+
+global $common_sessiondata;
+
+  $username = $common_sessiondata['userdata']['name'];
+  $password = $common_sessiondata['userdata']['password'];
+
+  if((strlen($username) < 2) || (strlen($password) < 2)) return false;
+
+  $sql = "SELECT id, rights, logincount, lastlogin FROM users WHERE name='$username' AND password='$password';";
+
+  $res = common_dbc_query($sql);
+
+  if(!$res) return false;
+
+  if(!($row = mysql_fetch_row($res))) return false;
+
+  // Congratulations - authorisation suxxessful!
+
+  $logintime = time();
+
+  $userid = $row[0];
+  $rights = $row[1];
+  $logincount = $row[2] + 1;
+  $lastlogin = $row[3];
+
+  $common_sessiondata['userdata']['authorised'] = true;
+
+  $common_sessiondata['userdata']['id'] = $userid;
+  $common_sessiondata['userdata']['lastlogin'] = $lastlogin;
+  $common_sessiondata['userdata']['rights'] = $rights;
+
+  // Break if the user already has authorised in this session:
+  if(isset($common_sessiondata['userdata']['logintime'])) return false;
+
+  $common_sessiondata['userdata']['logincount'] = $logincount;
+  $common_sessiondata['userdata']['logintime'] = $logintime;
+
+//  print_r($common_sessiondata['userdata']);
+
+  $sql = "UPDATE users SET logincount='$logincount', lastlogin=FROM_UNIXTIME('$logintime') WHERE id='$userid';";
+
+  $res = common_dbc_query($sql);
+
+  if(!$res) return false;
+
+  return true;
+
+}
+
+//------------------------------------------------------------------------------
+
 function common_protocolhit() {
 
 global $common, $common_sessiondata;
@@ -167,15 +234,11 @@
   $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '');
   $sessionid = session_id();
   $unixtime = $common_sessiondata['birthtime'];
-  $timestamp = date('YmdHis', $common_sessiondata['birthtime']);
   $useragent = $_SERVER['HTTP_USER_AGENT'];
 
   $sql = "INSERT INTO hits (id, timestamp, address, entryurl, referer, sessionid, useragent, requestcount) VALUES (NULL, FROM_UNIXTIME('$unixtime'), '$address', '$entryurl', '$referer', '$sessionid', '$useragent', '1');";
 
-  $res = mysql_query($sql);
-  if ($errstr = mysql_error()) {
-    print $errstr . "\n";
-  }
+  $res = common_dbc_query($sql);
 
   if(!$res) return false;
 
@@ -184,7 +247,6 @@
 }
 
 //----------------------------------------------------------
-
 //- Database functions:
 
 function common_dbc_connect() {
@@ -226,328 +288,46 @@
 
 function common_dbc_connectdb() {
 
-  return (common_dbc_connect() && common_dbc_selectdb());
-
-}
-
-//----------------------------------------------------------
-
-//- File functions:
-
-function common_include($filename) {
-
 global $common;
 
-  return include($common['site']['incroot'] . $filename);
-
-}
-
-//----------------------------------------------------------
-
-//- XMLCP setup:
-
-xmlcp_registertagcallbacks('b', 'common_cb_xmlcp_start_bold', 'common_cb_xmlcp_end_bold');
-xmlcp_registertagcallbacks('h', 'common_cb_xmlcp_start_headline', 'common_cb_xmlcp_end_headline');
-xmlcp_registertagcallbacks('p', 'common_cb_xmlcp_start_paragraph', 'common_cb_xmlcp_end_paragraph');
-xmlcp_registertagcallbacks('page', 'common_cb_xmlcp_start_page', 'common_cb_xmlcp_end_page');
-
-function common_cb_xmlcp_end_bold($h_parser, $tagname) {
-
-global $xmlcp_cdata;
-
-  $xmlcp_cdata .= '</b>';
-
-}
-
-function common_cb_xmlcp_start_bold($h_parser, $tagname, $attribs) {
-
-global $xmlcp_cdata;
-
-  $xmlcp_cdata .= '<b>';
-
-}
-
-function common_cb_xmlcp_end_page($h_parser, $tagname) {
-
-}
-
-function common_cb_xmlcp_start_page($h_parser, $tagname, $attribs) {
-
-}
-
-function common_cb_xmlcp_end_headline($h_parser, $tagname) {
-
-global $xmlcp_cdata;
-
-  common_headline(trim($xmlcp_cdata));
-
-  $xmlcp_cdata = '';
-
-}
-
-function common_cb_xmlcp_start_headline($h_parser, $tagname, $attribs) {
-
-global $xmlcp_cdata;
-
-  $xmlcp_cdata = '';
-
-}
-
-function common_cb_xmlcp_end_paragraph($h_parser, $tagname) {
-
-global $xmlcp_cdata;
-
-  common_paragraph(trim($xmlcp_cdata));
-
-  $xmlcp_cdata = '';
-
-}
-
-function common_cb_xmlcp_start_paragraph($h_parser, $tagname, $attribs) {
-
-global $xmlcp_cdata;
-
-  $xmlcp_cdata = '';
-
-}
-
-//----------------------------------------------------------
-
-//- ML functions:
-
-function common_codeparagraph($contents) {
-
-  echo '<p align="justify" class="hl">
-<code>
-' . $contents . '
-</code>
-</p>
+  $common['dbc']['dbconnected'] = (common_dbc_connect() && common_dbc_selectdb());
 
-';
-
-}
-
-//----------------------------------------------------------
-
-function common_headline($caption) {
-
-  echo '<h4>' . $caption . '</h4>
-
-';
+  return $common['dbc']['dbconnected'];
 
 }
 
-//----------------------------------------------------------
-
-function common_page($keyname, $language_id = 0) {
+function common_dbc_query($sql) {
 
 global $common;
 
-  common_benchmark_addstep('COMMON: PAGE: start');
-
-  $list = cms_getlist('xmlpage', $keyname);
-
-  common_benchmark_addstep('COMMON: PAGE: CMS get list');
-
-  $contentdata = cms_getcontent('xmlpage', $keyname, $language_id);
-
-  common_benchmark_addstep('COMMON: PAGE: CMS get content');
-
-  $xml = $contentdata['content'];
-
-  common_pageheader();
-
-  common_benchmark_addstep('COMMON: PAGE: header');
-
-  if($xml) {
-
-    $titledata = '';
-
-    for($i = 0; $i < count($list); $i++) {
-
-      $titledata .= ($i ? ' · ' : '') . '<a href="?li=' . $list[$i][3] . '">' . $list[$i][4] . '</a>';
-
-    }
+  if(!$common['dbc']['dbconnected']) return false;
 
-    common_pagetitle($contentdata['description'], $titledata);
-
-    xmlcp_xmlpage2html($xml);
-
-    common_benchmark_addstep('COMMON: PAGE: xmlpage2html');
-
-/*
-    common_headline('$list array, readable:');
-    common_codeparagraph('$list = ' . nl2br(htmlentities(print_r($list, true))));
-
-    common_headline('$contentdata array, readable:');
-    common_codeparagraph('$contentdata = ' . nl2br(htmlentities(print_r($contentdata, true))));
-
-    common_headline('$common array, readable:');
-    common_codeparagraph('$common = ' . nl2br(htmlentities(print_r($common, true))));
-
-    common_headline('$common_sessiondata array, readable:');
-    common_codeparagraph('$common_sessiondata = ' . nl2br(htmlentities(print_r($common_sessiondata, true))));
-
-    common_headline('Content XML:');
-    common_codeparagraph(nl2br(htmlentities($xml)));
+  $res = mysql_query($sql);
 
-*/
+  if($errormsg = mysql_error()) {
 
-    // Only show the informations when "devstate" is set:
-    if($common['hostsetup']['devstate']) {
+    // >>> MTC <<<
 
-      common_paragraph('<small>
-<b>Content informations:</b><br />
+    echo $errormsg . '<br />
 <br />
-Description: "<b>' . $contentdata['description'] . '</b>" (Type: "xmlpage")<br />
-Creator: "<b>' . $contentdata['creator_name'] . '</b>"<br />
-Date, Time: "<b>' . date('d.m.Y, H:i:s', $contentdata['unixtime']) . '</b>"<br />
-Language: "<b>' . $contentdata['language_name'] . '</b>"<br />
-XML content size: <b>' . strlen($xml) . '</b> bytes
-</small>', 'box2');
-
-    }
-
-  } else {
-
-    common_pagetitle('Bad content request');
-
-    common_paragraph('Sorry, but the requested content is unknown.');
-
-  }
-
-  common_benchmark_addstep('COMMON: PAGE: content');
-
-  common_pagefooter();
-
-}
-
-//----------------------------------------------------------
-
-function common_pageheader() {
-
-global $common;
-
-  echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<title>www.netfrag.org</title>
-<style type="text/css"><!--
-body { font: 11pt verdana, serif; }
-h2 { text-align:center; }
-h2, .box, .box2, .hl { padding:8px; }
-h2, .box, .hl { background-color:#40f0f0; }
-h2, .box { border:2px solid #20a0c0; }
-h4 { font-size:12pt; }
-small { font-size:8pt; }
-.box2 { background-color:#80fff0; border:1px solid #40c080; }
---></style>
-</head>
-
-<body>
-
-<h2>www.netfrag.org</h2>
-
-';
-
-}
-
-//----------------------------------------------------------
-
-function common_pagefooter() {
-
-global $common;
-
-  // Only show the benchmark list when "devstate" is set:
-  if($common['hostsetup']['devstate']) {
-
-    $contents = '';
-  
-    for($i = 0; $i < count($common['benchmark']); $i++) {
-
-      $mtimesegs = explode(' ', $common['benchmark'][$i][1]);
-      $contents .= '"<b>' . $common['benchmark'][$i][0] . '</b>": ';
-
-      if($i) {
-
-        $timediff = (float)($mtimesegs[1] - $lastmtimesegs[1]);
-        $timediff += $mtimesegs[0] - $lastmtimesegs[0];
-
-        $contents .= '<b>+' . round($timediff * 1000000) / 1000 . '</b> ms<br />
-';
-
-      } else {
-
-        $contents .= 'Start time: <b>' . date('H:i:s', $mtimesegs[1]) . substr($mtimesegs[0], 1, 4) . '</b><br />
 ';
 
-      }
-
-      $lastmtimesegs = $mtimesegs;
-
-    }
-
-    common_paragraph('<small>
-<b>Partial execution times:</b><br />
-<br />
-' . $contents . '</small>', 'box2');
-
   }
 
-  common_benchmark_addstep('COMMON: page footer');
-
-  $endmtimesegs = explode(' ', microtime());
-  $startmtimesegs = explode(' ', $common['benchmark'][0][1]);
-  $timediff = (float)($endmtimesegs[1] - $startmtimesegs[1]);
-  $timediff += $endmtimesegs[0] - $startmtimesegs[0];
-
-  echo '<table cellspacing="0" cellpadding="0" class="box" width="100%">
-<tr>
-<td valign="top">
-Page execution time: <code>' . round($timediff * 100000) / 100 . '</code> ms.
-</td>
-<td align="right"><a href="http://validator.w3.org/check?uri=referer" target="_blank"><img alt="This page is valid XHTML 1.0" border="0" height="31" src="http://www.w3.org/Icons/valid-xhtml10" width="88" /></a>
-<a href="http://jigsaw.w3.org/css-validator/check/referer" target="_blank"><img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" /></a></td>
-</tr>
-</table>
-
-</body>
-
-</html>
-';
-
-}
-
-//----------------------------------------------------------
-
-function common_pagetitle($title, $additionalcontents = '') {
-
-  echo '<p class="box2">
-<big><b>&bull; ' . $title . '</b></big><br />
-' . ($additionalcontents ? $additionalcontents . '
-' : '') . '</p>
+  if(!$res) return false;
 
-';
+  return $res;
 
 }
 
 //----------------------------------------------------------
+//- File functions:
 
-function common_paragraph($contents, $class = '') {
-
-  echo '<p align="justify"' . ($class ? ' class="' . $class . '"' : '') . '>
-' . $contents . '
-</p>
 
-';
-
-}
 
 //------------------------------------------------------------------------------
 
-common_benchmark_addstep('COMMON: end');
+common_benchmark_addstep('common: end');
 
 //------------------------------------------------------------------------------