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

fixed opage view

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9105 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2011-09-08 02:37:56 +00:00
parent d287c4ee11
commit f6fb8d2463
10 changed files with 94 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/page/page.view.php
View file

@ -12,7 +12,7 @@
var $page_count = 10;
var $cache_file;
var $interval;
var $opage_path;
var $path;
/**
* @brief Initialization
@ -31,7 +31,7 @@
case 'OUTSIDE' : {
$this->cache_file = sprintf("./files/cache/opage/%d.cache.php", $this->module_info->module_srl);
$this->interval = (int)($this->module_info->page_caching_interval);
$this->opage_path = $this->module_info->opage_path;
$this->path = $this->module_info->path;
break;
}
}
@ -90,9 +90,9 @@
function _getOutsideContent(){
// check if it is http or internal file
if($this->opage_path) {
if(preg_match("/^([a-z]+):\/\//i",$this->opage_path)) $content = $this->getHtmlPage($this->opage_path, $this->interval, $this->cache_file);
else $content = $this->executeFile($this->opage_path, $this->interval, $this->cache_file);
if($this->path) {
if(preg_match("/^([a-z]+):\/\//i",$this->path)) $content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
else $content = $this->executeFile($this->path, $this->interval, $this->cache_file);
}
return $content;
@ -153,7 +153,7 @@
$content = ob_get_clean();
// Replace relative path to the absolute path
$path_info = pathinfo($path);
$this->opage_path = str_replace('\\', '/', realpath($path_info['dirname'])).'/';
$this->path = str_replace('\\', '/', realpath($path_info['dirname'])).'/';
$content = preg_replace_callback('/(target=|src=|href=|url\()("|\')?([^"\'\)]+)("|\'\))?/is',array($this,'_replacePath'),$content);
$content = preg_replace_callback('/(<!--%import\()(\")([^"]+)(\")/is',array($this,'_replacePath'),$content);
@ -185,12 +185,12 @@
return $matches[0];
// In case of .. , get a path
} elseif(preg_match('/^\.\./i',$val)) {
$p = Context::pathToUrl($this->opage_path);
$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 = Context::pathToUrl($this->opage_path);
$p = Context::pathToUrl($this->path);
$path = sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
return $path;