Index: trunk/admin/category/category_maint.php
===================================================================
diff -u -r540 -r563
--- trunk/admin/category/category_maint.php	(.../category_maint.php)	(revision 540)
+++ trunk/admin/category/category_maint.php	(.../category_maint.php)	(revision 563)
@@ -16,7 +16,7 @@
 
 if(!strlen($pathtoroot))
 {
-  	$path = dirname(realpath($_SERVER['SCRIPT_FILENAME']));
+  	$path = dirname(realpath(__FILE__));
   	if( strlen($path) )
   	{
     	// determine the OS type for path parsing
Index: trunk/globals.php
===================================================================
diff -u -r549 -r563
--- trunk/globals.php	(.../globals.php)	(revision 549)
+++ trunk/globals.php	(.../globals.php)	(revision 563)
@@ -113,7 +113,7 @@
 		global $rootURL;
 		echo 'In-Portal is probably not installed, or configuration file is missing.<br>';
 		echo 'Please use the installation script to fix the problem.<br><br>';
-		if ( !preg_match('/admin/', $_SERVER['SCRIPT_FILENAME']) ) $ins = 'admin/';
+		if ( !preg_match('/admin/', __FILE__) ) $ins = 'admin/';
 		
 		echo '<a href="'.$rootURL.$ins.'install.php">Go to installation script</a><br><br>';
 		flush();
Index: trunk/kernel/startup.php
===================================================================
diff -u -r534 -r563
--- trunk/kernel/startup.php	(.../startup.php)	(revision 534)
+++ trunk/kernel/startup.php	(.../startup.php)	(revision 563)
@@ -131,7 +131,7 @@
 	$adminDir = 'admin';
 }
 
-if (strstr($_SERVER['SCRIPT_FILENAME'], $adminDir) && !GetVar('logout') && !strstr($_SERVER['SCRIPT_FILENAME'], "install") && !strstr($_SERVER['SCRIPT_FILENAME'], "index")) {
+if (strstr(__FILE__, $adminDir) && !GetVar('logout') && !strstr(__FILE__, "install") && !strstr(__FILE__, "index")) {
 	//echo "testz [".admin_login()."]<br>";
 	
 	if (!admin_login())
Index: trunk/kernel/include/searchitems.php
===================================================================
diff -u -r534 -r563
--- trunk/kernel/include/searchitems.php	(.../searchitems.php)	(revision 534)
+++ trunk/kernel/include/searchitems.php	(.../searchitems.php)	(revision 563)
@@ -516,7 +516,7 @@
           }
         }
         $SelectSQL .= "GROUP BY $idField ";
-        //echo $SelectSQL."<br><br>\n";
+        echo $SelectSQL."<br><br>\n";
         if($InitTable)
         {   
            $this->adodbConnection->Execute("DROP TABLE IF EXISTS ".$this->ResultTable);