[ros-diffs] [cfinck] 387: Finish Wiki integration into RosCMS 4

[cfinck at svn.reactos.org]

Author: cfinck
Date: Mon Apr 20 23:06:10 2009
New Revision: 387

URL: http://svn.reactos.org/svn/reactos?rev=387&view=rev
Log:
Finish Wiki integration into RosCMS 4

Modified:
    branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php
    branches/danny-web/www/www.reactos.org/wiki/LocalSettings.php
    branches/danny-web/www/www.reactos.org/wiki/includes/specials/SpecialUserlogin.php
    branches/danny-web/www/www.reactos.org/wiki/skins/RosCMS.php

Modified: branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php?rev=387&r1=386&r2=387&view=diff
==============================================================================
--- branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php [iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php [iso-8859-1] Mon Apr 20 23:06:10 2009
@@ -83,7 +83,7 @@
         $stmt=&DBConnection::getInstance()->prepare("SELECT s.user_id, s.expires FROM ".ROSCMST_SESSIONS." s JOIN ".ROSCMST_USERS." u ON u.id = s.user_id WHERE s.id = :session_id AND (u.match_ip IS FALSE OR s.ip=:ip ) AND (u.match_browseragent IS FALSE OR s.browseragent = :agent) AND u.disabled IS FALSE LIMIT 1");
       }
       else{
-        $stmt=&DBConnection::getInstance()->prepare("SELECT s.user_id, s.expires FROM ".ROSCMST_SESSIONS." s JOIN ".ROSCMST_USERS." u ON u.id = s.user_id JOIN ".ROSCMST_SUBSYS." m ON m.user_id = s.user_id WHERE s.id = :session_id AND (u.match_ip IS FALSE OR s.ip = :ip) AND (u.match_browseragent IS FALSE OR s.browseragent = :agent) AND m.subsys = :subsys AND u.disabled IS FALSE LIMIT 1");
+        $stmt=&DBConnection::getInstance()->prepare("SELECT m.subsys_user_id AS user_id, s.expires FROM ".ROSCMST_SESSIONS." s JOIN ".ROSCMST_USERS." u ON u.id = s.user_id JOIN ".ROSCMST_SUBSYS." m ON m.user_id = s.user_id WHERE s.id = :session_id AND (u.match_ip IS FALSE OR s.ip = :ip) AND (u.match_browseragent IS FALSE OR s.browseragent = :agent) AND m.subsys = :subsys AND u.disabled IS FALSE LIMIT 1");
         $stmt->bindParam('subsys',$subsys,PDO::PARAM_STR);
       }
       $stmt->bindParam('session_id',$session_id,PDO::PARAM_INT);

Modified: branches/danny-web/www/www.reactos.org/wiki/LocalSettings.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/wiki/LocalSettings.php?rev=387&r1=386&r2=387&view=diff
==============================================================================
--- branches/danny-web/www/www.reactos.org/wiki/LocalSettings.php [iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/wiki/LocalSettings.php [iso-8859-1] Mon Apr 20 23:06:10 2009
@@ -143,3 +143,4 @@
 
 # RosCMS-specific settings
 define("ROSCMS_PATH", "$IP/../roscms/");
+define("SHARED_PATH", "$IP/../shared/");

Modified: branches/danny-web/www/www.reactos.org/wiki/includes/specials/SpecialUserlogin.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/wiki/includes/specials/SpecialUserlogin.php?rev=387&r1=386&r2=387&view=diff
==============================================================================
--- branches/danny-web/www/www.reactos.org/wiki/includes/specials/SpecialUserlogin.php [iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/wiki/includes/specials/SpecialUserlogin.php [iso-8859-1] Mon Apr 20 23:06:10 2009
@@ -4,7 +4,7 @@
  * @ingroup SpecialPage
  */
 
-require_once(ROOT_PATH . "roscms/logon/subsys_login.php");
+require_once(ROSCMS_PATH . "lib/RosCMS_Autoloader.class.php");
 
 /**
  * constructor
@@ -12,7 +12,7 @@
 function wfSpecialUserlogin( $par = '' ) {
 	/* Login to RosCMS */
 	$target = "/wiki";
-	roscms_subsys_login('wiki', ROSCMS_LOGIN_REQUIRED, $target);
+	Subsystem_Wiki::in(Login::REQUIRED, $target);
 	
 	/* Just redirect us to the main page in case we were called but already logged in */
 	header("Location: $target");

Modified: branches/danny-web/www/www.reactos.org/wiki/skins/RosCMS.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/wiki/skins/RosCMS.php?rev=387&r1=386&r2=387&view=diff
==============================================================================
--- branches/danny-web/www/www.reactos.org/wiki/skins/RosCMS.php [iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/wiki/skins/RosCMS.php [iso-8859-1] Mon Apr 20 23:06:10 2009
@@ -14,7 +14,7 @@
 if( !defined( 'MEDIAWIKI' ) )
 	die( -1 );
 
-require_once(ROOT_PATH . "shared/subsys_layout.php");
+require_once(SHARED_PATH . "subsys_layout.php");
 
 /**
  * Inherit main code from SkinTemplate, set the CSS and template filter.