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

Convert all instances of _XE_PATH_, __XE_VERSION__, etc. to Rhymix constants

Browse source 
_XE_PATH_ -> RX_BASEDIR
__XE_VERSION__ -> RX_VERSION
This commit is contained in:
Kijin Sung 2020-12-18 15:21:18 +09:00
parent 4fdb51d689
commit b0f66a36c5
43 changed files with 104 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

3
addons/member_extra_info/member_extra_info.addon.php
View file

@ -22,7 +22,8 @@ if($called_position != "before_display_content" || Context::get('act') == 'dispP
return; return;
} }
// Include a file having functions to replace member image name/mark // Include a file having functions to replace member image name/mark
require_once('./addons/member_extra_info/member_extra_info.lib.php'); require_once __DIR__ . '/member_extra_info.lib.php';
// 1. Find a part <div class="member_MemberSerialNumber"> content </div> in the output document, change it to image name/mark by using MemberController::transImageName() // 1. Find a part <div class="member_MemberSerialNumber"> content </div> in the output document, change it to image name/mark by using MemberController::transImageName()
$temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'memberTransImageName', $output); $temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'memberTransImageName', $output);
if($temp_output) if($temp_output)

8
addons/member_extra_info/member_extra_info.lib.php
View file

@ -35,9 +35,9 @@ function memberTransImageName($matches)
$image_name_file = sprintf('files/member_extra_info/image_name/%s%d.gif', getNumberingPath($member_srl), $member_srl); $image_name_file = sprintf('files/member_extra_info/image_name/%s%d.gif', getNumberingPath($member_srl), $member_srl);
$image_mark_file = sprintf('files/member_extra_info/image_mark/%s%d.gif', getNumberingPath($member_srl), $member_srl); $image_mark_file = sprintf('files/member_extra_info/image_mark/%s%d.gif', getNumberingPath($member_srl), $member_srl);
if(file_exists(_XE_PATH_ . $image_name_file)) if(file_exists(RX_BASEDIR . $image_name_file))
{ {
$_tmp->image_name_file = $image_name_file . '?' . date('YmdHis', filemtime(_XE_PATH_ . $image_name_file)); $_tmp->image_name_file = $image_name_file . '?' . date('YmdHis', filemtime(RX_BASEDIR . $image_name_file));
$image_name_file = $_tmp->image_name_file; $image_name_file = $_tmp->image_name_file;
} }
else else
@ -46,9 +46,9 @@ function memberTransImageName($matches)
$image_name_file = ''; $image_name_file = '';
} }
if(file_exists(_XE_PATH_ . $image_mark_file)) if(file_exists(RX_BASEDIR . $image_mark_file))
{ {
$_tmp->image_mark_file = $image_mark_file . '?' . date('YmdHis', filemtime(_XE_PATH_ . $image_mark_file)); $_tmp->image_mark_file = $image_mark_file . '?' . date('YmdHis', filemtime(RX_BASEDIR . $image_mark_file));
$image_mark_file = $_tmp->image_mark_file; $image_mark_file = $_tmp->image_mark_file;
} }
else else

2
addons/point_level_icon/point_level_icon.addon.php
View file

@ -17,7 +17,7 @@ if($called_position != "before_display_content" || Context::get('act') == 'dispP
return; return;
} }
require_once(_XE_PATH_ . 'addons/point_level_icon/point_level_icon.lib.php'); require_once __DIR__ . '/point_level_icon.lib.php';
$temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', function($matches) use($addon_info) { $temp_output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', function($matches) use($addon_info) {
return pointLevelIconTrans($matches, $addon_info); return pointLevelIconTrans($matches, $addon_info);

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

@ -2546,7 +2546,7 @@ class Context
*/ */
public static function pathToUrl($path) public static function pathToUrl($path)
{ {
$xe = _XE_PATH_; $xe = RX_BASEDIR;
$path = strtr($path, "\\", "/"); $path = strtr($path, "\\", "/");
$base_url = preg_replace('@^https?://[^/]+/?@', '', self::getRequestUri()); $base_url = preg_replace('@^https?://[^/]+/?@', '', self::getRequestUri());

2
classes/validator/Validator.class.php
View file

@ -96,7 +96,7 @@ class Validator
)); ));
$this->_has_mb_func = is_callable('mb_strlen'); $this->_has_mb_func = is_callable('mb_strlen');
$this->setCacheDir(_XE_PATH_ . 'files/cache'); $this->setCacheDir(RX_BASEDIR . 'files/cache');
} }
/** /**

1
classes/xml/XmlLangParser.class.php
View file

@ -42,7 +42,6 @@ class XmlLangParser extends XeXmlParser
/** /**
* language type * language type
* @see _XE_PATH_.'/common/lang/lang.info'
* @var string * @var string
*/ */
var $lang_type; var $lang_type;

