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

merge sandbox to trunk for 1.4.4.1

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7743 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-09-30 08:12:09 +00:00
parent b8299c8a65
commit 9139515e57
23 changed files with 93 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1550,7 +1550,7 @@
}
$path = '/'.implode('/', $_path);
if(substr($path,-1)!='/') $path .= '/';
return $path;
}
}

2
classes/mobile/Mobile.class.php
View file

@ -34,7 +34,7 @@ class Mobile {
}
else if($_COOKIE["mobile"]) $this->ismobile = true;
else {
if(preg_match('/(iPod|iPhone|Android|BlackBerry|SCH\-M[0-9]+)/',$_SERVER['HTTP_USER_AGENT']))
if(preg_match('/(iPod|iPhone|Android|BlackBerry|SymbianOS|SCH\-M[0-9]+)/',$_SERVER['HTTP_USER_AGENT']))
{
setcookie("mobile", true);
$this->ismobile = true;

22
classes/template/TemplateHandler.class.php
View file

@ -44,7 +44,7 @@
function init($tpl_path, $tpl_filename, $tpl_file) {
// verify arguments
if(substr($tpl_path,-1)!='/') $tpl_path .= '/';
if(substr($tpl_filename,-5)!='.html') $tpl_filename .= '.html';
if(!file_exists($tpl_path.$tpl_filename)&&file_exists($tpl_path.$tpl_filename.'.html')) $tpl_filename .= '.html';
// create tpl_file variable
if(!$tpl_file) $tpl_file = $tpl_path.$tpl_filename;
@ -131,7 +131,8 @@
exit();
}
return $this->parse();
$this->parse();
return $this->buff;
}
/**
@ -226,7 +227,7 @@
* @param[in] $matches match
* @return changed result
**/
private function _replacePath($matches)
function _replacePath($matches)
{
$path = trim($matches[3]);
@ -400,7 +401,10 @@
**/
function _replaceInclude($matches)
{
if(!preg_match('/target=\"([^\"]+)\"/is',$matches[0], $m)) throw new Exception('"target" attribute missing in "'.htmlspecialchars($matches[0]).'"');
if(!preg_match('/target=\"([^\"]+)\"/is',$matches[0], $m)) {
print '"target" attribute missing in "'.htmlspecialchars($matches[0]);
exit();
}
$target = $m[1];
if(substr($target,0,1)=='/')
@ -513,7 +517,7 @@
/**
* @brief $문자 의 PHP 변수 변환
**/
private function _replaceVarInPHP($buff) {
function _replaceVarInPHP($buff) {
$head = $tail = '';
while(false !== $pos = strpos($buff, '<?php'))
{
@ -521,7 +525,7 @@
$buff = substr($buff,$pos);
$pos = strpos($buff,'?>');
$body = substr($buff,0,$pos+2);
$head .= preg_replace_callback('/(.?)\$([a-z0-9\_\-\[\]\'\"]+)/is',array($this, '_replaceVarString'), $body);
$head .= preg_replace_callback('/(.?)\$(\w+[a-z0-9\_\-\[\]\'\"]+)/is',array($this, '_replaceVarString'), $body);
$buff = substr($buff,$pos+2);
}
@ -532,7 +536,7 @@
/**
* @brief php5의 class::$변수명의 경우 context를 사용하지 않아야 하기에 함수로 대체
**/
private function _replaceVarString($matches)
function _replaceVarString($matches)
{
if($matches[1]==':') return $matches[0];
if(substr($matches[2],0,1)=='_') return $matches[0];
@ -566,7 +570,9 @@
if(substr($arg,0,2)=='./') $arg = substr($arg,2);
// step1: check files in the template directory
$source_filename = sprintf("%s/%s", dirname($this->file), $arg);
//$source_filename = sprintf("%s/%s", dirname($this->file), $arg);
$path = substr($this->path,-1)=='/'?substr($this->path,0,-1):$this->path;
$source_filename = sprintf("%s/%s", $path, $arg);
// step2: check path from root
if(!file_exists($source_filename)) $source_filename = './'.$arg;