From b0f66a36c55e60acdcf6831f41c85529de34355e Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Fri, 18 Dec 2020 15:21:18 +0900 Subject: [PATCH] Convert all instances of _XE_PATH_, __XE_VERSION__, etc. to Rhymix constants _XE_PATH_ -> RX_BASEDIR __XE_VERSION__ -> RX_VERSION --- .../member_extra_info.addon.php | 3 ++- .../member_extra_info.lib.php | 8 +++---- .../point_level_icon.addon.php | 2 +- classes/context/Context.class.php | 2 +- classes/validator/Validator.class.php | 2 +- classes/xml/XmlLangParser.class.php | 1 - modules/addon/addon.admin.controller.php | 2 +- modules/admin/admin.admin.controller.php | 14 +++++------ modules/admin/admin.admin.model.php | 24 +++++++++---------- modules/admin/admin.admin.view.php | 2 +- modules/admin/tpl/config_ftp.html | 4 ++-- .../autoinstall.admin.controller.php | 4 ++-- modules/comment/comment.admin.controller.php | 2 +- modules/document/document.controller.php | 2 +- modules/document/document.model.php | 2 +- .../poll_maker/poll_maker.class.php | 4 ++-- .../importer/importer.admin.controller.php | 2 +- modules/install/install.controller.php | 2 +- modules/install/install.view.php | 4 ++-- modules/install/script/ko.install.php | 8 +++---- modules/install/tpl/ftp.html | 2 +- modules/install/tpl/header.html | 2 +- modules/krzip/tpl/template.daumapi.html | 5 ++-- modules/layout/layout.admin.model.php | 2 +- modules/layout/layout.model.php | 12 +++++----- modules/layout/layout.view.php | 10 ++++---- modules/member/member.class.php | 4 ++-- modules/member/member.controller.php | 8 +++---- modules/member/member.model.php | 6 ++--- modules/menu/menu.admin.controller.php | 10 ++++---- modules/menu/menu.admin.model.php | 4 ++-- modules/menu/menu.admin.view.php | 8 +++---- modules/module/module.admin.controller.php | 2 +- modules/module/module.admin.model.php | 8 +++---- modules/module/module.admin.view.php | 2 +- modules/module/module.model.php | 6 ++--- modules/page/page.admin.controller.php | 4 ++-- modules/page/page.mobile.php | 4 ++-- modules/page/page.view.php | 4 ++-- modules/poll/poll.controller.php | 4 ++-- modules/trash/trash.class.php | 2 +- modules/widget/widget.controller.php | 2 +- modules/widget/widget.model.php | 4 ++-- 43 files changed, 104 insertions(+), 105 deletions(-) diff --git a/addons/member_extra_info/member_extra_info.addon.php b/addons/member_extra_info/member_extra_info.addon.php index 57fbc4fe8..1d8d89e37 100644 --- a/addons/member_extra_info/member_extra_info.addon.php +++ b/addons/member_extra_info/member_extra_info.addon.php @@ -22,7 +22,8 @@ if($called_position != "before_display_content" || Context::get('act') == 'dispP return; } // 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
content
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); if($temp_output) diff --git a/addons/member_extra_info/member_extra_info.lib.php b/addons/member_extra_info/member_extra_info.lib.php index 6aa7d0bee..38fbe3a7f 100644 --- a/addons/member_extra_info/member_extra_info.lib.php +++ b/addons/member_extra_info/member_extra_info.lib.php @@ -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_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; } else @@ -46,9 +46,9 @@ function memberTransImageName($matches) $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; } else diff --git a/addons/point_level_icon/point_level_icon.addon.php b/addons/point_level_icon/point_level_icon.addon.php index fd3b2919e..0543da966 100644 --- a/addons/point_level_icon/point_level_icon.addon.php +++ b/addons/point_level_icon/point_level_icon.addon.php @@ -17,7 +17,7 @@ if($called_position != "before_display_content" || Context::get('act') == 'dispP 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) { return pointLevelIconTrans($matches, $addon_info); diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index a7791b05c..ec8497e8c 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -2546,7 +2546,7 @@ class Context */ public static function pathToUrl($path) { - $xe = _XE_PATH_; + $xe = RX_BASEDIR; $path = strtr($path, "\\", "/"); $base_url = preg_replace('@^https?://[^/]+/?@', '', self::getRequestUri()); diff --git a/classes/validator/Validator.class.php b/classes/validator/Validator.class.php index 07c51c0e5..3fcf131c0 100644 --- a/classes/validator/Validator.class.php +++ b/classes/validator/Validator.class.php @@ -96,7 +96,7 @@ class Validator )); $this->_has_mb_func = is_callable('mb_strlen'); - $this->setCacheDir(_XE_PATH_ . 'files/cache'); + $this->setCacheDir(RX_BASEDIR . 'files/cache'); } /** diff --git a/classes/xml/XmlLangParser.class.php b/classes/xml/XmlLangParser.class.php index 3911bd8bb..9a0dc11f9 100644 --- a/classes/xml/XmlLangParser.class.php +++ b/classes/xml/XmlLangParser.class.php @@ -42,7 +42,6 @@ class XmlLangParser extends XeXmlParser /** * language type - * @see _XE_PATH_.'/common/lang/lang.info' * @var string */ var $lang_type; diff --git a/modules/addon/addon.admin.controller.php b/modules/addon/addon.admin.controller.php index fad8a8ba0..b612a040b 100644 --- a/modules/addon/addon.admin.controller.php +++ b/modules/addon/addon.admin.controller.php @@ -1,7 +1,7 @@ */ -require_once(_XE_PATH_ . 'modules/addon/addon.controller.php'); +require_once(RX_BASEDIR . 'modules/addon/addon.controller.php'); /** * Admin controller class of addon modules diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index 9d2ee9c9e..c88167b7f 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -181,7 +181,7 @@ class adminAdminController extends admin public function updateDefaultDesignInfo($vars) { - $siteDesignPath = _XE_PATH_ . 'files/site_design/'; + $siteDesignPath = RX_BASEDIR . 'files/site_design/'; $vars->module_skin = json_decode($vars->module_skin); @@ -190,7 +190,7 @@ class adminAdminController extends admin 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'; $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)); } @@ -324,7 +324,7 @@ class adminAdminController extends admin { if($favorite->type == 'module') { - $modulePath = _XE_PATH_ . 'modules/' . $favorite->module; + $modulePath = RX_BASEDIR . 'modules/' . $favorite->module; if(!is_dir($modulePath)) { $deleteTargets[] = $favorite->admin_favorite_srl; @@ -396,7 +396,7 @@ class adminAdminController extends admin $oModuleModel = getModel('module'); $oAdminConfig = $oModuleModel->getModuleConfig('admin'); - Rhymix\Framework\Storage::delete(_XE_PATH_ . $oAdminConfig->adminLogo); + Rhymix\Framework\Storage::delete(RX_BASEDIR . $oAdminConfig->adminLogo); unset($oAdminConfig->adminLogo); $oModuleController = getController('module'); @@ -460,10 +460,10 @@ class adminAdminController extends admin } $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) { - @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 { diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index bcec0b365..34ee2f4ee 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -52,8 +52,8 @@ class adminAdminModel extends admin FileHandler::writeFile('./files/cache/ftp_check', $pin); // create path candidate - $xe_path = _XE_PATH_; - $path_info = array_reverse(explode('/', _XE_PATH_)); + $xe_path = RX_BASEDIR; + $path_info = array_reverse(explode('/', RX_BASEDIR)); array_pop($path_info); // remove last '/' $path_candidate = array(); @@ -127,8 +127,8 @@ class adminAdminModel extends admin FileHandler::writeFile('./files/cache/ftp_check', $pin); // create path candidate - $xe_path = _XE_PATH_; - $path_info = array_reverse(explode('/', _XE_PATH_)); + $xe_path = RX_BASEDIR; + $path_info = array_reverse(explode('/', RX_BASEDIR)); array_pop($path_info); // remove last '/' $path_candidate = array(); @@ -175,7 +175,7 @@ class adminAdminModel extends admin */ function getAdminFTPPath() { - Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang'); + Context::loadLang(RX_BASEDIR . 'modules/autoinstall/lang'); @set_time_limit(5); $ftp_info = Context::getRequestVars(); @@ -229,8 +229,8 @@ class adminAdminModel extends admin FileHandler::writeFile('./files/cache/ftp_check', $pin); // create path candidate - $xe_path = _XE_PATH_; - $path_info = array_reverse(explode('/', _XE_PATH_)); + $xe_path = RX_BASEDIR; + $path_info = array_reverse(explode('/', RX_BASEDIR)); array_pop($path_info); // remove last '/' $path_candidate = array(); @@ -319,7 +319,7 @@ class adminAdminModel extends admin */ function getAdminFTPList() { - Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang'); + Context::loadLang(RX_BASEDIR . 'modules/autoinstall/lang'); @set_time_limit(5); $ftp_info = Context::getRequestVars(); @@ -391,7 +391,7 @@ class adminAdminModel extends admin */ function getThemeList() { - $path = _XE_PATH_ . 'themes'; + $path = RX_BASEDIR . 'themes'; $list = FileHandler::readDir($path); $theme_info = array(); @@ -419,7 +419,7 @@ class adminAdminModel extends admin 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)) { return; @@ -599,7 +599,7 @@ class adminAdminModel extends admin $oModuleModel = getModel('module'); 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)) { @@ -769,7 +769,7 @@ class adminAdminModel extends admin foreach($list as $k => $v) { - if(!is_dir(_XE_PATH_ . 'modules/' . $v->module)) + if(!is_dir(RX_BASEDIR . 'modules/' . $v->module)) { unset($list[$k]); } diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 80a7476fd..a372b7c86 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -213,7 +213,7 @@ class adminAdminView extends admin // 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_); - $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']) { // Considering if data cannot be retrieved due to network problem, modify filemtime to prevent trying to reload again when refreshing administration page diff --git a/modules/admin/tpl/config_ftp.html b/modules/admin/tpl/config_ftp.html index 6f13b96dc..d1e678082 100644 --- a/modules/admin/tpl/config_ftp.html +++ b/modules/admin/tpl/config_ftp.html @@ -48,9 +48,9 @@
- +
-

{$lang->msg_ftp_autodetected_ftp_realpath} : {_XE_PATH_}

+

{$lang->msg_ftp_autodetected_ftp_realpath} : {\RX_BASEDIR}

diff --git a/modules/autoinstall/autoinstall.admin.controller.php b/modules/autoinstall/autoinstall.admin.controller.php index 4c3ae535b..c147e0157 100644 --- a/modules/autoinstall/autoinstall.admin.controller.php +++ b/modules/autoinstall/autoinstall.admin.controller.php @@ -1,7 +1,7 @@ */ -require_once(_XE_PATH_ . 'modules/autoinstall/autoinstall.lib.php'); +require_once(RX_BASEDIR . 'modules/autoinstall/autoinstall.lib.php'); /** * autoinstall module admin controller class @@ -110,7 +110,7 @@ class autoinstallAdminController extends autoinstall $type = $oModel->getTypeFromPath($package->path); if($type == "core") { - $version = __XE_VERSION__; + $version = \RX_VERSION; } else { diff --git a/modules/comment/comment.admin.controller.php b/modules/comment/comment.admin.controller.php index bcf17286e..94e3c3fd7 100644 --- a/modules/comment/comment.admin.controller.php +++ b/modules/comment/comment.admin.controller.php @@ -288,7 +288,7 @@ class commentAdminController extends comment */ 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)) { diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index e60547681..7caa3946d 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -1216,7 +1216,7 @@ class documentController extends document }*/ // 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->setTrashSrl(getNextSequence()); $oTrashVO->setTitle($oDocument->variables['title']); diff --git a/modules/document/document.model.php b/modules/document/document.model.php index ab8fd1d88..b396cdc0a 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -695,7 +695,7 @@ class documentModel extends document { // Category of the target module file swollen $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(!file_exists($filename)) { diff --git a/modules/editor/components/poll_maker/poll_maker.class.php b/modules/editor/components/poll_maker/poll_maker.class.php index f86f60cc4..033237bb0 100644 --- a/modules/editor/components/poll_maker/poll_maker.class.php +++ b/modules/editor/components/poll_maker/poll_maker.class.php @@ -27,7 +27,7 @@ class poll_maker extends EditorHandler { // Wanted Skins survey $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); // Pre-compiled source code to compile template return to $tpl_path = $this->component_path.'tpl'; @@ -58,7 +58,7 @@ class poll_maker extends EditorHandler $args->style = sprintf('width:%dpx', $width); // 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'; // Get the information related to the survey diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php index 4c38b84f9..9628186d9 100644 --- a/modules/importer/importer.admin.controller.php +++ b/modules/importer/importer.admin.controller.php @@ -303,7 +303,7 @@ class importerAdminController extends importer $columnList = array('module_srl', 'module'); $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); $oTT = new ttimport(); diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 2ff9245e7..33db6a00d 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -238,7 +238,7 @@ class installController extends install } // 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)) { sort($scripts); diff --git a/modules/install/install.view.php b/modules/install/install.view.php index 854cff8f4..dd2c43849 100644 --- a/modules/install/install.view.php +++ b/modules/install/install.view.php @@ -74,7 +74,7 @@ class installView extends install { // Create a temporary file for mod_rewrite check. 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. Context::set('use_nginx', stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false); @@ -93,7 +93,7 @@ class installView extends install } // Delete mod_rewrite check file - FileHandler::removeFile(_XE_PATH_ . self::$rewriteCheckFilePath); + FileHandler::removeFile(RX_BASEDIR . self::$rewriteCheckFilePath); // Save mod_rewrite check status. if(Context::get('rewrite') === 'Y') diff --git a/modules/install/script/ko.install.php b/modules/install/script/ko.install.php index 3e2484f9f..dc58628c1 100644 --- a/modules/install/script/ko.install.php +++ b/modules/install/script/ko.install.php @@ -214,7 +214,7 @@ $output = $oLayoutAdminController->updateLayout($args); if(!$output->toBool()) return $output; -$siteDesignPath = _XE_PATH_.'files/site_design/'; +$siteDesignPath = RX_BASEDIR.'files/site_design/'; FileHandler::makeDir($siteDesignPath); @@ -268,10 +268,10 @@ $obj->nick_name = htmlspecialchars_decode($logged_info->nick_name); $obj->email_address = $logged_info->email_address; $obj->module_srl = $module_srl; -Context::set('version', __XE_VERSION__); +Context::set('version', RX_VERSION); $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); if(!$output->toBool()) return $output; @@ -307,7 +307,7 @@ for($i = 1; $i <=4; $i++) { unset($obj->document_srl); $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); if(!$output->toBool()) return $output; diff --git a/modules/install/tpl/ftp.html b/modules/install/tpl/ftp.html index e5bfe8d61..a7fc0e6ac 100644 --- a/modules/install/tpl/ftp.html +++ b/modules/install/tpl/ftp.html @@ -34,7 +34,7 @@
-

