[ros-diffs] [dgoette] 389: update subsystem integration to roscms4, set url for this server

Author: dgoette
Date: Tue Apr 21 00:25:29 2009
New Revision: 389

URL: http://svn.reactos.org/svn/reactos?rev=389&view=rev
Log:
update subsystem integration to roscms4, set url for this server

Modified:
    branches/danny-web/www/www.reactos.org/support/inc/comp/data/group_list.php
    branches/danny-web/www/www.reactos.org/support/inc/utils.php
    branches/danny-web/www/www.reactos.org/support/rsdb_human_readable_url.php
    branches/danny-web/www/www.reactos.org/support/rsdb_setting.php
    branches/danny-web/www/www.reactos.org/support/search.js
    branches/danny-web/www/www.reactos.org/support/style.css

Modified: branches/danny-web/www/www.reactos.org/support/inc/comp/data/group_list.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s…
==============================================================================
--- branches/danny-web/www/www.reactos.org/support/inc/comp/data/group_list.php
[iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/support/inc/comp/data/group_list.php
[iso-8859-1] Tue Apr 21 00:25:29 2009
@@ -117,8 +117,8 @@
 		<comp><?php echo $result_page['grpentr_comp']; ?></comp>
 		<devnet><?php echo $result_page['grpentr_devnet'];
?></devnet>
 	</dbentry>
-<?
+<?php
 	}
 }
 ?>
-</root>
+</root>

Modified: branches/danny-web/www/www.reactos.org/support/inc/utils.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s…
==============================================================================
--- branches/danny-web/www/www.reactos.org/support/inc/utils.php [iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/support/inc/utils.php [iso-8859-1] Tue Apr 21
00:25:29 2009
@@ -19,6 +19,6 @@
     */
 
 //require_once("/web/reactos.org/htdocs/roscms/inc/utils.php");
-require_once("../roscms/inc/utils.php");
+require_once("../shared/subsys_layout.php");
 
 ?>

Modified: branches/danny-web/www/www.reactos.org/support/rsdb_human_readable_url.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s…
==============================================================================
--- branches/danny-web/www/www.reactos.org/support/rsdb_human_readable_url.php
[iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/support/rsdb_human_readable_url.php
[iso-8859-1] Tue Apr 21 00:25:29 2009
@@ -29,9 +29,9 @@
 	$RSDB_URI_mode = "";
 
 
-	$RSDB_intern_SET_path = "http://localhost/reactos.org/support/";
-	$RSDB_intern_SET_path_ex = "http://localhost/reactos.org/support/index.php/";
-	$RSDB_intern_dirs = "reactos.org/support/";
+	$RSDB_intern_SET_path = "http://79.99.5.181/support/";
+	$RSDB_intern_SET_path_ex = "http://79.99.5.181/support/index.php/";
+	$RSDB_intern_dirs = "79.99.5.181/support/";
 
 
 	$RSDB_URI_tree = $_SERVER['REQUEST_URI'];

Modified: branches/danny-web/www/www.reactos.org/support/rsdb_setting.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s…
==============================================================================
--- branches/danny-web/www/www.reactos.org/support/rsdb_setting.php [iso-8859-1]
(original)
+++ branches/danny-web/www/www.reactos.org/support/rsdb_setting.php [iso-8859-1] Tue Apr
21 00:25:29 2009
@@ -39,8 +39,8 @@
 	// **************
 	
 		// Config: (please sync this with the database)
-		$RSDB_intern_version = "RSDB 0.1 - http://www.reactos.org/"quot;; // RSDB version
info
-		$RSDB_intern_path_server = "http://www.reactos.org/"; // complete server
path
+		$RSDB_intern_version = "RSDB 0.1 - http://79.99.5.181/"quot;; // RSDB version
info
+		$RSDB_intern_path_server = "http://79.99.5.181/"; // complete server path
 		$RSDB_intern_path = "support/"; // the dirs after http://www.reactos.org
 		
 		// script file fix (for Safari browser)
@@ -54,21 +54,17 @@
 		$RSDB_intern_items_per_page = 25;
 		
 		@define("ROOT_PATH", "../");
-		require_once(ROOT_PATH . "roscms/logon/subsys_login.php");
+		@define ("ROSCMS_PATH", ROOT_PATH.'roscms/');
+		require_once(ROSCMS_PATH . "lib/RosCMS_Autoloader.class.php");
 
 		// User ID
-		$RSDB_intern_user_id = roscms_subsys_login('', ROSCMS_LOGIN_OPTIONAL,
"/" . $RSDB_intern_path);
+		$RSDB_intern_user_id = Subsystem::in(Login::OPTIONAL, "/" .
$RSDB_intern_path);
 		
 		require_once('inc/user_settings.php');
 		
 		if($RSDB_intern_user_id != 0) {
-			$query_roscms_user = mysql_query("SELECT * 
-					FROM roscms.users 
-					WHERE `user_id` = '".mysql_escape_string($RSDB_intern_user_id)."'
LIMIT 1;") ;
-			$result_roscms_user = mysql_fetch_array($query_roscms_user);
-			
 			// Name
-			$RSDB_USER_name = $result_roscms_user['user_name'];
+			$RSDB_USER_name = Subsystem::getUserName($RSDB_intern_user_id);
 			
 			
 			// RSDB user settings

Modified: branches/danny-web/www/www.reactos.org/support/search.js
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s…
==============================================================================
--- branches/danny-web/www/www.reactos.org/support/search.js [iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/support/search.js [iso-8859-1] Tue Apr 21
00:25:29 2009
@@ -13,8 +13,8 @@
 	var tResults = "";
 	//var twebsite = "http://localhost/reactos.org/support/index.php";
 	//var twebsite2 = "http://localhost/reactos.org/";
-	var twebsite = "http://www.reactos.org/support/index.php";
-	var twebsite2 = "http://www.reactos.org/";
+	var twebsite = "http://79.99.5.181/support/index.php";
+	var twebsite2 = "http://79.99.5.181/";
 	
 
 	function writeItemList_style_header() {
@@ -350,4 +350,4 @@
 	
 	}
 
--->
+-->

Modified: branches/danny-web/www/www.reactos.org/support/style.css
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s…
==============================================================================
--- branches/danny-web/www/www.reactos.org/support/style.css [iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/support/style.css [iso-8859-1] Tue Apr 21
00:25:29 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('/roscms/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.pn…
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('/roscms/images/bullet.png')
 }
  
 #top {
 	margin: 0;
-	background: url('http://localhost/reactos.org/support/images/logo_rsdb.jpg')
no-repeat scroll 35px 0;
+	background: url('/support/images/logo_rsdb.jpg') no-repeat scroll 35px 0;
 	padding: 103px 0 26px 0;
 	color: #FFFFFF;
 	text-align: right;