[cfinck] 36564: Fix the Paste Service for the new Logon system

Author: cfinck
Date: Sun Sep 28 05:02:52 2008
New Revision: 36564

URL: http://svn.reactos.org/svn/reactos?rev=36564&view=rev
Log:
Fix the Paste Service for the new Logon system

Modified:
    trunk/web/reactos.org/htdocs/paste/inc/account.php
    trunk/web/reactos.org/htdocs/paste/index.php

Modified: trunk/web/reactos.org/htdocs/paste/inc/account.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/ac...
==============================================================================
--- trunk/web/reactos.org/htdocs/paste/inc/account.php [iso-8859-1] (original)
+++ trunk/web/reactos.org/htdocs/paste/inc/account.php [iso-8859-1] Sun Sep 28 05:02:52 2008
@@ -20,12 +20,10 @@

include("connect.db.php");

-/*
-	require_once("/web/reactos.org/htdocs/roscms/inc/subsys_login.php");
-	$RSDB_intern_user_id = roscms_subsys_login('', ROSCMS_LOGIN_OPTIONAL, "/" . $RSDB_intern_path);
-*/
-	$RSDB_intern_user_id=2;
-	$RSDB_USER_name="Anonymous";
+
+	define("ROSCMS_PATH", "../roscms/");
+	require_once(ROSCMS_PATH . "logon/subsys_login.php");
+	$RSDB_intern_user_id = roscms_subsys_login('', ROSCMS_LOGIN_OPTIONAL, "/" . "http://localhost/reactos.org/");

if($RSDB_intern_user_id != 0) {
    	$query_roscms_user = mysql_query("SELECT * 
@@ -40,6 +38,5 @@
    else {
    	$RSDB_USER_name = "Anonymous";
    }
-	//echo "<h1>!!!".$RSDB_USER_name."</h1>";

?>

Modified: trunk/web/reactos.org/htdocs/paste/index.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/index....
==============================================================================
--- trunk/web/reactos.org/htdocs/paste/index.php [iso-8859-1] (original)
+++ trunk/web/reactos.org/htdocs/paste/index.php [iso-8859-1] Sun Sep 28 05:02:52 2008
@@ -27,10 +27,10 @@
 }

-	$ros_paste_SET_path = "http://localhost/reactos.org/paste/";
-	$ros_paste_SET_path_ex = "http://localhost/reactos.org/paste/index.php/";
+	$ros_paste_SET_path = "http://www.reactos.org/paste/";
+	$ros_paste_SET_path_ex = "http://www.reactos.org/paste/index.php/";
    $ros_paste_SET_dirs = "reactos.org/paste/";
-	$ros_paste_SET_content = "content";
+	$ros_paste_SET_content = "storage";

@@ -66,22 +66,23 @@
    
    if (!strchr($RSDB_URI_tree,"?page=")) {
    	//echo "<p>###</p>";
-		$ros_paste_SET_page = @$RSDB_URI_tree_array[1];
+		$ros_paste_SET_page = @$RSDB_URI_tree_array[3];
    	if ($ros_paste_SET_page == "id") {
    		$ros_paste_SET_page = "paste";
    		$ros_paste_SET_pasteid = "";
-			$ros_paste_SET_pasteid = @$RSDB_URI_tree_array[2];
+			$ros_paste_SET_pasteid = @$RSDB_URI_tree_array[3];
    		$ros_paste_SET_pasteflag = "";
-			$ros_paste_SET_pasteflag = @$RSDB_URI_tree_array[3];
+			$ros_paste_SET_pasteflag = @$RSDB_URI_tree_array[4];
    	}
    	else if ($ros_paste_SET_page != "conditions" && $ros_paste_SET_page != "help" && $ros_paste_SET_page != "recent") {
    		$ros_paste_SET_page = "paste";
    		$ros_paste_SET_pasteid = "";
-			$ros_paste_SET_pasteid = @$RSDB_URI_tree_array[1];
+			$ros_paste_SET_pasteid = @$RSDB_URI_tree_array[3];
    		$ros_paste_SET_pasteflag = "";
-			$ros_paste_SET_pasteflag = @$RSDB_URI_tree_array[2];
+			$ros_paste_SET_pasteflag = @$RSDB_URI_tree_array[4];
    	}
    }
+
    
    include("inc/tools.php");