From 89aa05db68b9325156c9ad68b372b3601fac784f Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 16 Oct 2005 00:17:19 +0200
Subject: improvement for baseurl detection tests added

darcs-hash:20051015221719-7ad00-efd98fdcf381ae38186578a16159ad2d279cf5af.gz
---
 inc/init.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'inc/init.php')

diff --git a/inc/init.php b/inc/init.php
index 4b01a1240..108ed615c 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -157,14 +157,16 @@ function getBaseURL($abs=false){
 
   if($conf['basedir']){
     $dir = $conf['basedir'].'/';
-  }elseif($_SERVER['SCRIPT_NAME']){
+  }elseif(substr($_SERVER['SCRIPT_NAME'],-4) == '.php'){
     $dir = dirname($_SERVER['SCRIPT_NAME']).'/';
+  }elseif(substr($_SERVER['PHP_SELF'],-4) == '.php'){
+    $dir = dirname($_SERVER['PHP_SELF']).'/';
   }elseif($_SERVER['DOCUMENT_ROOT'] && $_SERVER['SCRIPT_FILENAME']){
     $dir = preg_replace ('/^'.preg_quote($_SERVER['DOCUMENT_ROOT'],'/').'/','',
                          $_SERVER['SCRIPT_FILENAME']);
     $dir = dirname('/'.$dir).'/';
   }else{
-    $dir = dirname($_SERVER['PHP_SELF']).'/';
+    $dir = './'; //probably wrong
   }
 
   $dir = str_replace('\\','/',$dir); #bugfix for weird WIN behaviour
-- 
cgit v1.2.3