[ros-diffs] [dgoette] 40338: * replace absolute paths in css files * merge footer.php header.php and structure.php into HTML.class.php * remove unneeded view variable * remove some stuff from the left menu (quick links, last change, login/register links) * convert first page to use HTML class like in roscms

dgoette at svn.reactos.org dgoette at svn.reactos.org
Fri Apr 3 00:33:35 CEST 2009


Author: dgoette
Date: Fri Apr  3 02:33:34 2009
New Revision: 40338

URL: http://svn.reactos.org/svn/reactos?rev=40338&view=rev
Log:
* replace absolute paths in css files
* merge footer.php header.php and structure.php into HTML.class.php
* remove unneeded view variable
* remove some stuff from the left menu (quick links, last change, login/register links)
* convert first page to use HTML class like in roscms

Added:
    branches/danny-web/reactos.org/htdocs/compat/lib/HTML.class.php   (contents, props changed)
      - copied, changed from r40325, branches/danny-web/reactos.org/htdocs/compat/inc/header.php
    branches/danny-web/reactos.org/htdocs/compat/lib/view/
    branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php   (contents, props changed)
      - copied, changed from r40325, branches/danny-web/reactos.org/htdocs/compat/inc/about.php
Removed:
    branches/danny-web/reactos.org/htdocs/compat/inc/about.php
    branches/danny-web/reactos.org/htdocs/compat/inc/footer.php
    branches/danny-web/reactos.org/htdocs/compat/inc/header.php
    branches/danny-web/reactos.org/htdocs/compat/inc/member_bar.php
    branches/danny-web/reactos.org/htdocs/compat/inc/structure.php
Modified:
    branches/danny-web/reactos.org/htdocs/compat/css/style.css
    branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections.php
    branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php
    branches/danny-web/reactos.org/htdocs/compat/index.php
    branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php
    branches/danny-web/reactos.org/htdocs/compat/rsdb_human_readable_url.php

Modified: branches/danny-web/reactos.org/htdocs/compat/css/style.css
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/compat/css/style.css?rev=40338&r1=40337&r2=40338&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/compat/css/style.css [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/compat/css/style.css [iso-8859-1] Fri Apr  3 02:33:34 2009
@@ -3,7 +3,7 @@
 	font-size: 12px;
 	margin: 0 0 1em 0;
 	padding: 0; /* Only affects Opera */
-	background: #FFFFFF url('http://localhost/reactos.org/images/topbar.jpg') repeat-x scroll top left;
+	background: #FFFFFF url('../images/topbar.jpg') repeat-x scroll top left;
 }
  
 hr {
@@ -100,7 +100,7 @@
  
 /* set by the generator */
 a.extern { 
-	background: url('http://localhost/reactos.org/wiki/stylesheets/monobook/external.png') no-repeat center right;
+	background: url('../../wiki/stylesheets/monobook/external.png') no-repeat center right;
 	padding-right: 14px; 
 } 
  
@@ -111,12 +111,12 @@
 }
  
 #content li {
-	list-style-image: url('http://localhost/reactos.org/images/bullet.png')
+	list-style-image: url('../images/bullet.png')
 }
  
 #top {
 	margin: 0;
-	background: url('http://localhost/reactos.org/support/images/logo_rsdb.jpg') no-repeat scroll 35px 0;
+	background: url('../images/logo_rsdb.jpg') no-repeat scroll 35px 0;
 	padding: 103px 0 26px 0;
 	color: #FFFFFF;
 	text-align: right;

Removed: branches/danny-web/reactos.org/htdocs/compat/inc/about.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/compat/inc/about.php?rev=40337&view=auto
==============================================================================
--- branches/danny-web/reactos.org/htdocs/compat/inc/about.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/compat/inc/about.php (removed)
@@ -1,43 +1,0 @@
-<?php
-    /*
-    RSDB - ReactOS Support Database
-    Copyright (C) 2005-2006  Klemens Friedl <frik85 at reactos.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    */
-
-/*
- *	ReactOS Support Database System - RSDB
- *	
- *	(c) by Klemens Friedl <frik85>
- *	
- *	2005 - 2006 
- */
-
-
-	// To prevent hacking activity:
-	if ( !defined('RSDB') )
-	{
-		die(" ");
-	}
-
-?>
-<h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> &gt; <?php echo $RSDB_langres['TEXT_about_rsdb']; ?></h1> 
-<h2><?php echo $RSDB_langres['TEXT_about_rsdb']; ?></h2> 
-<p><?php echo $RSDB_langres['CONTENT_about_rsdb']; ?></p>
-<p><?php echo $RSDB_langres['CONTENT_about_webteam']; ?></p>
-<p>&nbsp;</p>
-<h3><?php echo $RSDB_langres['TEXT_credits']; ?></h3>
-<p><b>Klemens Friedl:</b> <?php echo $RSDB_langres['CONTENT_about_credits_frik85']; ?></p>

Removed: branches/danny-web/reactos.org/htdocs/compat/inc/footer.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/compat/inc/footer.php?rev=40337&view=auto
==============================================================================
--- branches/danny-web/reactos.org/htdocs/compat/inc/footer.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/compat/inc/footer.php (removed)
@@ -1,62 +1,0 @@
-<?php
-    /*
-    RSDB - ReactOS Support Database
-    Copyright (C) 2005-2006  Klemens Friedl <frik85 at reactos.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    */
-
-/*
- *	ReactOS Support Database System - RSDB
- *	
- *	(c) by Klemens Friedl <frik85>
- *	
- *	2005 - 2006 
- */
-
-
-	// To prevent hacking activity:
-	if ( !defined('RSDB') )
-	{
-		die(" ");
-	}
-
-?>
-
-
-	  </td>
-  </tr>
-</table>
-
-
-<hr size="1" />
-<address>
- <p align="center"><a href="http://www.reactos.org" onmousedown="return clk(this.href,'res','')">ReactOS</a> is a registered trademark or a trademark of <a href="http://www.reactos.org/?page=foundation">ReactOS Foundation</a> in the United States and other countries.<br />
-   Languages: <a href="#">EN</a> | <a href="#">DE</a> | <a href="#">FR</a> &nbsp;&nbsp;&nbsp; Ajax: <a href="<?php echo $RSDB_intern_link_ajax; ?>true"><?php if ($RSDB_ENV_ajax == "true") { echo "<b>"; } echo "enabled"; if ($RSDB_ENV_ajax == "true") { echo "</b>"; } ?></a> | <a href="<?php echo $RSDB_intern_link_ajax; ?>false"><?php if ($RSDB_ENV_ajax != "true") { echo "<b>"; } echo "disabled"; if ($RSDB_ENV_ajax != "true") { echo "</b>"; } ?></a> &nbsp;&nbsp;&nbsp;<?php
- 
-	// This page was generated in ...
-	$roscms_gentime = microtime(); 
-	$roscms_gentime = explode(' ',$roscms_gentime); 
-	$roscms_gentime = $roscms_gentime[1] + $roscms_gentime[0]; 
-	$roscms_pg_end = $roscms_gentime; 
-	$roscms_totaltime = ($roscms_pg_end - $roscms_pg_start); 
-	$roscms_showtime = number_format($roscms_totaltime, 4, '.', ''); 
-	echo $roscms_showtime . " seconds";
-
-?> &nbsp;&nbsp;&nbsp;Copyright  &#169; Klemens Friedl 2005-<?php echo date("Y");?>, All rights reserved.</p>
-</address>
-
-</body>
-</html>

