fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-29 07:12:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 3645, php5 대응, 함수 대체

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13202 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
khongchi 2013-11-13 01:40:53 +00:00
parent 5fa0bf23d7
commit 5693e340fe
28 changed files with 95 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

8
classes/module/ModuleHandler.class.php
View file

@ -80,7 +80,7 @@ class ModuleHandler extends Handler
exit;
}
if(isset($this->act) && substr($this->act, 0, 4) == 'disp')
if(isset($this->act) && substr_compare($this->act, 'disp', 0, 4) === 0)
{
if(Context::get('_use_ssl') == 'optional' && Context::isExistsSSLAction($this->act) && $_SERVER['HTTPS'] != 'on')
{
@ -349,7 +349,7 @@ class ModuleHandler extends Handler
// get type, kind
$type = $xml_info->action->{$this->act}->type;
$ruleset = $xml_info->action->{$this->act}->ruleset;
$kind = strpos(strtolower($this->act), 'admin') !== FALSE ? 'admin' : '';
$kind = stripos($this->act, 'admin') !== FALSE ? 'admin' : '';
if(!$kind && $this->module == 'admin')
{
$kind = 'admin';
@ -475,7 +475,7 @@ class ModuleHandler extends Handler
if($forward->module && $forward->type && $forward->act && $forward->act == $this->act)
{
$kind = strpos(strtolower($forward->act), 'admin') !== FALSE ? 'admin' : '';
$kind = stripos($forward->act, 'admin') !== FALSE ? 'admin' : '';
$type = $forward->type;
$ruleset = $forward->ruleset;
$tpl_path = $oModule->getTemplatePath();
@ -920,7 +920,7 @@ class ModuleHandler extends Handler
$isLayoutDrop = Context::get('isLayoutDrop');
if($isLayoutDrop)
{
$kind = strpos(strtolower($this->act), 'admin') !== FALSE ? 'admin' : '';
$kind = stripos($this->act, 'admin') !== FALSE ? 'admin' : '';
if($kind == 'admin')
{
$oModule->setLayoutFile('popup_layout');

16
classes/module/ModuleObject.class.php
View file

@ -44,7 +44,7 @@ class ModuleObject extends Object
* */
function setModulePath($path)
{
if(substr($path, -1) != '/')
if(substr_compare($path, '/', -1) !== 0)
{
$path.='/';
}
@ -251,7 +251,7 @@ class ModuleObject extends Object
* */
function setTemplateFile($filename)
{
if(substr($filename, -5) != '.html')
if(substr_compare($filename, '.html', -5) !== 0)
{
$filename .= '.html';
}
@ -274,11 +274,11 @@ class ModuleObject extends Object
* */
function setTemplatePath($path)
{
if(substr($path, 0, 1) != '/' && substr($path, 0, 2) != './')
if(substr_compare($path, '/', 0, 1) !== 0 && substr_compare($path, './', 0, 2) !== 0)
{
$path = './' . $path;
}
if(substr($path, -1) != '/')
if(substr_compare($path, '/', -1) !== 0)
{
$path .= '/';
}
@ -301,7 +301,7 @@ class ModuleObject extends Object
* */
function setEditedLayoutFile($filename)
{
if(substr($filename, -5) != '.html')
if(substr_compare($filename, '.html', -5) !== 0)
{
$filename .= '.html';
}
@ -324,7 +324,7 @@ class ModuleObject extends Object
* */
function setLayoutFile($filename)
{
if(substr($filename, -5) != '.html')
if(substr_compare($filename, '.html', -5) !== 0)
{
$filename .= '.html';
}
@ -346,11 +346,11 @@ class ModuleObject extends Object
* */
function setLayoutPath($path)
{
if(substr($path, 0, 1) != '/' && substr($path, 0, 2) != './')
if(substr_compare($path, '/', 0, 1) !== 0 && substr_compare($path, './', 0, 2) !== 0)
{
$path = './' . $path;
}
if(substr($path, -1) != '/')
if(substr_compare($path, '/', -1) !== 0)
{
$path .= '/';
}