fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 03:01:43 +09:00
Code Issues Projects Releases Packages Wiki Activity

#18781581

Browse source 
BUG FIX : XE를 도메인 루트가 아닌 곳에 설치했을 때 외부 페이지에서 사용된 파일의 경로를 올바르게 변경하지 못하던 버그 수정


git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7354 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
taggon 2010-03-19 04:49:18 +00:00
parent 050e5a7c8c
commit 9e91ec5639
2 changed files with 39 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

35
classes/context/Context.class.php
View file

@ -1520,5 +1520,40 @@
$oContext = &Context::getInstance();
return $oContext->allow_rewrite;
}
/**
* @brief 로컬 경로를 웹 경로로 변경
*/
function pathToUrl($path) {
$xe = _XE_PATH_;
$path = strtr($path, "\\", "/");
$base_url = preg_replace('@^https?://[^/]+/+@', '', Context::getDefaultUrl());
$_xe = explode('/', $xe);
$_path = explode('/', $path);
$_base = explode('/', $base_url);
if (!$_base[count($_base)-1]) array_pop($_base);
foreach($_xe as $idx=>$dir) {
if($_path[0] != $dir) break;
array_shift($_path);
}
$idx = count($_xe) - $idx - 1;
while($idx--) {
if (count($_base)) array_shift($_base);
else array_unshift($_base, '..');
}
if (count($_base)) {
array_unshift($_path, implode('/', $_base));
}
$path = '/'.implode('/', $_path);
return $path;
}
}
?>

8
modules/opage/opage.view.php
View file

@ -37,7 +37,6 @@
else $content = $this->executeFile($path, $caching_interval, $cache_file);
}
Context::set('opage_content', $content);
// 결과 출력 템플릿 지정
@ -145,13 +144,14 @@
if(preg_match('@^((?:http|https|ftp|telnet|mms)://|(?:mailto|javascript):|[/#{])@i',$val)) return $matches[0];
// .. 와 같은 경우 대상 경로를 구함
elseif(preg_match('/^(\.\.)/i',$val)) {
$p = '/'.str_replace(_XE_PATH_,'',$this->path);
elseif(preg_match('/^\.\./i',$val)) {
$p = Context::pathToUrl($this->path);
return sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
}
if(substr($val,0,2)=='./') $val = substr($val,2);
$p = '/'.str_replace(_XE_PATH_,'',$this->path);
//$p = '/'.str_replace(_XE_PATH_,'',$this->path);
$p = Context::pathToUrl($this->path);
return sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
}