Removed: branches/danny-web/reactos.org/htdocs/compat/inc/header.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/compat/inc/header.php?rev=40337&view=auto
==============================================================================
--- branches/danny-web/reactos.org/htdocs/compat/inc/header.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/compat/inc/header.php (removed)
@@ -1,125 +1,0 @@
-<?php
-    /*
-    RSDB - ReactOS Support Database
-    Copyright (C) 2005-2006  Klemens Friedl <frik85 at reactos.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    */
-
-/*
- *	ReactOS Support Database System - RSDB
- *	
- *	(c) by Klemens Friedl <frik85>
- *	
- *	2005 - 2006 
- */
-
-
-	// To prevent hacking activity:
-	if ( !defined('RSDB') )
-	{
-		die(" ");
-	}
-
-
-	
-	// This page was generated in ...
-	$roscms_gentime = microtime(); 
-	$roscms_gentime = explode(' ',$roscms_gentime); 
-	$roscms_gentime = $roscms_gentime[1] + $roscms_gentime[0]; 
-	$roscms_pg_start = $roscms_gentime; 
-
-function create_head($page_title, $logo, $RSDB_langres)
-{
-	include('rsdb_setting.php');
-
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="<?php echo $RSDB_langres['lang_code']; ?>">
-<head>
-	<title>ReactOS <?php echo $page_title ; ?></title>
-	<base href="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>" />
-	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $RSDB_langres['charset']; ?>" />
-	<meta http-equiv="Pragma" content="no-cache" />
-	<meta name="Description" content="The ReactOS Compatibility Database has stored a lot of information about application and driver compatibility with ReactOS." />
-	<meta name="Keywords" content="ReactOS, Compatibility, application, driver, RSDB, support, database, DB, test, report, rating, Ros32, Ros64, Win32, Win64, W32, W64, Wine, vendor, release, version" />
-	<meta name="Copyright" content="ReactOS Foundation" />
-	<meta name="Generator" content="RSDB" />
-	<meta name="Content-language" content="<?php echo $RSDB_langres['lang_code']; ?>" />
-	<meta name="Robots" content="index,follow" />
-	<link rel="SHORTCUT ICON" href="../favicon.ico" />
-	<link href="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>css/style.css" type="text/css" rel="stylesheet" />
-	<script src="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>js/smoothscroll.js" language="javascript"></script>
-	<script src="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>js/search.js" language="javascript"></script>
-	
-
-	<script>
-	<!--
-		function clk(url,ct,sg) {
-			if(document.images) {
-				var u="";
-				
-				if (url) {
-					u="&url="+escape(url).replace(/\+/g,"%2B");
-				}
-				
-				<?php
-					$RSDB_i="";
-					if (array_key_exists('REMOTE_ADDR', $_SERVER)) $RSDB_i=htmlspecialchars($_SERVER['REMOTE_ADDR']);
-				?>
-				new Image().src="url.php?t=" + escape(ct) + "&u=" + u + "&a=<?php echo base64_encode($RSDB_intern_user_id);?>" + "&i=<?php echo base64_encode($RSDB_i);?>" + "&s" + sg;
-
-			}
-			return true;
-		}
-	-->
-	</script>
-</head>
-<body>
-<div id="top">
-  <div id="topMenu"> 
-    <!-- 
-       Use <p> to align things for links/lynx, then in the css make it
-	   margin: 0; and use text-align: left/right/etc;.
-   -->
-    <p align="center"> 
-		<a href="<?php echo $RSDB_intern_path_server; ?>?page=index"><?php echo $RSDB_langres['Home']; ?></a> <font color="#ffffff">|</font> 
-		<a href="<?php echo $RSDB_intern_path_server; ?>?page=about"><?php echo $RSDB_langres['Info']; ?></a> <font color="#ffffff">|</font> 
-		<a href="<?php echo $RSDB_intern_path_server; ?>?page=community"><?php echo $RSDB_langres['Community']; ?></a> <font color="#ffffff">|</font> 
-		<a href="<?php echo $RSDB_intern_path_server; ?>?page=dev"><?php echo $RSDB_langres['Dev']; ?></a> <font color="#ffffff">|</font> 
-		<a href="<?php echo $RSDB_intern_path_server."roscms/"; ?>?page=user"><?php echo $RSDB_langres['myReactOS']; ?></a> </p>
- </div>
-</div>
-
-
-<?php /*<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html><head><title>ReactOS Package Manager - Online</title>
-
-<link rel="stylesheet" type="text/css" href="reactos.basic.css"><!-- reactos.css -->
-<META content="ReactOS Package Manager - CMS System" name=GENERATOR>
-<META content="Klemens Friedl" name=AUTHOR>
-</head>  
-<body>*/
-
-
-//require("./inc/inc_account_check.php");
-
-?>
-
-<!-- Start of Navigation Bar -->
-
-<?php
-} // End of function create_head
-?>

Removed: branches/danny-web/reactos.org/htdocs/compat/inc/member_bar.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/compat/inc/member_bar.php?rev=40337&view=auto
==============================================================================
--- branches/danny-web/reactos.org/htdocs/compat/inc/member_bar.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/compat/inc/member_bar.php (removed)
@@ -1,61 +1,0 @@
-<?php
-    /*
-    RSDB - ReactOS Support Database
-    Copyright (C) 2005-2006  Klemens Friedl <frik85 at reactos.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    */
-
-/*
- *	ReactOS Support Database System - RSDB
- *	
- *	(c) by Klemens Friedl <frik85>
- *	
- *	2005 - 2006 
- */
-
-
-	// To prevent hacking activity:
-	if ( !defined('RSDB') )
-	{
-		die(" ");
-	}
-
-
-	if($RSDB_intern_user_id != 0) {
-
-?><div class="navTitle"><?php echo $RSDB_langres['Account']; ?></div>
-	<ol>
-		<li>
-			&nbsp;Nick:&nbsp;<?php echo substr($RSDB_USER_name, 0, 9);
-			
-						
-			
-			 ?> <img src="images/info_15x15.gif" alt="<?php echo "Username: ".$RSDB_USER_name; ?>" width="15" height="15">
-		</li>
-		<li><a href="<?php echo $RSDB_intern_link_roscms_page; ?>logout"><?php echo $RSDB_langres['Logout']; ?></a></li>
-	</ol>
-</div>
-<p></p><?php
-	}
-	else {
-		?><form action="?page=login" method="post"><div class="navTitle">Login</div>   
-		  <ol>
-		<li><a href="<?php echo $RSDB_intern_link_roscms_page; ?>login"><?php echo $RSDB_langres['Global_Login_System']; ?></a></li>
-		<li><a href="<?php echo $RSDB_intern_link_roscms_page; ?>register"><?php echo $RSDB_langres['Register_Account']; ?></a></li>
-		  </ol></div></form>
-		  <p></p><?php
-	}
-?>

