diff --git a/engine/classes/Router.class.php b/engine/classes/Router.class.php index 0e753258..b44db40e 100644 --- a/engine/classes/Router.class.php +++ b/engine/classes/Router.class.php @@ -98,7 +98,7 @@ class Router extends Object { * @return string */ protected function GetRequestUri() { - $sReq=preg_replace("/\/+/",'/',str_replace(preg_replace("@/*index\.php@U",'',$_SERVER['PHP_SELF']),'',$_SERVER['REQUEST_URI'])); + $sReq=preg_replace("/\/+/",'/',$_SERVER['REQUEST_URI']); $sReq=preg_replace("/^\/(.*)\/?$/U",'\\1',$sReq); $sReq=preg_replace("/^(.*)\/\?.*$/U",'\\1',$sReq); diff --git a/install/index.php b/install/index.php index bf24f1e3..21db1098 100644 --- a/install/index.php +++ b/install/index.php @@ -1524,7 +1524,14 @@ class Install { function SavePath() { $sLocalConfigFile = $this->sConfigDir.'/'.self::LOCAL_CONFIG_FILE_NAME; $this->SaveConfig('path.root.web',$this->GetPathRootWeb(), $sLocalConfigFile); - $this->SaveConfig('path.root.server', $this->GetPathRootServer(), $sLocalConfigFile); + $this->SaveConfig('path.root.server', $this->GetPathRootServer(), $sLocalConfigFile); + + $aDirs=array(); + $sDirs=trim(str_replace('http://'.$_SERVER['HTTP_HOST'],'',$this->GetPathRootWeb()),'/'); + if ($sDirs!='') { + $aDirs=explode('/',$sDirs); + } + $this->SaveConfig('path.offset_request_url', count($aDirs), $sLocalConfigFile); } function GetPathRootWeb() {