2
modules/addon/addon.admin.controller.php
View file

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) NAVER <http://www.navercorp.com> */ /* Copyright (C) NAVER <http://www.navercorp.com> */
require_once(_XE_PATH_ . 'modules/addon/addon.controller.php'); require_once(RX_BASEDIR . 'modules/addon/addon.controller.php');
/** /**
* Admin controller class of addon modules * Admin controller class of addon modules

14
modules/admin/admin.admin.controller.php
View file

@ -181,7 +181,7 @@ class adminAdminController extends admin
public function updateDefaultDesignInfo($vars) public function updateDefaultDesignInfo($vars)
{ {
$siteDesignPath = _XE_PATH_ . 'files/site_design/'; $siteDesignPath = RX_BASEDIR . 'files/site_design/';
$vars->module_skin = json_decode($vars->module_skin); $vars->module_skin = json_decode($vars->module_skin);
@ -190,7 +190,7 @@ class adminAdminController extends admin
FileHandler::makeDir($siteDesignPath); FileHandler::makeDir($siteDesignPath);
} }
$siteDesignFile = _XE_PATH_ . 'files/site_design/design_' . $vars->site_srl . '.php'; $siteDesignFile = RX_BASEDIR . 'files/site_design/design_' . $vars->site_srl . '.php';
$layoutTarget = 'layout_srl'; $layoutTarget = 'layout_srl';
$skinTarget = 'skin'; $skinTarget = 'skin';
@ -255,7 +255,7 @@ class adminAdminController extends admin
} }
} }
$siteDesignFile = _XE_PATH_ . 'files/site_design/design_' . $site_srl . '.php'; $siteDesignFile = RX_BASEDIR . 'files/site_design/design_' . $site_srl . '.php';
FileHandler::writeFile($siteDesignFile, implode(PHP_EOL, $buff)); FileHandler::writeFile($siteDesignFile, implode(PHP_EOL, $buff));
} }
@ -324,7 +324,7 @@ class adminAdminController extends admin
{ {
if($favorite->type == 'module') if($favorite->type == 'module')
{ {
$modulePath = _XE_PATH_ . 'modules/' . $favorite->module; $modulePath = RX_BASEDIR . 'modules/' . $favorite->module;
if(!is_dir($modulePath)) if(!is_dir($modulePath))
{ {
$deleteTargets[] = $favorite->admin_favorite_srl; $deleteTargets[] = $favorite->admin_favorite_srl;
@ -396,7 +396,7 @@ class adminAdminController extends admin
$oModuleModel = getModel('module'); $oModuleModel = getModel('module');
$oAdminConfig = $oModuleModel->getModuleConfig('admin'); $oAdminConfig = $oModuleModel->getModuleConfig('admin');
Rhymix\Framework\Storage::delete(_XE_PATH_ . $oAdminConfig->adminLogo); Rhymix\Framework\Storage::delete(RX_BASEDIR . $oAdminConfig->adminLogo);
unset($oAdminConfig->adminLogo); unset($oAdminConfig->adminLogo);
$oModuleController = getController('module'); $oModuleController = getController('module');
@ -460,10 +460,10 @@ class adminAdminController extends admin
} }
$iconname = Context::get('iconname'); $iconname = Context::get('iconname');
$file_exist = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname); $file_exist = FileHandler::readFile(RX_BASEDIR . 'files/attach/xeicon/' . $virtual_site . $iconname);
if($file_exist) if($file_exist)
{ {
@Rhymix\Framework\Storage::delete(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname); @Rhymix\Framework\Storage::delete(RX_BASEDIR . 'files/attach/xeicon/' . $virtual_site . $iconname);
} }
else else
{ {

24
modules/admin/admin.admin.model.php
View file

@ -52,8 +52,8 @@ class adminAdminModel extends admin
FileHandler::writeFile('./files/cache/ftp_check', $pin); FileHandler::writeFile('./files/cache/ftp_check', $pin);
// create path candidate // create path candidate
$xe_path = _XE_PATH_; $xe_path = RX_BASEDIR;
$path_info = array_reverse(explode('/', _XE_PATH_)); $path_info = array_reverse(explode('/', RX_BASEDIR));
array_pop($path_info); // remove last '/' array_pop($path_info); // remove last '/'
$path_candidate = array(); $path_candidate = array();
@ -127,8 +127,8 @@ class adminAdminModel extends admin
FileHandler::writeFile('./files/cache/ftp_check', $pin); FileHandler::writeFile('./files/cache/ftp_check', $pin);
// create path candidate // create path candidate
$xe_path = _XE_PATH_; $xe_path = RX_BASEDIR;
$path_info = array_reverse(explode('/', _XE_PATH_)); $path_info = array_reverse(explode('/', RX_BASEDIR));
array_pop($path_info); // remove last '/' array_pop($path_info); // remove last '/'
$path_candidate = array(); $path_candidate = array();
@ -175,7 +175,7 @@ class adminAdminModel extends admin
*/ */
function getAdminFTPPath() function getAdminFTPPath()
{ {
Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang'); Context::loadLang(RX_BASEDIR . 'modules/autoinstall/lang');
@set_time_limit(5); @set_time_limit(5);
$ftp_info = Context::getRequestVars(); $ftp_info = Context::getRequestVars();
@ -229,8 +229,8 @@ class adminAdminModel extends admin
FileHandler::writeFile('./files/cache/ftp_check', $pin); FileHandler::writeFile('./files/cache/ftp_check', $pin);
// create path candidate // create path candidate
$xe_path = _XE_PATH_; $xe_path = RX_BASEDIR;
$path_info = array_reverse(explode('/', _XE_PATH_)); $path_info = array_reverse(explode('/', RX_BASEDIR));
array_pop($path_info); // remove last '/' array_pop($path_info); // remove last '/'
$path_candidate = array(); $path_candidate = array();
@ -319,7 +319,7 @@ class adminAdminModel extends admin
*/ */
function getAdminFTPList() function getAdminFTPList()
{ {
Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang'); Context::loadLang(RX_BASEDIR . 'modules/autoinstall/lang');
@set_time_limit(5); @set_time_limit(5);
$ftp_info = Context::getRequestVars(); $ftp_info = Context::getRequestVars();
@ -391,7 +391,7 @@ class adminAdminModel extends admin
*/ */
function getThemeList() function getThemeList()
{ {
$path = _XE_PATH_ . 'themes'; $path = RX_BASEDIR . 'themes';
$list = FileHandler::readDir($path); $list = FileHandler::readDir($path);
$theme_info = array(); $theme_info = array();
@ -419,7 +419,7 @@ class adminAdminModel extends admin
return $GLOBALS['__ThemeInfo__'][$theme_name]; return $GLOBALS['__ThemeInfo__'][$theme_name];
} }
$info_file = _XE_PATH_ . 'themes/' . $theme_name . '/conf/info.xml'; $info_file = RX_BASEDIR . 'themes/' . $theme_name . '/conf/info.xml';
if(!file_exists($info_file)) if(!file_exists($info_file))
{ {
return; return;
@ -599,7 +599,7 @@ class adminAdminModel extends admin
$oModuleModel = getModel('module'); $oModuleModel = getModel('module');
foreach($searched_list as $val) foreach($searched_list as $val)
{ {
$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/' . $val); $skin_list = $oModuleModel->getSkins(RX_BASEDIR . 'modules/' . $val);
if(is_array($skin_list) && count($skin_list) > 0 && !in_array($val, $exceptionModule)) if(is_array($skin_list) && count($skin_list) > 0 && !in_array($val, $exceptionModule))
{ {
@ -769,7 +769,7 @@ class adminAdminModel extends admin
foreach($list as $k => $v) foreach($list as $k => $v)
{ {
if(!is_dir(_XE_PATH_ . 'modules/' . $v->module)) if(!is_dir(RX_BASEDIR . 'modules/' . $v->module))
{ {
unset($list[$k]); unset($list[$k]);
} }

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

@ -213,7 +213,7 @@ class adminAdminView extends admin
// move from index method, because use in admin footer // move from index method, because use in admin footer
/* /*
$newest_news_url = sprintf("http://news.xpressengine.com/%s/news.php?version=%s&package=%s", _XE_LOCATION_, __XE_VERSION__, _XE_PACKAGE_); $newest_news_url = sprintf("http://news.xpressengine.com/%s/news.php?version=%s&package=%s", _XE_LOCATION_, __XE_VERSION__, _XE_PACKAGE_);
$cache_file = sprintf("%sfiles/cache/newest_news.%s.cache.php", _XE_PATH_, _XE_LOCATION_); $cache_file = sprintf("%sfiles/cache/newest_news.%s.cache.php", RX_BASEDIR, _XE_LOCATION_);
if(!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < $_SERVER['REQUEST_TIME']) if(!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < $_SERVER['REQUEST_TIME'])
{ {
// Considering if data cannot be retrieved due to network problem, modify filemtime to prevent trying to reload again when refreshing administration page // Considering if data cannot be retrieved due to network problem, modify filemtime to prevent trying to reload again when refreshing administration page

4
modules/admin/tpl/config_ftp.html
View file

@ -48,9 +48,9 @@
<div class="x_control-group"> <div class="x_control-group">
<label class="x_control-label" for="ftp_path">{$lang->msg_ftp_installed_ftp_realpath}</label> <label class="x_control-label" for="ftp_path">{$lang->msg_ftp_installed_ftp_realpath}</label>
<div class="x_controls"> <div class="x_controls">
<input type="text" name="ftp_path" id="ftp_path" style="min-width:90%" value="{$ftp_info['path'] ?: _XE_PATH_}" /> <input type="text" name="ftp_path" id="ftp_path" style="min-width:90%" value="{$ftp_info['path'] ?: \RX_BASEDIR}" />
<br /> <br />
<p class="x_help-block">{$lang->msg_ftp_autodetected_ftp_realpath} : {_XE_PATH_}</p> <p class="x_help-block">{$lang->msg_ftp_autodetected_ftp_realpath} : {\RX_BASEDIR}</p>
</div> </div>
</div> </div>
<div class="x_control-group"> <div class="x_control-group">

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

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) NAVER <http://www.navercorp.com> */ /* Copyright (C) NAVER <http://www.navercorp.com> */
require_once(_XE_PATH_ . 'modules/autoinstall/autoinstall.lib.php'); require_once(RX_BASEDIR . 'modules/autoinstall/autoinstall.lib.php');
/** /**
* autoinstall module admin controller class * autoinstall module admin controller class
@ -110,7 +110,7 @@ class autoinstallAdminController extends autoinstall
$type = $oModel->getTypeFromPath($package->path); $type = $oModel->getTypeFromPath($package->path);
if($type == "core") if($type == "core")
{ {
$version = __XE_VERSION__; $version = \RX_VERSION;
} }
else else
{ {

2
modules/comment/comment.admin.controller.php
View file

@ -288,7 +288,7 @@ class commentAdminController extends comment
*/ */
function _moveCommentToTrash($commentSrlList, &$oCommentController, &$oDB, $message_content = NULL) function _moveCommentToTrash($commentSrlList, &$oCommentController, &$oDB, $message_content = NULL)
{ {
require_once(_XE_PATH_ . 'modules/trash/model/TrashVO.php'); require_once(RX_BASEDIR . 'modules/trash/model/TrashVO.php');
if(is_array($commentSrlList)) if(is_array($commentSrlList))
{ {

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

@ -1216,7 +1216,7 @@ class documentController extends document
}*/ }*/
// new trash module // new trash module
require_once(_XE_PATH_.'modules/trash/model/TrashVO.php'); require_once(RX_BASEDIR.'modules/trash/model/TrashVO.php');
$oTrashVO = new TrashVO(); $oTrashVO = new TrashVO();
$oTrashVO->setTrashSrl(getNextSequence()); $oTrashVO->setTrashSrl(getNextSequence());
$oTrashVO->setTitle($oDocument->variables['title']); $oTrashVO->setTitle($oDocument->variables['title']);

2
modules/document/document.model.php
View file

@ -695,7 +695,7 @@ class documentModel extends document
{ {
// Category of the target module file swollen // Category of the target module file swollen
$module_srl = intval($module_srl); $module_srl = intval($module_srl);
$filename = sprintf("%sfiles/cache/document_category/%d.php", _XE_PATH_, $module_srl); $filename = sprintf("%sfiles/cache/document_category/%d.php", RX_BASEDIR, $module_srl);
// If the target file to the cache file regeneration category // If the target file to the cache file regeneration category
if(!file_exists($filename)) if(!file_exists($filename))
{ {

4
modules/editor/components/poll_maker/poll_maker.class.php
View file

@ -27,7 +27,7 @@ class poll_maker extends EditorHandler
{ {
// Wanted Skins survey // Wanted Skins survey
$oModuleModel = getModel('module'); $oModuleModel = getModel('module');
$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'widgets/pollWidget/'); $skin_list = $oModuleModel->getSkins(RX_BASEDIR . 'widgets/pollWidget/');
Context::set('skin_list', $skin_list); Context::set('skin_list', $skin_list);
// Pre-compiled source code to compile template return to // Pre-compiled source code to compile template return to
$tpl_path = $this->component_path.'tpl'; $tpl_path = $this->component_path.'tpl';
@ -58,7 +58,7 @@ class poll_maker extends EditorHandler
$args->style = sprintf('width:%dpx', $width); $args->style = sprintf('width:%dpx', $width);
// Set a path of the template skin (values of skin, colorset settings) // Set a path of the template skin (values of skin, colorset settings)
$tpl_path = sprintf('%sskins/%s', _XE_PATH_ . 'widgets/pollWidget/', $args->skin); $tpl_path = sprintf('%sskins/%s', RX_BASEDIR . 'widgets/pollWidget/', $args->skin);
$tpl_file = 'pollview'; $tpl_file = 'pollview';
// Get the information related to the survey // Get the information related to the survey

2
modules/importer/importer.admin.controller.php
View file

@ -303,7 +303,7 @@ class importerAdminController extends importer
$columnList = array('module_srl', 'module'); $columnList = array('module_srl', 'module');
$target_module_info = $oModuleModel->getModuleInfoByModuleSrl($target_module, $columnList); $target_module_info = $oModuleModel->getModuleInfoByModuleSrl($target_module, $columnList);
$ttimporter = FileHandler::exists(_XE_PATH_ . 'modules/importer/ttimport.class.php'); $ttimporter = FileHandler::exists(RX_BASEDIR . 'modules/importer/ttimport.class.php');
if($ttimporter) require_once($ttimporter); if($ttimporter) require_once($ttimporter);
$oTT = new ttimport(); $oTT = new ttimport();

2
modules/install/install.controller.php
View file

@ -238,7 +238,7 @@ class installController extends install
} }
// Execute the install script. // Execute the install script.
$scripts = FileHandler::readDir(_XE_PATH_ . 'modules/install/script', '/(\.php)$/'); $scripts = FileHandler::readDir(RX_BASEDIR . 'modules/install/script', '/(\.php)$/');
if(count($scripts)) if(count($scripts))
{ {
sort($scripts); sort($scripts);

4
modules/install/install.view.php
View file

@ -74,7 +74,7 @@ class installView extends install
{ {
// Create a temporary file for mod_rewrite check. // Create a temporary file for mod_rewrite check.
self::$rewriteCheckString = Rhymix\Framework\Security::getRandom(32); self::$rewriteCheckString = Rhymix\Framework\Security::getRandom(32);
FileHandler::writeFile(_XE_PATH_ . self::$rewriteCheckFilePath, self::$rewriteCheckString);; FileHandler::writeFile(RX_BASEDIR . self::$rewriteCheckFilePath, self::$rewriteCheckString);;
// Check if the web server is nginx. // Check if the web server is nginx.
Context::set('use_nginx', stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false); Context::set('use_nginx', stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false);
@ -93,7 +93,7 @@ class installView extends install
} }
// Delete mod_rewrite check file // Delete mod_rewrite check file
FileHandler::removeFile(_XE_PATH_ . self::$rewriteCheckFilePath); FileHandler::removeFile(RX_BASEDIR . self::$rewriteCheckFilePath);
// Save mod_rewrite check status. // Save mod_rewrite check status.
if(Context::get('rewrite') === 'Y') if(Context::get('rewrite') === 'Y')

8
modules/install/script/ko.install.php
View file

@ -214,7 +214,7 @@ $output = $oLayoutAdminController->updateLayout($args);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
$siteDesignPath = _XE_PATH_.'files/site_design/'; $siteDesignPath = RX_BASEDIR.'files/site_design/';
FileHandler::makeDir($siteDesignPath); FileHandler::makeDir($siteDesignPath);
@ -268,10 +268,10 @@ $obj->nick_name = htmlspecialchars_decode($logged_info->nick_name);
$obj->email_address = $logged_info->email_address; $obj->email_address = $logged_info->email_address;
$obj->module_srl = $module_srl; $obj->module_srl = $module_srl;
Context::set('version', __XE_VERSION__); Context::set('version', RX_VERSION);
$obj->title = 'Welcome to Rhymix'; $obj->title = 'Welcome to Rhymix';
$obj->content = $oTemplateHandler->compile(_XE_PATH_ . 'modules/install/script/welcome_content', 'welcome_content'); $obj->content = $oTemplateHandler->compile(RX_BASEDIR . 'modules/install/script/welcome_content', 'welcome_content');
$output = $oDocumentController->insertDocument($obj, true); $output = $oDocumentController->insertDocument($obj, true);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
@ -307,7 +307,7 @@ for($i = 1; $i <=4; $i++)
{ {
unset($obj->document_srl); unset($obj->document_srl);
$obj->title = "XEIcon ({$i})"; $obj->title = "XEIcon ({$i})";
$obj->content = $oTemplateHandler->compile(_XE_PATH_ . 'modules/install/script/xeicon_content', 'xeicon_content_ko_' . $i); $obj->content = $oTemplateHandler->compile(RX_BASEDIR . 'modules/install/script/xeicon_content', 'xeicon_content_ko_' . $i);
$output = $oDocumentController->insertDocument($obj, true); $output = $oDocumentController->insertDocument($obj, true);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;

2
modules/install/tpl/ftp.html
View file

@ -34,7 +34,7 @@
</div> </div>
</div> </div>
<p class="install_help">{$lang->msg_ftp_installed_realpath}: {_XE_PATH_}</p> <p class="install_help">{$lang->msg_ftp_installed_realpath}: {\RX_BASEDIR}</p>
<p> <p>
<button type="button" class="x_btn x_btn-small" id="task-ftp-list" onclick="getFTPList();return false;">{$lang->ftp_get_list}</button> <button type="button" class="x_btn x_btn-small" id="task-ftp-list" onclick="getFTPList();return false;">{$lang->ftp_get_list}</button>
<button type="button" class="x_btn x_btn-small x_btn-inverse" id="task-ftp-check" onclick="doCheckFTPInfo();return false">{$lang->cmd_check_ftp_connect}</button> <button type="button" class="x_btn x_btn-small x_btn-inverse" id="task-ftp-check" onclick="doCheckFTPInfo();return false">{$lang->cmd_check_ftp_connect}</button>

2
modules/install/tpl/header.html
View file

@ -4,5 +4,5 @@
<div class="x"|cond="$lang_type == 'ko'" class="x enfont"|cond="$lang_type != 'ko'"> <div class="x"|cond="$lang_type == 'ko'" class="x enfont"|cond="$lang_type != 'ko'">
<div id="header"> <div id="header">
<h1><img src="../../../common/img/logo.svg" alt="Rhymix" /></h1> <h1><img src="../../../common/img/logo.svg" alt="Rhymix" /></h1>
<h2>Version <strong>{__XE_VERSION__}</strong> Installation</h2> <h2>Version <strong>{\RX_VERSION}</strong> Installation</h2>
</div> </div>

5
modules/krzip/tpl/template.daumapi.html
View file

@ -1,9 +1,8 @@
<!--// 다음 우편번호 API --> <!--// 다음 우편번호 API -->
<!--// HEADER --> <!--// HEADER -->
{@$is_https = strtoupper(parse_url($current_url, 0)) == 'HTTPS'}
<load target="./css/default.css" /> <load target="./css/default.css" />
<load target="http://dmaps.daum.net/map_js_init/postcode.v2.js" cond="!$is_https" /> <load target="http://dmaps.daum.net/map_js_init/postcode.v2.js" cond="!\RX_SSL" />
<load target="https://spi.maps.daum.net/imap/map_js_init/postcode.v2.js" cond="$is_https" /> <load target="https://spi.maps.daum.net/imap/map_js_init/postcode.v2.js" cond="\RX_SSL" />
<load target="./js/daumapi.js" /> <load target="./js/daumapi.js" />
<!--// BODY --> <!--// BODY -->

2
modules/layout/layout.admin.model.php
View file

@ -181,7 +181,7 @@ class layoutAdminModel extends layout
public function getSiteDefaultLayout($viewType = 'P', $siteSrl = 0) public function getSiteDefaultLayout($viewType = 'P', $siteSrl = 0)
{ {
$target = ($viewType == 'M') ? 'mlayout_srl' : 'layout_srl'; $target = ($viewType == 'M') ? 'mlayout_srl' : 'layout_srl';
$designInfoFile = sprintf(_XE_PATH_ . 'files/site_design/design_%s.php', $siteSrl); $designInfoFile = sprintf(RX_BASEDIR . 'files/site_design/design_%s.php', $siteSrl);
if(FileHandler::exists($designInfoFile)) include($designInfoFile); if(FileHandler::exists($designInfoFile)) include($designInfoFile);
if(!$designInfo || !$designInfo->{$target}) if(!$designInfo || !$designInfo->{$target})

12
modules/layout/layout.model.php
View file

@ -239,13 +239,13 @@ class layoutModel extends layout
//TODO If remove a support themes, remove this codes also. //TODO If remove a support themes, remove this codes also.
if($layoutType == 'P') if($layoutType == 'P')
{ {
$pathPrefix = _XE_PATH_ . 'layouts/'; $pathPrefix = RX_BASEDIR . 'layouts/';
$themePathFormat = _XE_PATH_ . 'themes/%s/layouts/%s'; $themePathFormat = RX_BASEDIR . 'themes/%s/layouts/%s';
} }
else else
{ {
$pathPrefix = _XE_PATH_ . 'm.layouts/'; $pathPrefix = RX_BASEDIR . 'm.layouts/';
$themePathFormat = _XE_PATH_ . 'themes/%s/m.layouts/%s'; $themePathFormat = RX_BASEDIR . 'themes/%s/m.layouts/%s';
} }
if(strpos($layout, '|@|') !== FALSE) if(strpos($layout, '|@|') !== FALSE)
@ -932,11 +932,11 @@ class layoutModel extends layout
{ {
if($layout_type=='P') if($layout_type=='P')
{ {
return sprintf("%sfiles/cache/layout/%s.%s.cache.php", _XE_PATH_, $layout_name,$lang_type); return sprintf("%sfiles/cache/layout/%s.%s.cache.php", RX_BASEDIR, $layout_name,$lang_type);
} }
else else
{ {
return sprintf("%sfiles/cache/layout/m.%s.%s.cache.php", _XE_PATH_, $layout_name,$lang_type); return sprintf("%sfiles/cache/layout/m.%s.%s.cache.php", RX_BASEDIR, $layout_name,$lang_type);
} }
} }

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

@ -87,12 +87,12 @@ class layoutView extends layout
if ($skinType == 'M') if ($skinType == 'M')
{ {
$templatePath = _XE_PATH_ . 'modules/page/m.skins/' . $skin; $templatePath = RX_BASEDIR . 'modules/page/m.skins/' . $skin;
$templateFile = 'mobile'; $templateFile = 'mobile';
} }
else else
{ {
$templatePath = _XE_PATH_ . 'modules/page/skins/' . $skin; $templatePath = RX_BASEDIR . 'modules/page/skins/' . $skin;
$templateFile = 'content'; $templateFile = 'content';
} }
@ -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_%d.php', $site_srl); $designInfoFile = sprintf(RX_BASEDIR . 'files/site_design/design_%d.php', $site_srl);
include($designInfoFile); include($designInfoFile);
if($skinType == 'M') if($skinType == 'M')
@ -305,7 +305,7 @@ class layoutView extends layout
} }
// get module html // get module html
require_once(_XE_PATH_ . "classes/display/HTMLDisplayHandler.php"); require_once(RX_BASEDIR . "classes/display/HTMLDisplayHandler.php");
$handler = new HTMLDisplayHandler(); $handler = new HTMLDisplayHandler();
return $handler->toDoc($oModule); return $handler->toDoc($oModule);
} }
@ -362,7 +362,7 @@ class layoutView extends layout
Context::set('layout_info', $layout_info); Context::set('layout_info', $layout_info);
Context::set('content', lang('layout_preview_content')); Context::set('content', lang('layout_preview_content'));
// Temporary save the codes // Temporary save the codes
$edited_layout_file = _XE_PATH_ . 'files/cache/layout/tmp.tpl'; $edited_layout_file = RX_BASEDIR . 'files/cache/layout/tmp.tpl';
FileHandler::writeFile($edited_layout_file, $code); FileHandler::writeFile($edited_layout_file, $code);
// Compile // Compile

4
modules/member/member.class.php
View file

@ -503,8 +503,8 @@ class member extends ModuleObject {
if(is_readable('./files/member_extra_info/agreement.txt')) if(is_readable('./files/member_extra_info/agreement.txt'))
{ {
$source_file = _XE_PATH_.'files/member_extra_info/agreement.txt'; $source_file = RX_BASEDIR.'files/member_extra_info/agreement.txt';
$target_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt'; $target_file = RX_BASEDIR.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
FileHandler::rename($source_file, $target_file); FileHandler::rename($source_file, $target_file);
} }

8
modules/member/member.controller.php
View file

@ -1420,7 +1420,7 @@ class memberController extends member
$max_height = $config->profile_image_max_height; $max_height = $config->profile_image_max_height;
$max_filesize = $config->profile_image_max_filesize; $max_filesize = $config->profile_image_max_filesize;
Context::loadLang(_XE_PATH_ . 'modules/file/lang'); Context::loadLang(RX_BASEDIR . 'modules/file/lang');
// Get file information // Get file information
FileHandler::clearStatCache($target_file); FileHandler::clearStatCache($target_file);
@ -1526,7 +1526,7 @@ class memberController extends member
$max_height = $config->image_name_max_height; $max_height = $config->image_name_max_height;
$max_filesize = $config->image_name_max_filesize; $max_filesize = $config->image_name_max_filesize;
Context::loadLang(_XE_PATH_ . 'modules/file/lang'); Context::loadLang(RX_BASEDIR . 'modules/file/lang');
// Get a target path to save // Get a target path to save
$target_path = sprintf('files/member_extra_info/image_name/%s/', getNumberingPath($member_srl)); $target_path = sprintf('files/member_extra_info/image_name/%s/', getNumberingPath($member_srl));
@ -1670,7 +1670,7 @@ class memberController extends member
$max_height = $config->image_mark_max_height; $max_height = $config->image_mark_max_height;
$max_filesize = $config->image_mark_max_filesize; $max_filesize = $config->image_mark_max_filesize;
Context::loadLang(_XE_PATH_ . 'modules/file/lang'); Context::loadLang(RX_BASEDIR . 'modules/file/lang');
$target_path = sprintf('files/member_extra_info/image_mark/%s/', getNumberingPath($member_srl)); $target_path = sprintf('files/member_extra_info/image_mark/%s/', getNumberingPath($member_srl));
FileHandler::makeDir($target_path); FileHandler::makeDir($target_path);
@ -2164,7 +2164,7 @@ class memberController extends member
$output = $oModuleController->insertModuleConfig('member',$args); $output = $oModuleController->insertModuleConfig('member',$args);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
$agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt'; $agreement_file = RX_BASEDIR.'files/member_extra_info/agreement.txt';
FileHandler::writeFile($agreement_file, $agreement); FileHandler::writeFile($agreement_file, $agreement);
return new BaseObject(); return new BaseObject();

6
modules/member/member.model.php
View file

@ -102,13 +102,13 @@ class memberModel extends member
*/ */
protected static function _getAgreement() protected static function _getAgreement()
{ {
$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt'; $agreement_file = RX_BASEDIR.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
if(is_readable($agreement_file)) if(is_readable($agreement_file))
{ {
return FileHandler::readFile($agreement_file); return FileHandler::readFile($agreement_file);
} }
$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . config('locale.default_lang') . '.txt'; $agreement_file = RX_BASEDIR.'files/member_extra_info/agreement_' . config('locale.default_lang') . '.txt';
if(is_readable($agreement_file)) if(is_readable($agreement_file))
{ {
return FileHandler::readFile($agreement_file); return FileHandler::readFile($agreement_file);
@ -117,7 +117,7 @@ class memberModel extends member
$lang_selected = Context::loadLangSelected(); $lang_selected = Context::loadLangSelected();
foreach($lang_selected as $key => $val) foreach($lang_selected as $key => $val)
{ {
$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . $key . '.txt'; $agreement_file = RX_BASEDIR.'files/member_extra_info/agreement_' . $key . '.txt';
if(is_readable($agreement_file)) if(is_readable($agreement_file))
{ {
return FileHandler::readFile($agreement_file); return FileHandler::readFile($agreement_file);

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

@ -56,7 +56,7 @@ class menuAdminController extends menu
} }
function __construct() { function __construct() {
$this->homeMenuCacheFile = _XE_PATH_ . $this->homeMenuCacheFile; $this->homeMenuCacheFile = RX_BASEDIR . $this->homeMenuCacheFile;
parent::__construct(); parent::__construct();
} }
@ -1028,7 +1028,7 @@ class menuAdminController extends menu
} }
// get menu properies with child menu // get menu properies with child menu
$phpFile = sprintf(_XE_PATH_ . "files/cache/menu/%d.php", $originalItemInfo->menu_srl); $phpFile = sprintf(RX_BASEDIR . "files/cache/menu/%d.php", $originalItemInfo->menu_srl);
$originMenu = NULL; $originMenu = NULL;
if(is_readable(FileHandler::getRealPath($phpFile))) if(is_readable(FileHandler::getRealPath($phpFile)))
@ -1127,7 +1127,7 @@ class menuAdminController extends menu
$menuSrl = $itemInfo->menu_srl; $menuSrl = $itemInfo->menu_srl;
// get menu properies with child menu // get menu properies with child menu
$phpFile = sprintf(_XE_PATH_ . "files/cache/menu/%s.php", $menuSrl); $phpFile = sprintf(RX_BASEDIR . "files/cache/menu/%s.php", $menuSrl);
$originMenu = NULL; $originMenu = NULL;
if(is_readable(FileHandler::getRealPath($phpFile))) if(is_readable(FileHandler::getRealPath($phpFile)))
@ -1765,8 +1765,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/%d.xml.php", $menu_srl); $xml_file = sprintf(RX_BASEDIR . "files/cache/menu/%d.xml.php", $menu_srl);
$php_file = sprintf(_XE_PATH_ . "files/cache/menu/%d.php", $menu_srl); $php_file = sprintf(RX_BASEDIR . "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;

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

@ -476,7 +476,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/%d.php',$output->menu_srl); $php_file = sprintf(RX_BASEDIR . 'files/cache/menu/%d.php',$output->menu_srl);
if(file_exists($php_file)) if(file_exists($php_file))
{ {
include($php_file); include($php_file);
@ -528,7 +528,7 @@ class menuAdminModel extends menu
{ {
unset($menu); unset($menu);
unset($menuItems); unset($menuItems);
$value->php_file = sprintf(_XE_PATH_ . 'files/cache/menu/%d.php',$value->menu_srl); $value->php_file = sprintf(RX_BASEDIR . '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);

8
modules/menu/menu.admin.view.php
View file

@ -28,9 +28,9 @@ class menuAdminView extends menu
*/ */
function dispMenuAdminSiteMap() function dispMenuAdminSiteMap()
{ {
Context::loadLang(_XE_PATH_.'modules/document/lang/'); Context::loadLang(RX_BASEDIR.'modules/document/lang/');
Context::loadLang(_XE_PATH_.'modules/layout/lang/'); Context::loadLang(RX_BASEDIR.'modules/layout/lang/');
Context::loadLang(_XE_PATH_.'modules/autoinstall/lang/'); Context::loadLang(RX_BASEDIR.'modules/autoinstall/lang/');
$site_srl = Context::get('site_srl'); $site_srl = Context::get('site_srl');
$site_module_info = Context::get('site_module_info'); $site_module_info = Context::get('site_module_info');
@ -58,7 +58,7 @@ class menuAdminView extends menu
Context::set('layout_list', $layoutList); Context::set('layout_list', $layoutList);
// choice theme file // choice theme file
$theme_file = _XE_PATH_.'files/theme/theme_info.php'; $theme_file = RX_BASEDIR.'files/theme/theme_info.php';
if(is_readable($theme_file)) if(is_readable($theme_file))
{ {
include($theme_file); include($theme_file);

2
modules/module/module.admin.controller.php
View file

@ -404,7 +404,7 @@ class moduleAdminController extends module
} }
// Get skin information (to check extra_vars) // Get skin information (to check extra_vars)
$module_path = _XE_PATH_ . 'modules/'.$module_info->module; $module_path = RX_BASEDIR . 'modules/'.$module_info->module;
if($mode === 'M') if($mode === 'M')
{ {

8
modules/module/module.admin.model.php
View file

@ -531,7 +531,7 @@ class moduleAdminModel extends module
function getModuleAdminMultilingualHtml() function getModuleAdminMultilingualHtml()
{ {
$oTemplate = TemplateHandler::getInstance(); $oTemplate = TemplateHandler::getInstance();
$tpl = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl', 'multilingual_v17.html'); $tpl = $oTemplate->compile(RX_BASEDIR . 'modules/module/tpl', 'multilingual_v17.html');
$this->add('html', $tpl); $this->add('html', $tpl);
} }
@ -570,7 +570,7 @@ class moduleAdminModel extends module
$oSecurity->encodeHTML('lang_code_list..'); $oSecurity->encodeHTML('lang_code_list..');
$oTemplate = TemplateHandler::getInstance(); $oTemplate = TemplateHandler::getInstance();
$tpl = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl', 'multilingual_v17_list.html'); $tpl = $oTemplate->compile(RX_BASEDIR . 'modules/module/tpl', 'multilingual_v17_list.html');
$this->add('html', $tpl); $this->add('html', $tpl);
} }
@ -580,9 +580,9 @@ class moduleAdminModel extends module
*/ */
function getModuleAdminModuleSearcherHtml() function getModuleAdminModuleSearcherHtml()
{ {
Context::loadLang(_XE_PATH_ . 'modules/admin/lang'); Context::loadLang(RX_BASEDIR . 'modules/admin/lang');
$oTemplate = TemplateHandler::getInstance(); $oTemplate = TemplateHandler::getInstance();
$tpl = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl', 'module_searcher_v17.html'); $tpl = $oTemplate->compile(RX_BASEDIR . 'modules/module/tpl', 'module_searcher_v17.html');
$this->add('html', $tpl); $this->add('html', $tpl);
} }

2
modules/module/module.admin.view.php
View file

@ -171,7 +171,7 @@ class moduleAdminView extends module
$columnList = array('module_srl', 'module'); $columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0], $columnList); $module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0], $columnList);
// Get a skin list of the module // Get a skin list of the module
$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/'.$module_info->module); $skin_list = $oModuleModel->getSkins(RX_BASEDIR . 'modules/'.$module_info->module);
Context::set('skin_list',$skin_list); Context::set('skin_list',$skin_list);
// Get a layout list // Get a layout list
$oLayoutModel = getModel('layout'); $oLayoutModel = getModel('layout');

6
modules/module/module.model.php
View file

@ -34,7 +34,7 @@ class moduleModel extends module
return true; return true;
} }
$dirs = array_map('strtolower', FileHandler::readDir(_XE_PATH_)); $dirs = array_map('strtolower', FileHandler::readDir(RX_BASEDIR));
$dirs[] = 'rss'; $dirs[] = 'rss';
$dirs[] = 'atom'; $dirs[] = 'atom';
$dirs[] = 'api'; $dirs[] = 'api';
@ -1754,7 +1754,7 @@ class moduleModel extends module
$target = ($skin_type == 'M') ? 'mskin' : 'skin'; $target = ($skin_type == 'M') ? 'mskin' : 'skin';
$site_srl = 0; $site_srl = 0;
$designInfoFile = sprintf(_XE_PATH_.'files/site_design/design_%s.php', $site_srl); $designInfoFile = sprintf(RX_BASEDIR.'files/site_design/design_%s.php', $site_srl);
if(is_readable($designInfoFile)) if(is_readable($designInfoFile))
{ {
include($designInfoFile); include($designInfoFile);
@ -2251,7 +2251,7 @@ class moduleModel extends module
$security->encodeHTML('filebox_list..comment', 'filebox_list..attributes.'); $security->encodeHTML('filebox_list..comment', 'filebox_list..attributes.');
$oTemplate = &TemplateHandler::getInstance(); $oTemplate = &TemplateHandler::getInstance();
$html = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl/', 'filebox_list_html'); $html = $oTemplate->compile(RX_BASEDIR . 'modules/module/tpl/', 'filebox_list_html');
$this->add('html', $html); $this->add('html', $html);
} }

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

@ -269,7 +269,7 @@ class pageAdminController extends page
if($module_info->page_type == 'WIDGET') if($module_info->page_type == 'WIDGET')
{ {
$path = _XE_PATH_ . 'files/cache/page/'; $path = RX_BASEDIR . 'files/cache/page/';
$cache_files = FileHandler::readDir($path, '/^' . $module_info->module_srl . '\./'); $cache_files = FileHandler::readDir($path, '/^' . $module_info->module_srl . '\./');
foreach($cache_files as $file_name) foreach($cache_files as $file_name)
{ {
@ -278,7 +278,7 @@ class pageAdminController extends page
} }
else if($module_info->page_type == 'OUTSIDE') else if($module_info->page_type == 'OUTSIDE')
{ {
$path = _XE_PATH_ . 'files/cache/page/'; $path = RX_BASEDIR . 'files/cache/page/';
$cache_files = FileHandler::readDir($path, '/^' . $module_info->module_srl . './'); $cache_files = FileHandler::readDir($path, '/^' . $module_info->module_srl . './');
foreach($cache_files as $file_name) foreach($cache_files as $file_name)
{ {

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

@ -9,7 +9,7 @@ class pageMobile extends pageView
{ {
case 'WIDGET' : case 'WIDGET' :
{ {
$this->cache_file = sprintf("%sfiles/cache/page/%d.%s.%s.m.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType(), Context::getSslStatus()); $this->cache_file = sprintf("%sfiles/cache/page/%d.%s.%s.m.cache.php", RX_BASEDIR, $this->module_info->module_srl, Context::getLangType(), Context::getSslStatus());
$this->interval = (int)($this->module_info->page_caching_interval); $this->interval = (int)($this->module_info->page_caching_interval);
break; break;
} }
@ -51,7 +51,7 @@ class pageMobile extends pageView
// Arrange a widget ryeolro // Arrange a widget ryeolro
if($this->module_info->mcontent) if($this->module_info->mcontent)
{ {
$cache_file = sprintf("%sfiles/cache/page/%d.%s.m.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType()); $cache_file = sprintf("%sfiles/cache/page/%d.%s.m.cache.php", RX_BASEDIR, $this->module_info->module_srl, Context::getLangType());
$interval = (int)($this->module_info->page_caching_interval); $interval = (int)($this->module_info->page_caching_interval);
if($interval>0) if($interval>0)
{ {

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

@ -23,13 +23,13 @@ class pageView extends page
{ {
case 'WIDGET' : case 'WIDGET' :
{ {
$this->cache_file = sprintf("%sfiles/cache/page/%d.%s.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType(), Context::getSslStatus()); $this->cache_file = sprintf("%sfiles/cache/page/%d.%s.%s.cache.php", RX_BASEDIR, $this->module_info->module_srl, Context::getLangType(), Context::getSslStatus());
$this->interval = (int)($this->module_info->page_caching_interval ?? 0); $this->interval = (int)($this->module_info->page_caching_interval ?? 0);
break; break;
} }
case 'OUTSIDE' : case 'OUTSIDE' :
{ {
$this->cache_file = sprintf("%sfiles/cache/opage/%d.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getSslStatus()); $this->cache_file = sprintf("%sfiles/cache/opage/%d.%s.cache.php", RX_BASEDIR, $this->module_info->module_srl, Context::getSslStatus());
$this->interval = (int)($this->module_info->page_caching_interval ?? 0); $this->interval = (int)($this->module_info->page_caching_interval ?? 0);
$this->path = $this->module_info->path; $this->path = $this->module_info->path;
break; break;

4
modules/poll/poll.controller.php
View file

@ -347,7 +347,7 @@ class pollController extends poll
$oDB->commit(); $oDB->commit();
//$skin = Context::get('skin'); //$skin = Context::get('skin');
//if(!$skin || !is_dir(_XE_PATH_ . 'modules/poll/skins/'.$skin)) $skin = 'default'; //if(!$skin || !is_dir(RX_BASEDIR . 'modules/poll/skins/'.$skin)) $skin = 'default';
// Get tpl // Get tpl
//$tpl = $oPollModel->getPollHtml($poll_srl, '', $skin); //$tpl = $oPollModel->getPollHtml($poll_srl, '', $skin);
@ -368,7 +368,7 @@ class pollController extends poll
$poll_srl = Context::get('poll_srl'); $poll_srl = Context::get('poll_srl');
$skin = Context::get('skin'); $skin = Context::get('skin');
if(!$skin || !is_dir(_XE_PATH_ . 'modules/poll/skins/'.$skin)) $skin = 'default'; if(!$skin || !is_dir(RX_BASEDIR . 'modules/poll/skins/'.$skin)) $skin = 'default';
$oPollModel = getModel('poll'); $oPollModel = getModel('poll');
$tpl = $oPollModel->getPollResultHtml($poll_srl, $skin); $tpl = $oPollModel->getPollResultHtml($poll_srl, $skin);

2
modules/trash/trash.class.php
View file

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) NAVER <http://www.navercorp.com> */ /* Copyright (C) NAVER <http://www.navercorp.com> */
require_once(_XE_PATH_.'modules/trash/model/TrashVO.php'); require_once(RX_BASEDIR.'modules/trash/model/TrashVO.php');
/** /**
* trash class * trash class

2
modules/widget/widget.controller.php
View file

@ -466,7 +466,7 @@ class widgetController extends widget
$widget_content = ''; $widget_content = '';
if($widget != 'widgetContent' && $widget != 'widgetBox') if($widget != 'widgetContent' && $widget != 'widgetBox')
{ {
if(!is_dir(sprintf(_XE_PATH_.'widgets/%s/',$widget))) return; if(!is_dir(sprintf(RX_BASEDIR.'widgets/%s/',$widget))) return;
// Hold the contents of the widget parameter // Hold the contents of the widget parameter
$widget_content = $this->getCache($widget, $args); $widget_content = $this->getCache($widget, $args);
} }

4
modules/widget/widget.model.php
View file

@ -129,7 +129,7 @@ class widgetModel extends widget
$xml_file = sprintf("%sconf/info.xml", $widget_path); $xml_file = sprintf("%sconf/info.xml", $widget_path);
if(!file_exists($xml_file)) return; if(!file_exists($xml_file)) return;
// If the problem by comparing the cache file and include the return variable $widget_info // If the problem by comparing the cache file and include the return variable $widget_info
$cache_file = sprintf(_XE_PATH_ . 'files/cache/widget/%s.%s.cache.php', $widget, Context::getLangType()); $cache_file = sprintf(RX_BASEDIR . 'files/cache/widget/%s.%s.cache.php', $widget, Context::getLangType());
if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file)) if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file))
{ {
@ -279,7 +279,7 @@ class widgetModel extends widget
$xml_file = sprintf("%sskin.xml", $widgetStyle_path); $xml_file = sprintf("%sskin.xml", $widgetStyle_path);
if(!file_exists($xml_file)) return; if(!file_exists($xml_file)) return;
// If the problem by comparing the cache file and include the return variable $widgetStyle_info // If the problem by comparing the cache file and include the return variable $widgetStyle_info
$cache_file = sprintf(_XE_PATH_ . 'files/cache/widgetstyles/%s.%s.cache.php', $widgetStyle, Context::getLangType()); $cache_file = sprintf(RX_BASEDIR . 'files/cache/widgetstyles/%s.%s.cache.php', $widgetStyle, Context::getLangType());
if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file)) if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file))
{ {