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

Merge duplicate code paths in PageView and PageMobile classes

Browse source 
보안 체크가 한 곳에서 이루어지도록 중복되는 메소드 제거
This commit is contained in:
Kijin Sung 2022-03-15 01:46:47 +09:00
parent 9170d9444c
commit d4a1be1ef0
2 changed files with 27 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

68
modules/page/page.mobile.php
View file

@ -3,74 +3,6 @@
class pageMobile extends pageView class pageMobile extends pageView
{ {
function dispPageIndex()
{
// Variables used in the template Context:: set()
if($this->module_srl) Context::set('module_srl',$this->module_srl);
$page_type_name = strtolower($this->module_info->page_type);
$method = '_get' . ucfirst($page_type_name) . 'Content';
if (method_exists($this, $method))
{
$page_content = $this->{$method}();
}
else
{
throw new Rhymix\Framework\Exception(sprintf('%s method is not exists', $method));
}
Context::set('module_info', $this->module_info);
Context::set('page_content', $page_content);
$this->setTemplatePath($this->module_path . 'tpl');
$this->setTemplateFile('mobile');
}
function _getWidgetContent()
{
// Arrange a widget ryeolro
if($this->module_info->mcontent)
{
if($this->interval>0)
{
if(!file_exists($this->cache_file) || filesize($this->cache_file) < 1)
{
$mtime = 0;
}
else
{
$mtime = filemtime($this->cache_file);
}
if($mtime + $this->interval*60 > $_SERVER['REQUEST_TIME'])
{
$page_content = FileHandler::readFile($this->cache_file);
$page_content = str_replace('<!--#Meta:', '<!--Meta:', $page_content);
}
else
{
$oWidgetController = getController('widget');
$page_content = $oWidgetController->transWidgetCode($this->module_info->mcontent);
FileHandler::writeFile($this->cache_file, $page_content);
}
}
else
{
if(file_exists($this->cache_file))
{
FileHandler::removeFile($this->cache_file);
}
$page_content = $this->module_info->mcontent;
}
}
else
{
$page_content = $this->module_info->content;
}
return $page_content;
}
function _getArticleContent() function _getArticleContent()
{ {
$oTemplate = &TemplateHandler::getInstance(); $oTemplate = &TemplateHandler::getInstance();

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

@ -79,33 +79,51 @@ class pageView extends page
Context::set('page_content', $page_content); Context::set('page_content', $page_content);
$this->setTemplatePath($this->module_path . 'tpl'); $this->setTemplatePath($this->module_path . 'tpl');
$this->setTemplateFile('content'); $this->setTemplateFile($this instanceof pageMobile ? 'mobile' : 'content');
} }
function _getWidgetContent() function _getWidgetContent()
{ {
if($this->interval>0) if ($this instanceof pageMobile)
{ {
if(!file_exists($this->cache_file)) $mtime = 0; $page_content = $this->module_info->mcontent ?: $this->module_info->content;
else $mtime = filemtime($this->cache_file); }
else
{
$page_content = $this->module_info->content;
}
if ($this->interval > 0)
{
if (!file_exists($this->cache_file) || !filesize($this->cache_file))
{
$mtime = 0;
}
else
{
$mtime = filemtime($this->cache_file);
}
if($mtime + $this->interval*60 > $_SERVER['REQUEST_TIME']) if($mtime && $mtime + ($this->interval * 60) > \RX_TIME)
{ {
$page_content = FileHandler::readFile($this->cache_file); $page_content = FileHandler::readFile($this->cache_file);
$page_content = str_replace('<!--#Meta:', '<!--Meta:', $page_content); $page_content = str_replace('<!--#Meta:', '<!--Meta:', $page_content);
} }
else else
{ {
$oWidgetController = getController('widget'); $oWidgetController = WidgetController::getInstance();
$page_content = $oWidgetController->transWidgetCode($this->module_info->content); $page_content = $oWidgetController->transWidgetCode($page_content);
FileHandler::writeFile($this->cache_file, $page_content); FileHandler::writeFile($this->cache_file, $page_content);
} }
} }
else else
{ {
if(file_exists($this->cache_file)) FileHandler::removeFile($this->cache_file); if (file_exists($this->cache_file))
$page_content = $this->module_info->content; {
FileHandler::removeFile($this->cache_file);
}
} }
return $page_content; return $page_content;
} }