Index: trunk/admin/relation_select.php
===================================================================
diff -u -r2569 -r2853
--- trunk/admin/relation_select.php (.../relation_select.php) (revision 2569)
+++ trunk/admin/relation_select.php (.../relation_select.php) (revision 2853)
@@ -48,82 +48,8 @@
$b_header_addon = "
";
-//$pathtoroot="";
-if( !(isset($pathtoroot) && $pathtoroot) )
-{
- $path=dirname(realpath(__FILE__));
- if(strlen($path))
- {
- /* determine the OS type for path parsing */
- $pos = strpos($path,":");
- if ($pos === false)
- {
- $gOS_TYPE="unix";
- $pathchar = "/";
- }
- else
- {
- $gOS_TYPE="win";
- $pathchar="\\";
- }
- $p = $path.$pathchar;
- /*Start looking for the root flag file */
- if( !isset($pathtoroot) ) $pathtoroot = '';
- while(!strlen($pathtoroot) && strlen($p))
- {
- $sub = substr($p,strlen($pathchar)*-1);
- if($sub==$pathchar)
- {
- $filename = $p."root.flg";
- }
- else
- $filename = $p.$pathchar."root.flg";
- if(file_exists($filename))
- {
- $pathtoroot = $p;
- }
- else
- {
- $parent = realpath($p.$pathchar."..".$pathchar);
- if($parent!=$p)
- {
- $p = $parent;
- }
- else
- $p = "";
- }
- }
- if( !(isset($pathtoroot) && $pathtoroot) )
- $pathtoroot = ".".$pathchar;
- }
- else
- {
- $pathtoroot = ".".$pathchar;
- }
-}
+require_once(FULL_PATH.'/kernel/startup.php');
-$sub = substr($pathtoroot,strlen($pathchar)*-1);
-if($sub!=$pathchar)
-{
- $pathtoroot = $pathtoroot.$pathchar;
-}
-//echo $pathtoroot;
-
-require_once($pathtoroot."kernel/startup.php");
-
-$rootURL="http://".ThisDomain().$objConfig->Get("Site_Path");
-
-$admin = $objConfig->Get("AdminDirectory");
-if(!strlen($admin))
- $admin = "admin";
-$localURL=$rootURL."kernel/";
-
-$adminURL = $rootURL.$admin;
-
-$imagesURL = $adminURL."/images";
-$browseURL = $adminURL."/browse";
-$cssURL = $adminURL."/include";
-
$m_var_list_update["cat"] = 0;
$homeURL = $_SERVER["PHP_SELF"]."?env=".BuildEnv();
@@ -139,8 +65,6 @@
else
$upURL = $_SERVER["PHP_SELF"]."?".$envar;
-
-
//admin only util
$pathtolocal = $pathtoroot."kernel/";