Removed: branches/danny-web/reactos.org/htdocs/compat/inc/structure.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/compat/inc/structure.php?rev=40337&view=auto
==============================================================================
--- branches/danny-web/reactos.org/htdocs/compat/inc/structure.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/compat/inc/structure.php (removed)
@@ -1,199 +1,0 @@
-<?php
-    /*
-    RSDB - ReactOS Support Database
-    Copyright (C) 2005-2006  Klemens Friedl <frik85 at reactos.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    */
-
-/*
- *	ReactOS Support Database System - RSDB
- *	
- *	(c) by Klemens Friedl <frik85>
- *	
- *	2005 - 2006 
- */
-
-
-	// To prevent hacking activity:
-	if ( !defined('RSDB') )
-	{
-		die(" ");
-	}
-
-
-
-function create_structure($page )
-{
-	include('rsdb_setting.php');
-	include('rsdb_config.php');
-	
-	global $RSDB_SET_view;
-	global $RSDB_SET_page;
-
-	global $roscms_intern_account_level;
-	global $roscms_intern_login_check;
-	global $roscms_intern_login_check_username;
-	global $roscms_intern_account_group;
-	global $roscms_intern_usrgrp_sadmin;
-	global $roscms_intern_usrgrp_admin;
-	global $roscms_intern_usrgrp_dev;
-	global $roscms_intern_usrgrp_team;
-	global $roscms_intern_usrgrp_trans;
-	global $roscms_intern_usrgrp_user;
-	global $RSDB_langres;
-	
-	global $RSDB_langres;
-?>
-
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-  <tr valign="top"> 
-    <td width="147" id="leftNav"> <div class="navTitle"><?php echo $RSDB_langres['Navigation']; ?></div>
-      <ol>
-        
-      <li><a href="<?php echo $RSDB_intern_path_server; ?>?page=index"><?php echo $RSDB_langres['Home']; ?></a></li>
-        <li><a href="<?php echo $RSDB_intern_path_server; ?>?page=about"><?php echo $RSDB_langres['Info']; ?></a></li>
-        <li><a href="<?php echo $RSDB_intern_path_server; ?>?page=community"><?php echo $RSDB_langres['Community']; ?></a></li>
-        <li><a href="<?php echo $RSDB_intern_path_server; ?>?page=dev"><?php echo $RSDB_langres['Dev']; ?></a></li>
-        <li><a href="<?php echo $RSDB_intern_path_server."roscms/"; ?>?page=user"><?php echo $RSDB_langres['myReactOS']; ?></a></li>
-      </ol></div>
-      <p></p>
-<?php 
-	if ($RSDB_SET_view == "comp") {
-	?>
-	  <div class="navTitle"><?php 
-									echo "Compatibility";
-						  ?></div>
-		<ol>
-		  <li><a href="<?php echo $RSDB_intern_link_view_EX."home".$RSDB_URI_slash; ?>">Overview</a></li>
-		  <li><a href="<?php echo $RSDB_intern_link_category_EX."0".$RSDB_URI_slash; ?>">Browse Database</a></li>
-	<?php
-		if ( $RSDB_SET_sec == "category" || $RSDB_SET_sec == "name" || $RSDB_SET_sec == "vendor" || $RSDB_SET_sec == "rank") {
-	?>
-			  <li><a href="<?php echo $RSDB_intern_link_category_EX."0".$RSDB_URI_slash; ?>">&nbsp;- By Category</a></li>
-			  <li><a href="<?php echo $RSDB_intern_link_name_letter_EX."all".$RSDB_URI_slash; ?>">&nbsp;- By Name</a></li>
-		<?php
-			if ($RSDB_SET_view == "comp") {
-		?>
-			  <li><a href="<?php echo $RSDB_intern_link_vendor_letter_EX."all".$RSDB_URI_slash; ?>">&nbsp;- By Vendor</a></li>
-		<?php
-			}
-			if ($RSDB_SET_view == "comp") {
-		?>
-			  <li><a href="<?php echo $RSDB_intern_link_rank_EX."rank".$RSDB_URI_slash; ?>">&nbsp;- By Rank</a></li>
-		<?php
-			}
-		}
-	?>
-		  <li id="noscriptsearchbar" style="display: block"><a href="<?php echo $RSDB_intern_link_view_EX."search".$RSDB_URI_slash; ?>">Search</a></li>
-		  <li><a href="<?php echo $RSDB_intern_link_view_EX."submit".$RSDB_URI_slash; ?>">Submit Application</a></li>
-		  <li><a href="<?php echo $RSDB_intern_link_view_EX."stats".$RSDB_URI_slash; ?>">Database Statistics</a></li>
-		  <li><a href="<?php echo $RSDB_intern_link_view_EX."help".$RSDB_URI_slash; ?>">Help &amp; FAQ</a></li>
-		</ol>
-		</div>
-		<p></p>
-<?php
-	}
-?>
-      <div class="navTitle">Search</div>
-      <ol>
-        <li> 
-			<div id="ajaxsearchbar" align="center" style="display: none">
-				<div align="center"><label for="searchbar" accesskey="s"></label><input name="searchbar" type="text" id="searchbar" tabindex="0" onkeyup="loadItemList(this.value,'bar','comp','ajaxloadbar','sresultbar')" size="17" maxlength="50" style="font-family: Verdana; font-size: x-small; font-style: normal;" /> </div>
-				<div id="sresultbar" style="display: none" align="left"></div>
-			</div>
-			<div align="center"><img id="ajaxloadbar" src="images/ajax_loading.gif" style="display: none"></div>
-		</li>
-      </ol>
-	  <p></p>
-	  
-	 <div class="navTitle">Quick Links</div>
-      <ol>
-      <li><a href="<?php echo $RSDB_intern_path_server; ?>forum/">Support Forum</a></li>
-        <li><a href="<?php echo $RSDB_intern_path_server; ?>?page=community_irc">Chat Channels</a></li>
-        <li><a href="<?php echo $RSDB_intern_path_server; ?>?page=community_mailinglists">Mailing Lists</a></li>
-        <li><a href="<?php echo $RSDB_intern_path_server; ?>wiki/">ReactOS Wiki</a></li>
-      </ol></div>
-      <p></p>
-
-	  
-	  <script type="text/javascript" language="javascript">
-	  <!--
-			document.getElementById('ajaxsearchbar').style.display = "block";
-			document.getElementById('noscriptsearchbar').style.display = "none";
-	  -->
-	  </script>
-<?php	
-	//include("inc/comp/sub/search_bar.php");
-	include("inc/member_bar.php");
-?>
-<div class="navTitle">Language</div>   
-      <ol>
-        <li> 
-          <div align="center"> 
-		  <?php 
-		    $rpm_page="";
-		  	$rpm_lang="";
-			if (array_key_exists("page", $_GET)) $rpm_page=htmlspecialchars($_GET["page"]);
-		  	if (array_key_exists("lang", $_GET)) $rpm_lang=htmlspecialchars($_GET["lang"]);
-//			echo $rpm_lang;
-			if ($rpm_lang == '' && isset($_COOKIE['roscms_usrset_lang'])) {
-				$rpm_lang = $_COOKIE['roscms_usrset_lang'];
-				if (substr($rpm_lang, -1) == '/') {
-					$rpm_lang = substr($rpm_lang, strlen($rpm_lang) - 1);
-				}
-				$rpm_lang = CLanguage::validate($rpm_lang);
-			}
-//			echo $rpm_lang;
-		  ?>
-            <select id="select" size="1" name="select" class="selectbox" style="width:140px" onchange="window.open(this.options[this.selectedIndex].value,'_main')">
-			<optgroup label="current language"> 
-			  <?php 
-      $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_languages WHERE lang_id = :lang_id");
-      $stmt->bindParam('lang_id',$rpm_lang,PDO::PARAM_STR);
-      $stmt->execute();
-			$result_roscms_lang = $stmt->fetchOnce(PDO::FETCH_ASSOC);
-			
-			echo '<option value="#">'.$result_roscms_lang[1].'</option>';
-              ?>
-              </optgroup>
-			  <optgroup label="most popular">
-              <option value="<?php echo $RSDB_intern_link_language; ?>en">English</option>
-              <option value="<?php echo $RSDB_intern_link_language; ?>de">Deutsch (German)</option>
-              <option value="<?php echo $RSDB_intern_link_language; ?>fr">Français (French)</option>
-              <option value="<?php echo $RSDB_intern_link_language; ?>ru">Russian (Russian)</option>
-              </optgroup>
-            </select>
-          </div>
-        </li>
-      </ol>
-      <p></p>
-      <div class="navTitle">Latest Update</div>
-      <ol>
-        <li> 
-          <div align="center"><?php echo date("Y-m-d"); $zeit = localtime(time() , 1); echo " " . sprintf("%02d",$zeit['tm_hour']).":".sprintf("%02d",$zeit['tm_min']); ?></div>
-        </li>
-      </ol></div>
-	  <p></p>
-      </td>
-	  
-<!-- End of Navigation Bar -->
-	  
-	  <td id="content">
-	  
-<?php
-} // End of function create_structure
-?>

Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections.php?rev=40338&r1=40337&r2=40338&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections.php [iso-8859-1] Fri Apr  3 02:33:34 2009
@@ -59,11 +59,7 @@
 			}
 			else {
 				if ($RSDB_SET_item != "") {
-					$result_count_group['item_comp']=0;
-						
-					if ($RSDB_SET_view == "comp")  {
 						$result_count_group['item_comp']=1;
-					}
 					$RSDB_compare_string = 'item';
 				}
 				elseif ($RSDB_SET_group != "") {

Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php?rev=40338&r1=40337&r2=40338&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php [iso-8859-1] Fri Apr  3 02:33:34 2009
@@ -74,18 +74,7 @@
     <td width="10%" title="Version">
       <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Ver.</strong></font></div></td>
     <td width="20%">
-      <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong><?php
-		
-		switch ($RSDB_SET_view) {
-			case "comp": // Compatibility
-				echo "Compatibility";
-				break;
-			default:
-				echo "Rating";
-				break;
-		}
-
-		?> &Oslash; </strong></font></div></td>
+      <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Compatibility &Oslash; </strong></font></div></td>
     <td width="8%" title="Status"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Stat.</strong></font></div></td>
   </tr>
   <?php

Modified: branches/danny-web/reactos.org/htdocs/compat/index.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/compat/index.php?rev=40338&r1=40337&r2=40338&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/compat/index.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/compat/index.php [iso-8859-1] Fri Apr  3 02:33:34 2009
@@ -118,7 +118,6 @@
 	// Global Vars:
 	$RSDB_SET_page=""; // Page: Home or DB
 	$RSDB_SET_sec=""; // Browse by: Category, Name, Company, Rank, etc.
-	$RSDB_SET_view=""; // Compatibility, Packages, Dev Network, Media
 	$RSDB_SET_cat="0"; // Category ID
 	$RSDB_SET_cat2="flat"; // Category Style: Flat or Tree
 	$RSDB_SET_letter=""; // Browse by Name: Letter: All, A, B, C, ..., X, Y, Z
@@ -168,7 +167,6 @@
 	
 	if (array_key_exists("page", $_GET)) $RSDB_SET_page=htmlspecialchars($_GET["page"]);
 	if (array_key_exists("sec", $_GET)) $RSDB_SET_sec=htmlspecialchars($_GET["sec"]);
-	if (array_key_exists("view", $_GET)) $RSDB_SET_view=htmlspecialchars($_GET["view"]);
 	if (array_key_exists("cat", $_GET)) $RSDB_SET_cat=htmlspecialchars($_GET["cat"]);
 	if (array_key_exists("cat2", $_GET)) $RSDB_SET_cat2=htmlspecialchars($_GET["cat2"]);
 	if (array_key_exists("letter", $_GET)) $RSDB_SET_letter=htmlspecialchars($_GET["letter"]);
@@ -249,7 +247,7 @@
 	require_once("inc/tools/plugins.php");
 	
 
-//	echo "<hr />db: ".$RSDB_SET_page.", view: ".$RSDB_SET_view.", sec: ".$RSDB_SET_sec."<hr />";
+//	echo "<hr />db: ".$RSDB_SET_page.", sec: ".$RSDB_SET_sec."<hr />";
 
 	switch ($RSDB_SET_page) {
 		case "home": // Frontpage
@@ -263,14 +261,7 @@
 			include("inc/footer.php"); // Body
 			break;
 		case "about": // RSDB About Page
-			//require($RSDB_intern_path_server.$RSDB_intern_loginsystem_path."inc/login.php");
-			$rpm_page_title="Support Database - About";
-			include("inc/header.php"); // Head
-			create_head($rpm_page_title, $rpm_logo, $RSDB_langres);
-			include("inc/structure.php");  // Layout-Structure
-			create_structure($rpm_page);
-			include("inc/about.php"); // Content
-			include("inc/footer.php"); // Body
+			new About();
 			break;
 		case "conditions": // RSDB Submit Conditions Page
 			$rpm_page_title="Support Database - Submit Conditions";
@@ -284,7 +275,6 @@
 		default:
 		case "db": // developer interface
 			//require($RSDB_intern_path_server.$RSDB_intern_loginsystem_path."inc/login.php");
-					$RSDB_SET_view = "comp";
 					$rpm_page_title="Support Database - Compatibility";
 					$RSDB_intern_section_script = "inc/comp.php";
 

Copied: branches/danny-web/reactos.org/htdocs/compat/lib/HTML.class.php (from r40325, branches/danny-web/reactos.org/htdocs/compat/inc/header.php)
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/compat/lib/HTML.class.php?p2=branches/danny-web/reactos.org/htdocs/compat/lib/HTML.class.php&p1=branches/danny-web/reactos.org/htdocs/compat/inc/header.php&r1=40325&r2=40338&rev=40338&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/compat/inc/header.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/compat/lib/HTML.class.php [iso-8859-1] Fri Apr  3 02:33:34 2009
@@ -2,6 +2,7 @@
     /*
     RSDB - ReactOS Support Database
     Copyright (C) 2005-2006  Klemens Friedl <frik85 at reactos.org>
+                  2009       Danny Götte <dangerground at web.de>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,108 +19,321 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     */
 
-/*
- *	ReactOS Support Database System - RSDB
- *	
- *	(c) by Klemens Friedl <frik85>
- *	
- *	2005 - 2006 
+/**
+ * class HTML
+ * 
+ * @package html
  */
-
-
-	// To prevent hacking activity:
-	if ( !defined('RSDB') )
-	{
-		die(" ");
-	}
-
-
-	
-	// This page was generated in ...
-	$roscms_gentime = microtime(); 
-	$roscms_gentime = explode(' ',$roscms_gentime); 
-	$roscms_gentime = $roscms_gentime[1] + $roscms_gentime[0]; 
-	$roscms_pg_start = $roscms_gentime; 
-
-function create_head($page_title, $logo, $RSDB_langres)
+abstract class HTML
 {
-	include('rsdb_setting.php');
-
+
+  protected $title; 
+  protected $css_files=array(); 
+  protected $js_files=array(); 
+
+
+
+  /**
+   * set page title, start generation time counter and get page output
+   *
+   * @access public
+   */
+  public function __construct( $page_title = '' )
+  {
+    // get page title and register css files
+    $this->title = $page_title;
+    $this->register_css('style.css');
+    $this->register_js('smoothscroll.js');
+    $this->register_js('search.js');
+
+    // get output
+    $this->build();
+  } // end of constructor
+
+
+
+  /**
+   * output of the whole site
+   *
+   * @access private
+   */
+  private function build( )
+  {
+    $this->header();
+    $this->navigation();
+    $this->body();
+    $this->footer();
+  } // end of member function build
+
+
+
+  /**
+   * includes the page itself without header + footer
+   *
+   * @access protected
+   */
+  abstract protected function body( );
+
+
+
+  /**
+   * output site header
+   *
+   * @access protected
+   */
+  protected function header( )
+  {
+    global $RSDB_langres;
+    global $RSDB_intern_path_server;
+    global $RSDB_intern_path;
+    global $RSDB_intern_user_id;
+
+    echo '
+      <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+      <html lang="'.$RSDB_langres['lang_code'].'">
+        <head>
+          <title>ReactOS '.$this->title.'</title>
+          <base href="'.$RSDB_intern_path_server.$RSDB_intern_path.'" />
+          <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+          <meta http-equiv="Pragma" content="no-cache" />
+          <meta name="Description" content="The ReactOS Compatibility Database has stored a lot of information about application and driver compatibility with ReactOS." />
+          <meta name="Keywords" content="ReactOS, Compatibility, application, driver, RSDB, support, database, DB, test, report, rating, Ros32, Ros64, Win32, Win64, W32, W64, Wine, vendor, release, version" />
+          <meta name="Copyright" content="ReactOS Foundation" />
+          <meta name="Generator" content="CompatDB" />
+          <meta name="Content-language" content="'.$RSDB_langres['lang_code'].'" />
+          <meta name="Robots" content="index,follow" />
+          <link rel="SHORTCUT ICON" href="../favicon.ico" />';
+
+    // link css files (use register_css method)
+    foreach($this->css_files as $file) {
+      if ($file['condition'] === false) {
+        echo '<link href="'.$RSDB_intern_path_server.$RSDB_intern_path.'css/'.$file['name'].'" type="text/css" rel="stylesheet" />';
+      }
+      else {
+        echo '<!--[if '.$file['condition'].']<link href="'.$RSDB_intern_path_server.$RSDB_intern_path.'css/'.$file['name'].'" type="text/css" rel="stylesheet" /><![endif]-->';
+      }
+    }
+
+    // link js files (use register_js method)
+    foreach($this->js_files as $file) {
+      echo '<script src="'.$RSDB_intern_path_server.$RSDB_intern_path.'js/'.$file.'" type="text/javascript"></script>';
+    }
+
+    echo '
+      <script>
+      <!--'."
+        function clk(url,ct,sg)
+        {
+          if(document.images) {
+            var u='';
+
+            if (url) {
+              u='&url='+escape(url).replace(/\+/g,'%2B');
+            }
+
+            new Image().src='url.php?t='+escape(ct)+'&u='+u+'&a=".base64_encode($RSDB_intern_user_id)."'+'&i=".base64_encode($_SERVER['REMOTE_ADDR'])."'+'&s'+sg;
+
+          }
+          return true;
+        }
+      ".'-->
+      </script>
+    </head>
+    <body>
+      <div id="top">
+        <div id="topMenu"> 
+          <a href="<?php echo $RSDB_intern_path_server; ?>?page=index">'.$RSDB_langres['Home'].'</a> |
+          <a href="<?php echo $RSDB_intern_path_server; ?>?page=about">'.$RSDB_langres['Info'].'</a> |
+          <a href="<?php echo $RSDB_intern_path_server; ?>?page=community">'.$RSDB_langres['Community'].'</a> |
+          <a href="<?php echo $RSDB_intern_path_server; ?>?page=dev">'.$RSDB_langres['Dev'].'</a> |
+          <a href="<?php echo $RSDB_intern_path_server."roscms/"; ?>?page=user">'.$RSDB_langres['myReactOS'].'</a>
+        </div>
+      </div>';
+  } // end of member function header
+
+
+
+  /**
+   * output site navigation
+   *
+   * @access protected
+   */
+  protected function navigation( )
+  {
+    include('rsdb_setting.php');
+    include('rsdb_config.php');
+
+    global $RSDB_SET_page;
+
+    global $roscms_intern_account_level;
+    global $roscms_intern_login_check;
+    global $roscms_intern_login_check_username;
+    global $roscms_intern_account_group;
+    global $roscms_intern_usrgrp_sadmin;
+    global $roscms_intern_usrgrp_admin;
+    global $roscms_intern_usrgrp_dev;
+    global $roscms_intern_usrgrp_team;
+    global $roscms_intern_usrgrp_trans;
+    global $roscms_intern_usrgrp_user;
+    global $RSDB_langres;
+
+    echo '
+      <table style="border: none; width:100%;" cellpadding="0" cellspacing="0">
+        <tr style="vertical-align:top;"> 
+          <td style="width:147px" id="leftNav">
+            <div class="navTitle">'.$RSDB_langres['Navigation'].'</div>
+            <ol>
+              <li><a href="'.$RSDB_intern_path_server.'?page=index">'.$RSDB_langres['Home'].'</a></li>
+              <li><a href="'.$RSDB_intern_path_server.'?page=about">'.$RSDB_langres['Info'].'</a></li>
+              <li><a href="'.$RSDB_intern_path_server.'?page=community">'.$RSDB_langres['Community'].'</a></li>
+              <li><a href="'.$RSDB_intern_path_server.'?page=dev">'.$RSDB_langres['Dev'].'</a></li>
+              <li><a href="'.$RSDB_intern_path_server.'roscms/?page=user">'.$RSDB_langres['myReactOS'].'</a></li>
+            </ol>
+            <br />
+
+            <div class="navTitle">Compatibility</div>
+            <ol>
+              <li><a href="'.$RSDB_intern_link_view_EX.'home'.$RSDB_URI_slash.'">Overview</a></li>
+              <li><a href="'.$RSDB_intern_link_category_EX.'0'.$RSDB_URI_slash.'">Browse Database</a></li>';
+
+    if ( $RSDB_SET_sec == 'category' || $RSDB_SET_sec == 'name' || $RSDB_SET_sec == 'vendor' || $RSDB_SET_sec == 'rank') {
+      echo '
+        <li><a href="'.$RSDB_intern_link_category_EX.'0'.$RSDB_URI_slash.'">&nbsp;- By Category</a></li>
+        <li><a href="'.$RSDB_intern_link_name_letter_EX.'all'.$RSDB_URI_slash.'">&nbsp;- By Name</a></li>
+        <li><a href="'.$RSDB_intern_link_vendor_letter_EX.'all'.$RSDB_URI_slash.'">&nbsp;- By Vendor</a></li>
+        <li><a href="'.$RSDB_intern_link_rank_EX.'rank'.$RSDB_URI_slash.'">&nbsp;- By Rank</a></li>';
+    }
+
+    echo '
+        <li id="noscriptsearchbar" style="display: block"><a href="'.$RSDB_intern_link_view_EX.'search'.$RSDB_URI_slash.'">Search</a></li>
+        <li><a href="'.$RSDB_intern_link_view_EX.'submit'.$RSDB_URI_slash.'">Submit Application</a></li>
+        <li><a href="'.$RSDB_intern_link_view_EX.'stats'.$RSDB_URI_slash.'">Database Statistics</a></li>
+        <li><a href="'.$RSDB_intern_link_view_EX.'help'.$RSDB_URI_slash.'">Help &amp; FAQ</a></li>
+      </ol>
+      <br />
+
+      <div class="navTitle">Search</div>
+      <ol>
+        <li>
+          <div id="ajaxsearchbar" align="center" style="display: none">
+          <div align="center">
+            <label for="searchbar" accesskey="s"></label>
+            <input name="searchbar" type="text" id="searchbar" tabindex="0" onkeyup="'."loadItemList(this.value,'bar','comp','ajaxloadbar','sresultbar');".'" size="17" maxlength="50" style="font-family: Verdana; font-size: x-small; font-style: normal;" />
+          </div>
+          <div id="sresultbar" style="display: none" align="left"></div>
+          <div style="text-align: center;">
+            <img id="ajaxloadbar" src="images/ajax_loading.gif" style="display: none" />
+          </div>
+        </li>
+      </ol>
+      <br />
+
+      <script type="text/javascript">
+      <!--'."
+        document.getElementById('ajaxsearchbar').style.display = 'block';
+        document.getElementById('noscriptsearchbar').style.display = 'none';
+      ".'-->
+      </script>
+
+      <div class="navTitle">Language</div>   
+      <ol>
+        <li> 
+          <div align="center">';
+
+    // get selected language
+    if (empty($_GET['lang']) && isset($_COOKIE['roscms_usrset_lang'])) {
+      $lang = $_COOKIE['roscms_usrset_lang'];
+      if (substr($lang, -1) == '/') {
+        $lang = substr($lang, -1);
+      }
+    }
+
+    // check if language exists, use fallback if needed
+    $lang = CLanguage::validate($lang);
+
+    // get name of currently used language
+    $stmt=CDBConnection::getInstance()->prepare("SELECT lang_name FROM rsdb_languages WHERE lang_id = :lang_id");
+    $stmt->bindParam('lang_id',$lang,PDO::PARAM_STR);
+    $stmt->execute();
+    $language_name = $stmt->fetchColumn();
+
+    echo '
+      <select id="select" size="1" name="select" class="selectbox" style="width:140px" onchange="'."window.open(this.options[this.selectedIndex].value,'_main');".'">
+        <optgroup label="current language">
+          <option value="#">'.$language_name.'</option>
+        </optgroup>
+        <optgroup label="most popular">';
+    $stmt=CDBConnection::getInstance()->prepare("SELECT lang_id, lang_name FROM rsdb_languages WHERE lang_id != :lang_id");
+    $stmt->bindParam('lang_id',$lang,PDO::PARAM_STR);
+    $stmt->execute();
+    while ($language=$stmt->fetch(PDO::FETCH_ASSOC)) {
+      echo '
+        <option value="'.$RSDB_intern_link_language.$language['lang_id'].'">'.$language['lang_name'].'</option>';
+    }
+
+    echo '
+              </optgroup>
+            </select>
+          </li>
+        </ol>
+      </td>
+      <td id="content">';
+  } // end of member function navigation
+
+
+
+  /**
+   * output site footer
+   *
+   * @access protected
+   */
+  protected function footer( )
+  {
+    // footer information
+    echo '
+              </td>
+            </tr>
+          </table>
+
+
+          <hr size="1" />
+          <address style="text-align:center">
+            <a href="http://www.reactos.org" onmousedown="'."return clk(this.href,'res','');".'">ReactOS</a> is a registered trademark or a trademark of <a href="http://www.reactos.org/?page=foundation">ReactOS Foundation</a> in the United States and other countries.<br />
+            Copyright  &copy; Klemens Friedl 2005-'.date('Y').', All rights reserved.
+          </address>
+
+        </body>
+      </html>';
+  } // end of member function footer
+
+
+
+  /**
+   * register a css file to be included in the header
+   *
+   * @param string name path & filename to a css file
+   * @param bool|string condition conditional statement (used by IE) to e.g. include sheets only for specific IE versions
+   * @access protected
+   */
+  protected function register_css( $name, $condition = false )
+  {
+    $this->css_files[] = array('name'=>$name, 'condition'=>$condition);
+  } // end of member function register_css
+
+
+
+  /**
+   * register a javascript file to be included in the header
+   *
+   * @param string name path & filename to a javascript file
+   * @access protected
+   */
+  protected function register_js( $name )
+  {
+    $this->js_files[] = $name;
+  } // end of member function register_js
+
+
+
+} // end of HTML
 ?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="<?php echo $RSDB_langres['lang_code']; ?>">
-<head>
-	<title>ReactOS <?php echo $page_title ; ?></title>
-	<base href="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>" />
-	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $RSDB_langres['charset']; ?>" />
-	<meta http-equiv="Pragma" content="no-cache" />
-	<meta name="Description" content="The ReactOS Compatibility Database has stored a lot of information about application and driver compatibility with ReactOS." />
-	<meta name="Keywords" content="ReactOS, Compatibility, application, driver, RSDB, support, database, DB, test, report, rating, Ros32, Ros64, Win32, Win64, W32, W64, Wine, vendor, release, version" />
-	<meta name="Copyright" content="ReactOS Foundation" />
-	<meta name="Generator" content="RSDB" />
-	<meta name="Content-language" content="<?php echo $RSDB_langres['lang_code']; ?>" />
-	<meta name="Robots" content="index,follow" />
-	<link rel="SHORTCUT ICON" href="../favicon.ico" />
-	<link href="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>css/style.css" type="text/css" rel="stylesheet" />
-	<script src="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>js/smoothscroll.js" language="javascript"></script>
-	<script src="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>js/search.js" language="javascript"></script>
-	
-
-	<script>
-	<!--
-		function clk(url,ct,sg) {
-			if(document.images) {
-				var u="";
-				
-				if (url) {
-					u="&url="+escape(url).replace(/\+/g,"%2B");
-				}
-				
-				<?php
-					$RSDB_i="";
-					if (array_key_exists('REMOTE_ADDR', $_SERVER)) $RSDB_i=htmlspecialchars($_SERVER['REMOTE_ADDR']);
-				?>
-				new Image().src="url.php?t=" + escape(ct) + "&u=" + u + "&a=<?php echo base64_encode($RSDB_intern_user_id);?>" + "&i=<?php echo base64_encode($RSDB_i);?>" + "&s" + sg;
-
-			}
-			return true;
-		}
-	-->
-	</script>
-</head>
-<body>
-<div id="top">
-  <div id="topMenu"> 
-    <!-- 
-       Use <p> to align things for links/lynx, then in the css make it
-	   margin: 0; and use text-align: left/right/etc;.
-   -->
-    <p align="center"> 
-		<a href="<?php echo $RSDB_intern_path_server; ?>?page=index"><?php echo $RSDB_langres['Home']; ?></a> <font color="#ffffff">|</font> 
-		<a href="<?php echo $RSDB_intern_path_server; ?>?page=about"><?php echo $RSDB_langres['Info']; ?></a> <font color="#ffffff">|</font> 
-		<a href="<?php echo $RSDB_intern_path_server; ?>?page=community"><?php echo $RSDB_langres['Community']; ?></a> <font color="#ffffff">|</font> 
-		<a href="<?php echo $RSDB_intern_path_server; ?>?page=dev"><?php echo $RSDB_langres['Dev']; ?></a> <font color="#ffffff">|</font> 
-		<a href="<?php echo $RSDB_intern_path_server."roscms/"; ?>?page=user"><?php echo $RSDB_langres['myReactOS']; ?></a> </p>
- </div>
-</div>
-
-
-<?php /*<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html><head><title>ReactOS Package Manager - Online</title>
-
-<link rel="stylesheet" type="text/css" href="reactos.basic.css"><!-- reactos.css -->
-<META content="ReactOS Package Manager - CMS System" name=GENERATOR>
-<META content="Klemens Friedl" name=AUTHOR>
-</head>  
-<body>*/
-
-
-//require("./inc/inc_account_check.php");
-
-?>
-
-<!-- Start of Navigation Bar -->
-
-<?php
-} // End of function create_head
-?>

Propchange: branches/danny-web/reactos.org/htdocs/compat/lib/HTML.class.php
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php (from r40325, branches/danny-web/reactos.org/htdocs/compat/inc/about.php)
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php?p2=branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php&p1=branches/danny-web/reactos.org/htdocs/compat/inc/about.php&r1=40325&r2=40338&rev=40338&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/compat/inc/about.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php [iso-8859-1] Fri Apr  3 02:33:34 2009
@@ -18,26 +18,26 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     */
 
-/*
- *	ReactOS Support Database System - RSDB
- *	
- *	(c) by Klemens Friedl <frik85>
- *	
- *	2005 - 2006 
- */
+
+class About extends HTML
+{
 
 
-	// To prevent hacking activity:
-	if ( !defined('RSDB') )
-	{
-		die(" ");
-	}
 
-?>
-<h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> &gt; <?php echo $RSDB_langres['TEXT_about_rsdb']; ?></h1> 
-<h2><?php echo $RSDB_langres['TEXT_about_rsdb']; ?></h2> 
-<p><?php echo $RSDB_langres['CONTENT_about_rsdb']; ?></p>
-<p><?php echo $RSDB_langres['CONTENT_about_webteam']; ?></p>
-<p>&nbsp;</p>
-<h3><?php echo $RSDB_langres['TEXT_credits']; ?></h3>
-<p><b>Klemens Friedl:</b> <?php echo $RSDB_langres['CONTENT_about_credits_frik85']; ?></p>
+  protected function body( )
+  {
+    global $RSDB_langres;
+
+    echo '
+      <h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> &gt; '.$RSDB_langres['TEXT_about_rsdb'].'</h1> 
+      <h2>'.$RSDB_langres['TEXT_about_rsdb'].'</h2> 
+      <p>'.$RSDB_langres['CONTENT_about_rsdb'].'</p>
+      <p>'.$RSDB_langres['CONTENT_about_webteam'].'</p>
+      <p>&nbsp;</p>
+      <h3>'.$RSDB_langres['TEXT_credits'].'</h3>
+      <p><strong>Klemens Friedl:</strong> '.$RSDB_langres['CONTENT_about_credits_frik85'].'</p>';
+  } // end of member function body
+
+
+
+} // end of About

Propchange: branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php?rev=40338&r1=40337&r2=40338&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php [iso-8859-1] Fri Apr  3 02:33:34 2009
@@ -36,7 +36,6 @@
 
 
 		global $RSDB_SET_page;
-		global $RSDB_SET_view;
 		global $RSDB_SET_sec;
 		global $RSDB_SET_cat;
 		global $RSDB_SET_cat2;
@@ -93,14 +92,14 @@
 			$RSDB_intern_link_HRU_about = $RSDB_intern_index_HRU."/about/";
 			$RSDB_intern_link_HRU_conditions = $RSDB_intern_index_HRU."/comp/conditions/";
 			$RSDB_intern_link_HRU_help = $RSDB_intern_index_HRU."/comp/help/";
-			$RSDB_intern_index_HRU_view = $RSDB_intern_index_HRU."/".$RSDB_SET_view;
+			$RSDB_intern_index_HRU_view = $RSDB_intern_index_HRU."/comp";
 			$RSDB_intern_link_HRU_view = $RSDB_intern_index_HRU_view."/";
 			
 			// Browse - general
-			$RSDB_intern_link_HRU_view_group = $RSDB_intern_index_HRU."/".$RSDB_SET_view."/".$RSDB_SET_sec."/group/";
-			$RSDB_intern_link_HRU_view_item = $RSDB_intern_index_HRU."/".$RSDB_SET_view."/".$RSDB_SET_sec."/item/";
-			$RSDB_intern_link_HRU_view_letter = $RSDB_intern_index_HRU."/".$RSDB_SET_view."/".$RSDB_SET_sec."/letter/";
-			$RSDB_intern_link_HRU_view_cat = $RSDB_intern_index_HRU."/".$RSDB_SET_view."/".$RSDB_SET_sec."/id/";
+			$RSDB_intern_link_HRU_view_group = $RSDB_intern_index_HRU."/comp/".$RSDB_SET_sec."/group/";
+			$RSDB_intern_link_HRU_view_item = $RSDB_intern_index_HRU."/comp/".$RSDB_SET_sec."/item/";
+			$RSDB_intern_link_HRU_view_letter = $RSDB_intern_index_HRU."/comp/".$RSDB_SET_sec."/letter/";
+			$RSDB_intern_link_HRU_view_cat = $RSDB_intern_index_HRU."/comp/".$RSDB_SET_sec."/id/";
 			
 			
 
@@ -157,9 +156,9 @@
 		$RSDB_intern_link_roscms_page = $RSDB_intern_link_roscms."?page=";
 	
 		// Section
-		$RSDB_intern_link_db_sec = $RSDB_intern_index_php."?page=db&amp;view=".$RSDB_SET_view."&amp;sec=";
-		$RSDB_intern_link_db_sec_javascript = $RSDB_intern_index_php."?page=db&view=".$RSDB_SET_view."&sec=";
-		$RSDB_intern_link_db_sec_javascript2 = $RSDB_intern_index_php."?page=db&view=".$RSDB_SET_view."&sec=".$RSDB_SET_sec;
+		$RSDB_intern_link_db_sec = $RSDB_intern_index_php."?page=db&amp;sec=";
+		$RSDB_intern_link_db_sec_javascript = $RSDB_intern_index_php."?page=db&sec=";
+		$RSDB_intern_link_db_sec_javascript2 = $RSDB_intern_index_php."?page=db&sec=".$RSDB_SET_sec;
 		
 		
 		// View
@@ -229,7 +228,7 @@
 
 		// Item
 		$RSDB_intern_link_item = $RSDB_intern_link_db_sec.$RSDB_SET_sec."&amp;item=";
-		$RSDB_intern_link_item_javascript = $RSDB_intern_index_php."?page=db&view=".$RSDB_SET_view."&sec=".$RSDB_SET_sec."&item=";
+		$RSDB_intern_link_item_javascript = $RSDB_intern_index_php."?page=db&sec=".$RSDB_SET_sec."&item=";
 		$RSDB_intern_link_item_item2 = $RSDB_intern_link_item.$RSDB_SET_item."&amp;item2=";
 		$RSDB_intern_link_item_item2_both = $RSDB_intern_link_item_item2.$RSDB_SET_item2;
 		$RSDB_intern_link_item_item2_both_javascript = $RSDB_intern_link_db_sec_javascript.$RSDB_SET_sec."&item=".$RSDB_SET_item."&item2=".$RSDB_SET_item2;
@@ -308,14 +307,14 @@
 
 
 		// Language
-		$RSDB_intern_link_language = $RSDB_intern_index_php."?page=".$RSDB_SET_page."&amp;sec=".$RSDB_SET_sec."&amp;view=".$RSDB_SET_view."&amp;cat=".$RSDB_SET_cat."&amp;cat2=".$RSDB_SET_cat2."&amp;letter=".$RSDB_SET_letter."&amp;group=".$RSDB_SET_group."&amp;item=".$RSDB_SET_item."&amp;order=".$RSDB_SET_order."&amp;filter=".$RSDB_SET_filter."&amp;vendor=".$RSDB_SET_vendor."&amp;lang=";
+		$RSDB_intern_link_language = $RSDB_intern_index_php."?page=".$RSDB_SET_page."&amp;sec=".$RSDB_SET_sec."&amp;cat=".$RSDB_SET_cat."&amp;cat2=".$RSDB_SET_cat2."&amp;letter=".$RSDB_SET_letter."&amp;group=".$RSDB_SET_group."&amp;item=".$RSDB_SET_item."&amp;order=".$RSDB_SET_order."&amp;filter=".$RSDB_SET_filter."&amp;vendor=".$RSDB_SET_vendor."&amp;lang=";
 
 		// Ajax
 		$RSDB_intern_link_ajax = $RSDB_intern_link_language.$RSDB_SET_lang."&amp;ajax=";
 
 		// Export
-		//$RSDB_intern_link_export = $RSDB_intern_index_php."?page=data&amp;sec=".$RSDB_SET_sec."&amp;view=".$RSDB_SET_view."&amp;cat=".$RSDB_SET_cat."&amp;cat2=".$RSDB_SET_cat2."&amp;letter=".$RSDB_SET_letter."&amp;group=".$RSDB_SET_group."&amp;item=".$RSDB_SET_item."&amp;order=".$RSDB_SET_order."&amp;filter=".$RSDB_SET_filter."&amp;vendor=".$RSDB_SET_vendor."&amp;lang=".$RSDB_SET_lang."&amp;export=";
-		$RSDB_intern_link_export = $RSDB_intern_index_php."?page=dat&sec=".$RSDB_SET_sec."&view=".$RSDB_SET_view."&cat=".$RSDB_SET_cat."&cat2=".$RSDB_SET_cat2."&letter=".$RSDB_SET_letter."&group=".$RSDB_SET_group."&item=".$RSDB_SET_item."&order=".$RSDB_SET_order."&filter=".$RSDB_SET_filter."&vendor=".$RSDB_SET_vendor."&lang=".$RSDB_SET_lang."&export=";
+		//$RSDB_intern_link_export = $RSDB_intern_index_php."?page=data&amp;sec=".$RSDB_SET_sec."&amp;cat=".$RSDB_SET_cat."&amp;cat2=".$RSDB_SET_cat2."&amp;letter=".$RSDB_SET_letter."&amp;group=".$RSDB_SET_group."&amp;item=".$RSDB_SET_item."&amp;order=".$RSDB_SET_order."&amp;filter=".$RSDB_SET_filter."&amp;vendor=".$RSDB_SET_vendor."&amp;lang=".$RSDB_SET_lang."&amp;export=";
+		$RSDB_intern_link_export = $RSDB_intern_index_php."?page=dat&sec=".$RSDB_SET_sec."&cat=".$RSDB_SET_cat."&cat2=".$RSDB_SET_cat2."&letter=".$RSDB_SET_letter."&group=".$RSDB_SET_group."&item=".$RSDB_SET_item."&order=".$RSDB_SET_order."&filter=".$RSDB_SET_filter."&vendor=".$RSDB_SET_vendor."&lang=".$RSDB_SET_lang."&export=";
 		$RSDB_intern_link_export2 = $RSDB_intern_index_php."?page=dat&export=";
 
 

Modified: branches/danny-web/reactos.org/htdocs/compat/rsdb_human_readable_url.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/compat/rsdb_human_readable_url.php?rev=40338&r1=40337&r2=40338&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/compat/rsdb_human_readable_url.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/compat/rsdb_human_readable_url.php [iso-8859-1] Fri Apr  3 02:33:34 2009
@@ -94,7 +94,6 @@
 				break;
 			case "comp": // .../comp/cat/id/xx
 				$RSDB_SET_page = "db";
-				$RSDB_SET_view = "comp";
 				switch( $RSDB_HUMAN_URI_tree_2 ) {
 					case "cat": // short
 					case "category":
@@ -166,7 +165,6 @@
 		
 		$RSDB_SET_page = "db";
 		$RSDB_SET_lang = "en";
-		$RSDB_SET_view = "comp";
 		/*$RSDB_SET_entry = "";
 		$RSDB_SET_entry = @$RSDB_URI_tree_array[2];
 		$RSDB_SET_action = "";



More information about the Ros-diffs mailing list