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

Clean up other types of cache file path handling

Browse source
This commit is contained in:
Kijin Sung 2018-12-18 16:16:30 +09:00
parent 930ebc97b7
commit 0c337f48cd
5 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/document/document.controller.php
View file

@ -2312,10 +2312,8 @@ class documentController extends document
$xml_body_buff = $this->getXmlTree($tree[0], $tree, $module_info->site_srl, $xml_header_buff); $xml_body_buff = $this->getXmlTree($tree[0], $tree, $module_info->site_srl, $xml_header_buff);
$xml_buff = sprintf( $xml_buff = sprintf(
'<?php '. '<?php '.
'define(\'__XE__\', true); '. 'require_once(\''.FileHandler::getRealPath('./common/autoload.php').'\'); '.
'require_once(\''.FileHandler::getRealPath('./config/config.inc.php').'\'); '. 'Context::init(); '.
'$oContext = &Context::getInstance(); '.
'$oContext->init(); '.
'header("Content-Type: text/xml; charset=UTF-8"); '. 'header("Content-Type: text/xml; charset=UTF-8"); '.
'header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); '. 'header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); '.
'header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); '. 'header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); '.

4
modules/layout/layout.admin.controller.php
View file

@ -186,7 +186,7 @@ class layoutAdminController extends layout
} }
} }
$tmpDir = sprintf('./files/attach/images/%s/tmp', $args->layout_srl); $tmpDir = sprintf('./files/attach/images/%d/tmp', $args->layout_srl);
// Separately handle if a type of extra_vars is an image // Separately handle if a type of extra_vars is an image
if($layout_info->extra_var) if($layout_info->extra_var)
{ {
@ -777,7 +777,7 @@ class layoutAdminController extends layout
if(is_array($image_list)) { if(is_array($image_list)) {
foreach($image_list as $key=>$val) { foreach($image_list as $key=>$val) {
$new_file = sprintf("./files/attach/images/%s/%s", $args->layout_srl,$val->filename); $new_file = sprintf("./files/attach/images/%d/%s", $args->layout_srl,$val->filename);
FileHandler::copyFile($val->old_file, $new_file); FileHandler::copyFile($val->old_file, $new_file);
$extra_vars->{$key} = $new_file; $extra_vars->{$key} = $new_file;
} }

2
modules/layout/layout.view.php
View file

@ -113,7 +113,7 @@ class layoutView extends layout
if($layoutSrl == -1) if($layoutSrl == -1)
{ {
$site_srl = ($oModule) ? $oModule->module_info->site_srl : 0; $site_srl = ($oModule) ? $oModule->module_info->site_srl : 0;
$designInfoFile = sprintf(_XE_PATH_ . 'files/site_design/design_%s.php', $site_srl); $designInfoFile = sprintf(_XE_PATH_ . 'files/site_design/design_%d.php', $site_srl);
include($designInfoFile); include($designInfoFile);
if($skinType == 'M') if($skinType == 'M')

20
modules/menu/menu.admin.controller.php
View file

@ -255,7 +255,7 @@ class menuAdminController extends menu
throw new Rhymix\Framework\Exception('msg_adminmenu_cannot_delete'); throw new Rhymix\Framework\Exception('msg_adminmenu_cannot_delete');
// get menu properies with child menu // get menu properies with child menu
$phpFile = sprintf("./files/cache/menu/%s.php", $menu_srl); $phpFile = sprintf("./files/cache/menu/%d.php", $menu_srl);
$originMenu = NULL; $originMenu = NULL;
if(is_readable(FileHandler::getRealPath($phpFile))) if(is_readable(FileHandler::getRealPath($phpFile)))
@ -366,7 +366,7 @@ class menuAdminController extends menu
} }
} }
// Delete images of menu buttons // Delete images of menu buttons
$image_path = sprintf('./files/attach/menu_button/%s', $menu_srl); $image_path = sprintf('./files/attach/menu_button/%d', $menu_srl);
FileHandler::removeDir($image_path); FileHandler::removeDir($image_path);
$oDB->commit(); $oDB->commit();
@ -873,7 +873,7 @@ class menuAdminController extends menu
if($itemInfo->parent_srl) $parent_srl = $itemInfo->parent_srl; if($itemInfo->parent_srl) $parent_srl = $itemInfo->parent_srl;
// get menu properies with child menu // get menu properies with child menu
$phpFile = sprintf("./files/cache/menu/%s.php", $args->menu_srl); $phpFile = sprintf("./files/cache/menu/%d.php", $args->menu_srl);
$originMenu = NULL; $originMenu = NULL;
if(is_readable(FileHandler::getRealPath($phpFile))) if(is_readable(FileHandler::getRealPath($phpFile)))
@ -1027,7 +1027,7 @@ class menuAdminController extends menu
} }
// get menu properies with child menu // get menu properies with child menu
$phpFile = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $originalItemInfo->menu_srl); $phpFile = sprintf(_XE_PATH_ . "files/cache/menu/%d.php", $originalItemInfo->menu_srl);
$originMenu = NULL; $originMenu = NULL;
if(is_readable(FileHandler::getRealPath($phpFile))) if(is_readable(FileHandler::getRealPath($phpFile)))
@ -1764,8 +1764,8 @@ class menuAdminController extends menu
// Return if there is no information when creating the xml file // Return if there is no information when creating the xml file
if(!$menu_srl) return; if(!$menu_srl) return;
// Specify the name of the cache file // Specify the name of the cache file
$xml_file = sprintf(_XE_PATH_ . "files/cache/menu/%s.xml.php", $menu_srl); $xml_file = sprintf(_XE_PATH_ . "files/cache/menu/%d.xml.php", $menu_srl);
$php_file = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $menu_srl); $php_file = sprintf(_XE_PATH_ . "files/cache/menu/%d.php", $menu_srl);
// Get menu informaton // Get menu informaton
$args = new stdClass(); $args = new stdClass();
$args->menu_srl = $menu_srl; $args->menu_srl = $menu_srl;
@ -1837,10 +1837,8 @@ class menuAdminController extends menu
// Create the xml cache file (a separate session is needed for xml cache) // Create the xml cache file (a separate session is needed for xml cache)
$xml_buff = sprintf( $xml_buff = sprintf(
'<?php '. '<?php '.
'define(\'__XE__\', true); '. 'require_once(\''.FileHandler::getRealPath('./common/autoload.php').'\'); '.
'require_once(\''.FileHandler::getRealPath('./config/config.inc.php').'\'); '. 'Context::init(); '.
'$oContext = Context::getInstance(); '.
'$oContext->init(); '.
'header("Content-Type: text/xml; charset=UTF-8"); '. 'header("Content-Type: text/xml; charset=UTF-8"); '.
'header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); '. 'header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); '.
'header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); '. 'header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); '.
@ -2112,7 +2110,7 @@ class menuAdminController extends menu
); );
// Generate buff data // Generate buff data
$output['buff'] .= sprintf('%s=>array(%s),', $node->menu_item_srl, $attribute); $output['buff'] .= sprintf('%d=>array(%s),', $node->menu_item_srl, $attribute);
$output['name'] .= $name_str; $output['name'] .= $name_str;
} }
return $output; return $output;

