[Thevr-commit] SF.net SVN: thevr: [39] modx/pms/trunk/TheVR_0.1.1c.xml

[<Yau...@us...>]

Revision: 39
          http://thevr.svn.sourceforge.net/thevr/?rev=39&view=rev
Author:   Yautja_cetanu
Date:     2007-09-01 20:04:03 -0700 (Sat, 01 Sep 2007)

Log Message:
-----------
Added changed to the modx file found between /pms/trunk r21:32 (root files not sorted)

Modified Paths:
--------------
    modx/pms/trunk/TheVR_0.1.1c.xml

Modified: modx/pms/trunk/TheVR_0.1.1c.xml
===================================================================
--- modx/pms/trunk/TheVR_0.1.1c.xml	2007-09-02 03:00:01 UTC (rev 38)
+++ modx/pms/trunk/TheVR_0.1.1c.xml	2007-09-02 03:04:03 UTC (rev 39)
@@ -109,7 +109,8 @@
 			<file from="/root/includes/acp/info/acp_siteconfig.php" to="includes/acp/info/acp_siteconfig.php" />
 			<file from="/root/language/en/acp/sites.php" to="language/en/acp/sites.php" />
 			<file from="/root/language/en/acp/siteconfig.php" to="language/en/acp/siteconfig.php" />
-			<file from="/root/language/en/mods/permissions_sites.php" to="language/en/mods/permissions_sites.php"/>
+			<file from="/root/language/en/mods/permissions_sites.php" to="language/en/mods/permissions_sites.php" />
+			<file from="/root/thevr_pms_install.php" to="thevr_pms_install.php" />
 		</copy>
 		<open src="/common.php">
 			<edit>
@@ -123,7 +124,7 @@
 				<action type="after-add">
 
 /***** START
-ADDED by andrewbelcher for thevr.co.uk
+ADDED for thevr.co.uk
 This processes the URL so the correct site settings can be used.
 *****/
 
@@ -137,14 +138,14 @@
 <![CDATA[while ($i <= $bits)]]>
 {
 	$domains[$i] = $domain_bits[$bits - $i] . '.' . $domains[$i - 1];
-	
+
 	$i++;
 }
 
 $sql = 'SELECT s.*, su.domain
 	FROM ' . SITES_TABLE . ' s INNER JOIN ' . SITE_URL_TABLE . ' su ON s.site_id = su.site_id
 	WHERE su.domain IN ';
-
+$notfirst = false;
 foreach ($domains AS $key => $value)
 {
 	$sql .= ($notfirst == false) ? '(': ', ';
@@ -176,7 +177,7 @@
 			'site_domain'		=> $domain,
 			'site_file'			=> $filename,
 			'site_vars'			=> $vars)
-			
+
 			);
 	}
 	//Fetch site specific config data:
@@ -192,22 +193,7 @@
 	{
 		define('MOBILE_VERSION', true);
 	}
-/***** END *****/
-
-// Temporary addition until cookies are sorted:
-	if (strpos($domain, 'thevr.co.uk') == false AND $domain != 'thevr.co.uk')
-	{
-		$sql = 'SELECT su.domain
-		FROM ' . SITE_URL_TABLE . " AS su
-		WHERE su.site_id = '" . $config['site_id'] . "'
-			AND su.domain LIKE '%thevr.co.uk'
-		LIMIT 1";
-		$result = $db->sql_query($sql);
-		$row = $db->sql_fetchrow($result);
-
-		header('Location: http://' . $row['domain'] . $_SERVER['REQUEST_URI']);
-	}
-				</action>
+/***** END *****/</action>
 			</edit>
 		</open>
 		<open src="/adm/style/acp_forums.html">
@@ -334,5 +320,11 @@
 	'SITE_GLOBAL'				=> 'Global Forum',</action>
 			</edit>
 		</open>
+		<open src="/includes/functions_admin.php">
+			<edit>
+				<find><![CDATA[	$result = $db->sql_query($sql, 600);]]></find>
+			<action type="replace-with"><![CDATA[	$result = $db->sql_query($sql, 0); //Temporary fix for parent buy before next version]]></action>
+			</edit>
+		</open>
 	</action-group>
 </mod>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.