{$lang->msg_ftp_installed_realpath}: {_XE_PATH_}

+

{$lang->msg_ftp_installed_realpath}: {\RX_BASEDIR}

diff --git a/modules/install/tpl/header.html b/modules/install/tpl/header.html index 3eca82454..2067af5b0 100644 --- a/modules/install/tpl/header.html +++ b/modules/install/tpl/header.html @@ -4,5 +4,5 @@

diff --git a/modules/krzip/tpl/template.daumapi.html b/modules/krzip/tpl/template.daumapi.html index 85ba9fe42..5af635cd9 100644 --- a/modules/krzip/tpl/template.daumapi.html +++ b/modules/krzip/tpl/template.daumapi.html @@ -1,9 +1,8 @@ -{@$is_https = strtoupper(parse_url($current_url, 0)) == 'HTTPS'} - - + + diff --git a/modules/layout/layout.admin.model.php b/modules/layout/layout.admin.model.php index 004879a12..506b81c6c 100644 --- a/modules/layout/layout.admin.model.php +++ b/modules/layout/layout.admin.model.php @@ -181,7 +181,7 @@ class layoutAdminModel extends layout public function getSiteDefaultLayout($viewType = 'P', $siteSrl = 0) { $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(!$designInfo || !$designInfo->{$target}) diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php index 6694a3c03..8a157509a 100644 --- a/modules/layout/layout.model.php +++ b/modules/layout/layout.model.php @@ -239,13 +239,13 @@ class layoutModel extends layout //TODO If remove a support themes, remove this codes also. if($layoutType == 'P') { - $pathPrefix = _XE_PATH_ . 'layouts/'; - $themePathFormat = _XE_PATH_ . 'themes/%s/layouts/%s'; + $pathPrefix = RX_BASEDIR . 'layouts/'; + $themePathFormat = RX_BASEDIR . 'themes/%s/layouts/%s'; } else { - $pathPrefix = _XE_PATH_ . 'm.layouts/'; - $themePathFormat = _XE_PATH_ . 'themes/%s/m.layouts/%s'; + $pathPrefix = RX_BASEDIR . 'm.layouts/'; + $themePathFormat = RX_BASEDIR . 'themes/%s/m.layouts/%s'; } if(strpos($layout, '|@|') !== FALSE) @@ -932,11 +932,11 @@ class layoutModel extends layout { 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 { - 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); } } diff --git a/modules/layout/layout.view.php b/modules/layout/layout.view.php index b1f24d962..698267a79 100644 --- a/modules/layout/layout.view.php +++ b/modules/layout/layout.view.php @@ -87,12 +87,12 @@ class layoutView extends layout if ($skinType == 'M') { - $templatePath = _XE_PATH_ . 'modules/page/m.skins/' . $skin; + $templatePath = RX_BASEDIR . 'modules/page/m.skins/' . $skin; $templateFile = 'mobile'; } else { - $templatePath = _XE_PATH_ . 'modules/page/skins/' . $skin; + $templatePath = RX_BASEDIR . 'modules/page/skins/' . $skin; $templateFile = 'content'; } @@ -113,7 +113,7 @@ class layoutView extends layout if($layoutSrl == -1) { $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); if($skinType == 'M') @@ -305,7 +305,7 @@ class layoutView extends layout } // get module html - require_once(_XE_PATH_ . "classes/display/HTMLDisplayHandler.php"); + require_once(RX_BASEDIR . "classes/display/HTMLDisplayHandler.php"); $handler = new HTMLDisplayHandler(); return $handler->toDoc($oModule); } @@ -362,7 +362,7 @@ class layoutView extends layout Context::set('layout_info', $layout_info); Context::set('content', lang('layout_preview_content')); // 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); // Compile diff --git a/modules/member/member.class.php b/modules/member/member.class.php index 9a2654c15..34bfc8925 100644 --- a/modules/member/member.class.php +++ b/modules/member/member.class.php @@ -503,8 +503,8 @@ class member extends ModuleObject { if(is_readable('./files/member_extra_info/agreement.txt')) { - $source_file = _XE_PATH_.'files/member_extra_info/agreement.txt'; - $target_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt'; + $source_file = RX_BASEDIR.'files/member_extra_info/agreement.txt'; + $target_file = RX_BASEDIR.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt'; FileHandler::rename($source_file, $target_file); } diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index c21cc73a3..dff0dfffb 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1420,7 +1420,7 @@ class memberController extends member $max_height = $config->profile_image_max_height; $max_filesize = $config->profile_image_max_filesize; - Context::loadLang(_XE_PATH_ . 'modules/file/lang'); + Context::loadLang(RX_BASEDIR . 'modules/file/lang'); // Get file information FileHandler::clearStatCache($target_file); @@ -1526,7 +1526,7 @@ class memberController extends member $max_height = $config->image_name_max_height; $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 $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_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)); FileHandler::makeDir($target_path); @@ -2164,7 +2164,7 @@ class memberController extends member $output = $oModuleController->insertModuleConfig('member',$args); 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); return new BaseObject(); diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 968b62967..1651a515c 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -102,13 +102,13 @@ class memberModel extends member */ 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)) { 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)) { return FileHandler::readFile($agreement_file); @@ -117,7 +117,7 @@ class memberModel extends member $lang_selected = Context::loadLangSelected(); 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)) { return FileHandler::readFile($agreement_file); diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index a9deac318..94f74d239 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -56,7 +56,7 @@ class menuAdminController extends menu } function __construct() { - $this->homeMenuCacheFile = _XE_PATH_ . $this->homeMenuCacheFile; + $this->homeMenuCacheFile = RX_BASEDIR . $this->homeMenuCacheFile; parent::__construct(); } @@ -1028,7 +1028,7 @@ class menuAdminController extends 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; if(is_readable(FileHandler::getRealPath($phpFile))) @@ -1127,7 +1127,7 @@ class menuAdminController extends menu $menuSrl = $itemInfo->menu_srl; // 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; 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 if(!$menu_srl) return; // Specify the name of the cache file - $xml_file = sprintf(_XE_PATH_ . "files/cache/menu/%d.xml.php", $menu_srl); - $php_file = sprintf(_XE_PATH_ . "files/cache/menu/%d.php", $menu_srl); + $xml_file = sprintf(RX_BASEDIR . "files/cache/menu/%d.xml.php", $menu_srl); + $php_file = sprintf(RX_BASEDIR . "files/cache/menu/%d.php", $menu_srl); // Get menu informaton $args = new stdClass(); $args->menu_srl = $menu_srl; diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php index d1e4410a2..6cb324709 100644 --- a/modules/menu/menu.admin.model.php +++ b/modules/menu/menu.admin.model.php @@ -476,7 +476,7 @@ class menuAdminModel extends menu { $isMenuFixed = false; $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)) { include($php_file); @@ -528,7 +528,7 @@ class menuAdminModel extends menu { unset($menu); 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)) { $oMenuAdminController->makeXmlFile($value->menu_srl); diff --git a/modules/menu/menu.admin.view.php b/modules/menu/menu.admin.view.php index 7ef0d9ea0..cf14289af 100644 --- a/modules/menu/menu.admin.view.php +++ b/modules/menu/menu.admin.view.php @@ -28,9 +28,9 @@ class menuAdminView extends menu */ function dispMenuAdminSiteMap() { - Context::loadLang(_XE_PATH_.'modules/document/lang/'); - Context::loadLang(_XE_PATH_.'modules/layout/lang/'); - Context::loadLang(_XE_PATH_.'modules/autoinstall/lang/'); + Context::loadLang(RX_BASEDIR.'modules/document/lang/'); + Context::loadLang(RX_BASEDIR.'modules/layout/lang/'); + Context::loadLang(RX_BASEDIR.'modules/autoinstall/lang/'); $site_srl = Context::get('site_srl'); $site_module_info = Context::get('site_module_info'); @@ -58,7 +58,7 @@ class menuAdminView extends menu Context::set('layout_list', $layoutList); // 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)) { include($theme_file); diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index 325d72c8c..36544a6e9 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -404,7 +404,7 @@ class moduleAdminController extends module } // 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') { diff --git a/modules/module/module.admin.model.php b/modules/module/module.admin.model.php index 2f8a11c23..fe91cb1a1 100644 --- a/modules/module/module.admin.model.php +++ b/modules/module/module.admin.model.php @@ -531,7 +531,7 @@ class moduleAdminModel extends module function getModuleAdminMultilingualHtml() { $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); } @@ -570,7 +570,7 @@ class moduleAdminModel extends module $oSecurity->encodeHTML('lang_code_list..'); $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); } @@ -580,9 +580,9 @@ class moduleAdminModel extends module */ function getModuleAdminModuleSearcherHtml() { - Context::loadLang(_XE_PATH_ . 'modules/admin/lang'); + Context::loadLang(RX_BASEDIR . 'modules/admin/lang'); $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); } diff --git a/modules/module/module.admin.view.php b/modules/module/module.admin.view.php index 8a910749c..414ed87c1 100644 --- a/modules/module/module.admin.view.php +++ b/modules/module/module.admin.view.php @@ -171,7 +171,7 @@ class moduleAdminView extends module $columnList = array('module_srl', 'module'); $module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0], $columnList); // 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); // Get a layout list $oLayoutModel = getModel('layout'); diff --git a/modules/module/module.model.php b/modules/module/module.model.php index b26d45085..86fc819cd 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -34,7 +34,7 @@ class moduleModel extends module return true; } - $dirs = array_map('strtolower', FileHandler::readDir(_XE_PATH_)); + $dirs = array_map('strtolower', FileHandler::readDir(RX_BASEDIR)); $dirs[] = 'rss'; $dirs[] = 'atom'; $dirs[] = 'api'; @@ -1754,7 +1754,7 @@ class moduleModel extends module $target = ($skin_type == 'M') ? 'mskin' : 'skin'; $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)) { include($designInfoFile); @@ -2251,7 +2251,7 @@ class moduleModel extends module $security->encodeHTML('filebox_list..comment', 'filebox_list..attributes.'); $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); } diff --git a/modules/page/page.admin.controller.php b/modules/page/page.admin.controller.php index 0750b58e8..86dcb81f1 100644 --- a/modules/page/page.admin.controller.php +++ b/modules/page/page.admin.controller.php @@ -269,7 +269,7 @@ class pageAdminController extends page 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 . '\./'); foreach($cache_files as $file_name) { @@ -278,7 +278,7 @@ class pageAdminController extends page } 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 . './'); foreach($cache_files as $file_name) { diff --git a/modules/page/page.mobile.php b/modules/page/page.mobile.php index 1b4f41bf2..cd701fc0b 100644 --- a/modules/page/page.mobile.php +++ b/modules/page/page.mobile.php @@ -9,7 +9,7 @@ class pageMobile extends pageView { 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); break; } @@ -51,7 +51,7 @@ class pageMobile extends pageView // Arrange a widget ryeolro 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); if($interval>0) { diff --git a/modules/page/page.view.php b/modules/page/page.view.php index d8703c76c..12a621538 100644 --- a/modules/page/page.view.php +++ b/modules/page/page.view.php @@ -23,13 +23,13 @@ class pageView extends page { 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); break; } 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->path = $this->module_info->path; break; diff --git a/modules/poll/poll.controller.php b/modules/poll/poll.controller.php index d7723cfb5..e20a4f4ab 100644 --- a/modules/poll/poll.controller.php +++ b/modules/poll/poll.controller.php @@ -347,7 +347,7 @@ class pollController extends poll $oDB->commit(); //$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 //$tpl = $oPollModel->getPollHtml($poll_srl, '', $skin); @@ -368,7 +368,7 @@ class pollController extends poll $poll_srl = Context::get('poll_srl'); $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'); $tpl = $oPollModel->getPollResultHtml($poll_srl, $skin); diff --git a/modules/trash/trash.class.php b/modules/trash/trash.class.php index ea025f69a..784df2003 100644 --- a/modules/trash/trash.class.php +++ b/modules/trash/trash.class.php @@ -1,6 +1,6 @@ */ -require_once(_XE_PATH_.'modules/trash/model/TrashVO.php'); +require_once(RX_BASEDIR.'modules/trash/model/TrashVO.php'); /** * trash class diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php index 0ff9cbea7..63a0922d0 100644 --- a/modules/widget/widget.controller.php +++ b/modules/widget/widget.controller.php @@ -466,7 +466,7 @@ class widgetController extends widget $widget_content = ''; 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 $widget_content = $this->getCache($widget, $args); } diff --git a/modules/widget/widget.model.php b/modules/widget/widget.model.php index a9c47c8d5..f21b5a636 100644 --- a/modules/widget/widget.model.php +++ b/modules/widget/widget.model.php @@ -129,7 +129,7 @@ class widgetModel extends widget $xml_file = sprintf("%sconf/info.xml", $widget_path); if(!file_exists($xml_file)) return; // 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)) { @@ -279,7 +279,7 @@ class widgetModel extends widget $xml_file = sprintf("%sskin.xml", $widgetStyle_path); if(!file_exists($xml_file)) return; // 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)) {