12
modules/menu/menu.admin.model.php
View file

@ -83,8 +83,8 @@ class menuAdminModel extends menu
if(!$output->data) return; if(!$output->data) return;
$menu_info = $output->data; $menu_info = $output->data;
$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_srl); $menu_info->xml_file = sprintf('./files/cache/menu/%d.xml.php',$menu_srl);
$menu_info->php_file = sprintf('./files/cache/menu/%s.php',$menu_srl); $menu_info->php_file = sprintf('./files/cache/menu/%d.php',$menu_srl);
return $menu_info; return $menu_info;
} }
@ -112,8 +112,8 @@ class menuAdminModel extends menu
if($menu_info->menu_srl) if($menu_info->menu_srl)
{ {
$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_info->menu_srl); $menu_info->xml_file = sprintf('./files/cache/menu/%d.xml.php',$menu_info->menu_srl);
$menu_info->php_file = sprintf('./files/cache/menu/%s.php',$menu_info->menu_srl); $menu_info->php_file = sprintf('./files/cache/menu/%d.php',$menu_info->menu_srl);
} }
return $menu_info; return $menu_info;
} }
@ -502,7 +502,7 @@ class menuAdminModel extends menu
{ {
$isMenuFixed = false; $isMenuFixed = false;
$output = $this->getMenu($menuSrl); $output = $this->getMenu($menuSrl);
$php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$output->menu_srl); $php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%d.php',$output->menu_srl);
if(file_exists($php_file)) if(file_exists($php_file))
{ {
include($php_file); include($php_file);
@ -554,7 +554,7 @@ class menuAdminModel extends menu
{ {
unset($menu); unset($menu);
unset($menuItems); unset($menuItems);
$value->php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%s.php',$value->menu_srl); $value->php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%d.php',$value->menu_srl);
if(!file_exists($value->php_file)) if(!file_exists($value->php_file))
{ {
$oMenuAdminController->makeXmlFile($value->menu_srl); $oMenuAdminController->makeXmlFile($value->menu_srl);