From svn at muze.nl  Fri May  6 15:00:24 2011
From: svn at muze.nl (svn at muze.nl)
Date: Fri, 06 May 2011 13:00:24 -0000
Subject: [Ariadne-extensions-svn] profiler patch: r264 -
	/profiler/trunk/www/profiler.php
Message-ID: <iibk8m$1ao$1@olympos.muze.nl>

Author: wouter
Date: Wed Feb  2 14:08:27 2011
New Revision: 264

URL: http://svn.muze.nl?rev=264&root=ariadne_extensions&view=rev
Log:
make profiler loader more inline with regular loader

Modified:
    profiler/trunk/www/profiler.php

Modified: profiler/trunk/www/profiler.php
URL: http://svn.muze.nl/profiler/trunk/www/profiler.php?rev=264&root=ariadne_extensions&r1=263&r2=264&view=diff
==============================================================================
--- profiler/trunk/www/profiler.php (original)
+++ profiler/trunk/www/profiler.php Wed Feb  2 14:08:27 2011
@@ -64,17 +64,18 @@
 	}
 
 
-	$PATH_INFO=$HTTP_SERVER_VARS["PATH_INFO"];
-	if (!$PATH_INFO) {
-
-		ldRedirect($HTTP_SERVER_VARS["PHP_SELF"]."/");
+	$AR_PATH_INFO=$_SERVER["PATH_INFO"];
+	if (!$AR_PATH_INFO) {
+
+		ldRedirect($_SERVER["PHP_SELF"]."/");
 		exit;
 
 	} else {
 
 		// needed for IIS: it doesn't set the PHP_SELF variable.
-		$PHP_SELF=$HTTP_SERVER_VARS["SCRIPT_NAME"].$PATH_INFO;
-		$HTTP_SERVER_VARS["PHP_SELF"] = $PHP_SELF;
+		if(!isset( $_SERVER["PHP_SELF"])){
+			$_SERVER['PHP_SELF']=$_SERVER["SCRIPT_NAME"].$AR_PATH_INFO;
+		}
 		if (Headers_sent()) {
 			error("The loader has detected that PHP has already sent the HTTP Headers. This error is usually caused by trailing white space or newlines in the configuration files. See the following error message for the exact file that is causing this:");
 			Header("Misc: this is a test header");
@@ -85,13 +86,12 @@
 		$root=$AR->root;
 		$session_id=0;
 		$re="^/-(.{4})-/";
-		if (eregi($re,$PATH_INFO,$matches)) {
+		if (eregi($re,$AR_PATH_INFO,$matches)) {
 			$session_id=$matches[1];
-			$PATH_INFO=substr($PATH_INFO,strlen($matches[0])-1);
+			$AR_PATH_INFO=substr($AR_PATH_INFO,strlen($matches[0])-1);
 			$AR->hideSessionIDfromURL=false;
 		} elseif ($AR->hideSessionIDfromURL) {
-			global $HTTP_COOKIE_VARS;
-			$ARCookie=stripslashes($HTTP_COOKIE_VARS["ARCookie"]);
+			$ARCookie=stripslashes($_COOKIE["ARCookie"]);
 			$cookie=@unserialize($ARCookie);
 			if (is_array($cookie)) {
 				$session_id=current(array_keys($cookie));
@@ -102,9 +102,9 @@
 		$AR->login="public";
 
 		// look for the template
-		$split=strrpos($PATH_INFO, "/");
-		$path=substr($PATH_INFO,0,$split+1);
-		$function=substr($PATH_INFO,$split+1);
+		$split=strrpos($AR_PATH_INFO, "/");
+		$path=substr($AR_PATH_INFO,0,$split+1);
+		$function=substr($AR_PATH_INFO,$split+1);
 		if (!$function) {
 			if (!$arDefaultFunction) {
 				$arDefaultFunction="view.html";
@@ -113,10 +113,10 @@
 			if ($arFunctionPrefix) {
 				$function=$arFunctionPrefix.$function;
 			}
-			$PATH_INFO.=$function;
+			$AR_PATH_INFO.=$function;
 		}
 		// yes, the extra '=' is needed, don't remove it. trust me.
-		$ldCacheFilename=strtolower($PATH_INFO)."=";
+		$ldCacheFilename=strtolower($AR_PATH_INFO)."=";
 		// for the new multiple domains per site option (per language), we need this
 		// since the nls isn't literaly in the url anymore.
 		$ldCacheFilename.=str_replace(':','=',str_replace('/','',$AR->host)).'=';


From svn at muze.nl  Fri May  6 15:00:25 2011
From: svn at muze.nl (svn at muze.nl)
Date: Fri, 06 May 2011 13:00:25 -0000
Subject: [Ariadne-extensions-svn] profiler patch: r265 -
	/profiler/trunk/README
Message-ID: <iiblo6$45m$1@olympos.muze.nl>

Author: wouter
Date: Wed Feb  2 14:33:47 2011
New Revision: 265

URL: http://svn.muze.nl?rev=265&root=ariadne_extensions&view=rev
Log:
fix readme to reflect current state of things

Modified:
    profiler/trunk/README

Modified: profiler/trunk/README
URL: http://svn.muze.nl/profiler/trunk/README?rev=265&root=ariadne_extensions&r1=264&r2=265&view=diff
==============================================================================
--- profiler/trunk/README (original)
+++ profiler/trunk/README Wed Feb  2 14:33:47 2011
@@ -9,20 +9,5 @@
 ---------------------------------
 This version of the profiler was done against pobject in:
 Repository Root: https://svn.muze.nl/svn/ariadne-php5
-Revision: 4304
+Revision: 4827
 
--------------------------------------------
-Updating to newer Ariadne pobject revisions
--------------------------------------------
-To update the profiler to a newer version of pobject:
-- copy the ariadne version of pobject.phtml to
-lib/objects/ariadne_object.phtml;
-
-Change 
-	"class pobject extends object" 
-to
-	"class ariadne_object extends object"
-
-
-If the function arguments have not changed in pobject you are done - if not,
-change the calls to reflect the changes.