From 1f34c33e2941111c222fa81306349a0f8e046fd5 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Mon, 18 Jan 2021 16:25:02 +0900 Subject: [PATCH] Remove unnecessary site_srl from several other modules --- modules/admin/admin.admin.controller.php | 18 ++-- modules/admin/admin.admin.model.php | 13 ++- modules/admin/admin.admin.view.php | 2 +- modules/admin/queries/getFavoriteList.xml | 2 +- modules/admin/queries/insertFavorite.xml | 2 +- modules/layout/layout.admin.model.php | 8 +- modules/layout/layout.model.php | 19 +--- modules/layout/queries/getLayoutList.xml | 2 +- modules/layout/queries/insertLayout.xml | 2 +- modules/menu/queries/getMenuItemByUrl.xml | 11 --- modules/module/module.admin.controller.php | 41 +-------- modules/module/module.admin.model.php | 19 ++-- modules/module/module.admin.view.php | 9 +- modules/module/module.controller.php | 88 +++---------------- modules/module/module.model.php | 38 ++++---- modules/module/queries/deleteLang.xml | 2 +- modules/module/queries/deleteLangs.xml | 2 +- modules/module/queries/deleteModuleConfig.xml | 2 +- modules/module/queries/getLang.xml | 2 +- modules/module/queries/getLangCount.xml | 2 +- modules/module/queries/getLangList.xml | 2 +- .../module/queries/getLangListByLangcode.xml | 2 +- modules/module/queries/getLangListByName.xml | 2 +- modules/module/queries/getLangNameByValue.xml | 2 +- modules/module/queries/insertLang.xml | 2 +- modules/module/queries/insertModule.xml | 2 +- modules/module/queries/insertModuleConfig.xml | 2 +- modules/module/queries/updateModule.xml | 3 +- modules/module/queries/updateModuleSite.xml | 2 +- 29 files changed, 79 insertions(+), 224 deletions(-) diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index 3ca6f7f73..beeead49f 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -169,10 +169,6 @@ class adminAdminController extends admin public function procAdminInsertDefaultDesignInfo() { $vars = Context::getRequestVars(); - if(!$vars->site_srl) - { - $vars->site_srl = 0; - } // create a DesignInfo file $this->updateDefaultDesignInfo($vars); @@ -190,7 +186,7 @@ class adminAdminController extends admin FileHandler::makeDir($siteDesignPath); } - $siteDesignFile = RX_BASEDIR . 'files/site_design/design_' . $vars->site_srl . '.php'; + $siteDesignFile = RX_BASEDIR . 'files/site_design/design_0.php'; $layoutTarget = 'layout_srl'; $skinTarget = 'skin'; @@ -225,10 +221,10 @@ class adminAdminController extends admin $designInfo->module->{$moduleName}->{$skinTarget} = $skinName; } - $this->makeDefaultDesignFile($designInfo, $vars->site_srl); + $this->makeDefaultDesignFile($designInfo); } - function makeDefaultDesignFile($designInfo, $site_srl = 0) + function makeDefaultDesignFile($designInfo) { $buff = array(); $buff[] = '_insertFavorite($siteSrl, $moduleName); + $output = $this->_insertFavorite(0, $moduleName); $result = 'on'; } @@ -412,11 +407,10 @@ class adminAdminController extends admin * Insert favorite * @return object query result */ - function _insertFavorite($siteSrl, $module, $type = 'module') + function _insertFavorite($site_srl, $module, $type = 'module') { $args = new stdClass(); $args->adminFavoriteSrl = getNextSequence(); - $args->site_srl = $siteSrl; $args->module = $module; $args->type = $type; $output = executeQuery('admin.insertFavorite', $args); diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index 34ee2f4ee..1b7f4d8bd 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -490,7 +490,7 @@ class adminAdminModel extends admin $is_new_layout = TRUE; $oLayoutModel = getModel('layout'); $layout_info_list = array(); - $layout_list = $oLayoutModel->getLayoutList($site_info->site_srl); + $layout_list = $oLayoutModel->getLayoutList(); if($layout_list) { foreach($layout_list as $val) @@ -508,7 +508,6 @@ class adminAdminModel extends admin { $site_module_info = Context::get('site_module_info'); $args = new stdClass(); - $args->site_srl = (int) $site_module_info->site_srl; $args->layout_srl = getNextSequence(); $args->layout = $layout_info->name; $args->title = $layout_info->title; @@ -655,14 +654,13 @@ class adminAdminModel extends admin /** * Get admin favorite list - * @param int $siteSrl if default site, siteSrl is zero + * @param int $site_srl @deprecated * @param bool $isGetModuleInfo * @return object */ - function getFavoriteList($siteSrl = 0, $isGetModuleInfo = FALSE) + function getFavoriteList($site_srl = 0, $isGetModuleInfo = FALSE) { $args = new stdClass(); - $args->site_srl = $siteSrl; $output = executeQueryArray('admin.getFavoriteList', $args); if(!$output->toBool()) { @@ -691,14 +689,13 @@ class adminAdminModel extends admin /** * Check available insert favorite - * @param int $siteSrl if default site, siteSrl is zero + * @param int $site_srl @deprecated * @param string $module * @return object */ - function isExistsFavorite($siteSrl, $module) + function isExistsFavorite($site_srl, $module) { $args = new stdClass(); - $args->site_srl = $siteSrl; $args->module = $module; $output = executeQuery('admin.getFavorite', $args); if(!$output->toBool()) diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 9bb8b53e6..5a21841aa 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -360,7 +360,7 @@ class adminAdminView extends admin // Check counter addon $site_module_info = Context::get('site_module_info'); $oAddonAdminModel = getAdminModel('addon'); - $counterAddonActivated = $oAddonAdminModel->isActivatedAddon('counter', $site_module_info->site_srl ); + $counterAddonActivated = $oAddonAdminModel->isActivatedAddon('counter'); if(!$counterAddonActivated) { $columnList = array('member_srl', 'nick_name', 'user_name', 'user_id', 'email_address'); diff --git a/modules/admin/queries/getFavoriteList.xml b/modules/admin/queries/getFavoriteList.xml index 027db1d3c..5cd98797f 100644 --- a/modules/admin/queries/getFavoriteList.xml +++ b/modules/admin/queries/getFavoriteList.xml @@ -6,7 +6,7 @@ - + diff --git a/modules/admin/queries/insertFavorite.xml b/modules/admin/queries/insertFavorite.xml index 084e5a0bb..eb0ed1871 100644 --- a/modules/admin/queries/insertFavorite.xml +++ b/modules/admin/queries/insertFavorite.xml @@ -4,7 +4,7 @@ - + diff --git a/modules/layout/layout.admin.model.php b/modules/layout/layout.admin.model.php index b85ff6636..82347e003 100644 --- a/modules/layout/layout.admin.model.php +++ b/modules/layout/layout.admin.model.php @@ -166,10 +166,8 @@ class layoutAdminModel extends layout public function getLayoutAdminSiteDefaultLayout() { - $siteSrl = Context::get('site_srl'); $type = Context::get('type'); - - $layoutSrl = $this->getSiteDefaultLayout($type, $siteSrl); + $layoutSrl = $this->getSiteDefaultLayout($type); $oLayoutModel = getModel('layout'); $layoutInfo = $oLayoutModel->getLayoutRawData($layoutSrl, array('title')); @@ -178,10 +176,10 @@ class layoutAdminModel extends layout $this->add('title', $layoutInfo->title); } - public function getSiteDefaultLayout($viewType = 'P', $siteSrl = 0) + public function getSiteDefaultLayout($viewType = 'P') { $target = ($viewType == 'M') ? 'mlayout_srl' : 'layout_srl'; - $designInfoFile = sprintf(RX_BASEDIR . 'files/site_design/design_%s.php', $siteSrl); + $designInfoFile = RX_BASEDIR . 'files/site_design/design_0.php'; 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 d541caf7e..045e3a361 100644 --- a/modules/layout/layout.model.php +++ b/modules/layout/layout.model.php @@ -33,13 +33,7 @@ class layoutModel extends layout */ function getLayoutList($site_srl = 0, $layout_type="P", $columnList = array()) { - if(!$site_srl) - { - $site_module_info = Context::get('site_module_info'); - $site_srl = (int)$site_module_info->site_srl; - } $args = new stdClass(); - $args->site_srl = $site_srl; $args->layout_type = $layout_type; $output = executeQueryArray('layout.getLayoutList', $args, $columnList); @@ -52,7 +46,7 @@ class layoutModel extends layout } $oLayoutAdminModel = getAdminModel('layout'); - $siteDefaultLayoutSrl = $oLayoutAdminModel->getSiteDefaultLayout($layout_type, $site_srl); + $siteDefaultLayoutSrl = $oLayoutAdminModel->getSiteDefaultLayout($layout_type); if($siteDefaultLayoutSrl) { $siteDefaultLayoutInfo = $this->getlayout($siteDefaultLayoutSrl); @@ -81,10 +75,9 @@ class layoutModel extends layout */ public function getLayoutInstanceListForJSONP() { - $siteSrl = Context::get('site_srl'); $layoutType = Context::get('layout_type'); - $layoutList = $this->getLayoutInstanceList($siteSrl, $layoutType); + $layoutList = $this->getLayoutInstanceList(0, $layoutType); $thumbs = array(); foreach($layoutList as $key => $val) @@ -127,17 +120,11 @@ class layoutModel extends layout */ function getLayoutInstanceList($siteSrl = 0, $layoutType = 'P', $layout = null, $columnList = array()) { - if (!$siteSrl) - { - $siteModuleInfo = Context::get('site_module_info'); - $siteSrl = (int)$siteModuleInfo->site_srl; - } if ($columnList && !isset($columnList['layout_type'])) { $columnList[] = 'layout_type'; } $args = new stdClass(); - $args->site_srl = $siteSrl; $args->layout_type = $layoutType === 'P' ? 'P' : 'P,M'; $args->layout = $layout; $output = executeQueryArray('layout.getLayoutList', $args, $columnList); @@ -177,7 +164,6 @@ class layoutModel extends layout if(count($instanceList) < 1 && $downloadedList[$layout]) { $insertArgs = new stdClass(); - $insertArgs->site_srl = $siteSrl; $insertArgs->layout_srl = getNextSequence(); $insertArgs->layout = $layout; $insertArgs->title = $titleList[$layout]; @@ -195,7 +181,6 @@ class layoutModel extends layout foreach($noInstanceList as $layoutName) { $insertArgs = new stdClass(); - $insertArgs->site_srl = $siteSrl; $insertArgs->layout_srl = getNextSequence(); $insertArgs->layout = $layoutName; $insertArgs->title = $titleList[$layoutName]; diff --git a/modules/layout/queries/getLayoutList.xml b/modules/layout/queries/getLayoutList.xml index 7695c19af..e46491ef1 100644 --- a/modules/layout/queries/getLayoutList.xml +++ b/modules/layout/queries/getLayoutList.xml @@ -6,7 +6,7 @@ - + diff --git a/modules/layout/queries/insertLayout.xml b/modules/layout/queries/insertLayout.xml index 1bf9a01e8..4a5ffa8b9 100644 --- a/modules/layout/queries/insertLayout.xml +++ b/modules/layout/queries/insertLayout.xml @@ -4,7 +4,7 @@ - + diff --git a/modules/menu/queries/getMenuItemByUrl.xml b/modules/menu/queries/getMenuItemByUrl.xml index 05d4cfe14..e56d3964a 100644 --- a/modules/menu/queries/getMenuItemByUrl.xml +++ b/modules/menu/queries/getMenuItemByUrl.xml @@ -8,16 +8,5 @@ - - - - - - - - - - - diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index 762259ddf..81c10e0f4 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -679,7 +679,6 @@ class moduleAdminController extends module $target = Context::get('target'); $module = Context::get('module'); $args = new stdClass(); - $args->site_srl = (int)$site_module_info->site_srl; $args->name = str_replace(' ','_',Context::get('lang_code')); $args->lang_name = str_replace(' ','_',Context::get('lang_name')); if(!empty($args->lang_name)) $args->name = $args->lang_name; @@ -700,20 +699,13 @@ class moduleAdminController extends module { $args->lang_code = $key; $args->value = trim(Context::get($key)); - - // if request method is json, strip slashes - if(Context::getRequestMethod() == 'JSON' && version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc()) - { - $args->value = stripslashes($args->value); - } - if($args->value) { $output = executeQuery('module.insertLang', $args); if(!$output->toBool()) return $output; } } - $this->makeCacheDefinedLangCode($args->site_srl); + $this->makeCacheDefinedLangCode(); $this->add('name', $args->name); $this->setMessage("success_saved", 'info'); @@ -730,7 +722,6 @@ class moduleAdminController extends module // Get language code $site_module_info = Context::get('site_module_info'); $args = new stdClass(); - $args->site_srl = (int)$site_module_info->site_srl; $args->name = str_replace(' ','_',Context::get('name')); $args->lang_name = str_replace(' ','_',Context::get('lang_name')); if(!empty($args->lang_name)) $args->name = $args->lang_name; @@ -738,7 +729,7 @@ class moduleAdminController extends module $output = executeQuery('module.deleteLang', $args); if(!$output->toBool()) return $output; - $this->makeCacheDefinedLangCode($args->site_srl); + $this->makeCacheDefinedLangCode(); $this->setMessage("success_deleted", 'info'); @@ -750,28 +741,15 @@ class moduleAdminController extends module { if(!Context::get('is_logged')) throw new Rhymix\Framework\Exceptions\NotPermitted; - $oModuleController = getController('module'); $oModuleModel = getModel('module'); // Variable setting for site keyword $site_keyword = Context::get('site_keyword'); - $site_srl = Context::get('site_srl'); $vid = Context::get('vid'); // If there is no site keyword, use as information of the current virtual site $args = new stdClass; - $logged_info = Context::get('logged_info'); - $site_module_info = Context::get('site_module_info'); if($site_keyword) $args->site_keyword = $site_keyword; - if(!$site_srl) - { - if($logged_info->is_admin == 'Y' && !$site_keyword && !$vid) $args->site_srl = 0; - else $args->site_srl = (int)$site_module_info->site_srl; - } - else $args->site_srl = $site_srl; - - $args->sort_index1 = 'sites.domain'; - $moduleCategorySrl = array(); // Get a list of modules at the site $output = executeQueryArray('module.getSiteModules', $args); @@ -856,20 +834,9 @@ class moduleAdminController extends module /** * @brief Save the file of user-defined language code */ - function makeCacheDefinedLangCode($site_srl = 0) + function makeCacheDefinedLangCode() { $args = new stdClass(); - - // Get the language file of the current site - if(!$site_srl) - { - $site_module_info = Context::get('site_module_info'); - $args->site_srl = (int)$site_module_info->site_srl; - } - else - { - $args->site_srl = $site_srl; - } $output = executeQueryArray('module.getLang', $args); if(!$output->toBool()) return; @@ -910,7 +877,7 @@ class moduleAdminController extends module $langMap[$langCode] += $langMap[$targetLangCode]; } - Rhymix\Framework\Cache::set('site_and_module:user_defined_langs:' . $args->site_srl . ':' . $langCode, $langMap[$langCode], 0, true); + Rhymix\Framework\Cache::set('site_and_module:user_defined_langs:0:' . $langCode, $langMap[$langCode], 0, true); } $currentLang = Context::getLangType(); diff --git a/modules/module/module.admin.model.php b/modules/module/module.admin.model.php index 9f39ae035..6021bce74 100644 --- a/modules/module/module.admin.model.php +++ b/modules/module/module.admin.model.php @@ -151,7 +151,7 @@ class moduleAdminModel extends module Context::set('member_config', $member_config); $oModuleModel = getModel('module'); - $columnList = array('module_srl', 'site_srl'); + $columnList = array('module_srl'); $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList); // Grant virtual permission for access and manager $grant_list = new stdClass(); @@ -198,7 +198,7 @@ class moduleAdminModel extends module $admin_member = ModuleModel::getAdminId($module_srl) ?: []; Context::set('admin_member', $admin_member); // Get a list of groups - $group_list = MemberModel::getGroups($module_info->site_srl); + $group_list = MemberModel::getGroups(); Context::set('group_list', $group_list); //Security @@ -317,14 +317,14 @@ class moduleAdminModel extends module $mode = $mode === 'P' ? 'P' : 'M'; $oModuleModel = getModel('module'); - $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl); + $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl); if(!$module_info) return; if($mode === 'P') { if($module_info->is_skin_fix == 'N') { - $skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'P', $module_info->site_srl); + $skin = ModuleModel::getModuleDefaultSkin($module_info->module, 'P'); } else { @@ -336,7 +336,7 @@ class moduleAdminModel extends module if($module_info->is_mskin_fix == 'N') { $skin_type = $module_info->mskin === '/USE_RESPONSIVE/' ? 'P' : 'M'; - $skin = $oModuleModel->getModuleDefaultSkin($module_info->module, $skin_type, $module_info->site_srl); + $skin = ModuleModel::getModuleDefaultSkin($module_info->module, $skin_type); } else { @@ -414,7 +414,6 @@ class moduleAdminModel extends module if(substr($name,0,12)=='$user_lang->') { $args = new stdClass(); - $args->site_srl = (int)$site_srl; $args->name = substr($name,12); $output = executeQueryArray('module.getLang', $args); if($output->data) @@ -459,9 +458,8 @@ class moduleAdminModel extends module { $name = Context::get('name'); if(!$name) return $this->setError('msg_invalid_request'); - $site_module_info = Context::get('site_module_info'); $this->add('name', $name); - $output = $this->getLangCode($site_module_info->site_srl, '$user_lang->'.$name); + $output = $this->getLangCode(0, '$user_lang->'.$name); $this->add('langs', $output); } @@ -471,8 +469,6 @@ class moduleAdminModel extends module function getModuleAdminLangListByName() { $args = Context::getRequestVars(); - if(!$args->site_srl) $args->site_srl = 0; - $columnList = array('lang_code', 'name', 'value'); $langList = array(); @@ -491,8 +487,6 @@ class moduleAdminModel extends module function getModuleAdminLangListByValue() { $args = Context::getRequestVars(); - if(!$args->site_srl) $args->site_srl = 0; - $langList = array(); // search value @@ -546,7 +540,6 @@ class moduleAdminModel extends module { $site_module_info = Context::get('site_module_info'); $args = new stdClass(); - $args->site_srl = (int)$site_module_info->site_srl; $args->langCode = Context::get('lang_code'); $args->page = Context::get('page'); $args->sort_index = 'name'; diff --git a/modules/module/module.admin.view.php b/modules/module/module.admin.view.php index ca8355f44..b29ae3e0b 100644 --- a/modules/module/module.admin.view.php +++ b/modules/module/module.admin.view.php @@ -231,11 +231,14 @@ class moduleAdminView extends module if(!count($modules)) if(!$module_srls) throw new Rhymix\Framework\Exceptions\InvalidRequest; $oModuleModel = getModel('module'); - $columnList = array('module_srl', 'module', 'site_srl'); + $columnList = array('module_srl', 'module'); $module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0], $columnList); $xml_info = $oModuleModel->getModuleActionXml($module_info->module); $source_grant_list = $xml_info->grant; // Grant virtual permissions for access and manager + $grant_list = new stdClass; + $grant_list->manager = new stdClass; + $grant_list->access = new stdClass; $grant_list->access->title = lang('grant_access'); $grant_list->access->default = 'guest'; if(count($source_grant_list)) @@ -252,7 +255,7 @@ class moduleAdminView extends module Context::set('grant_list', $grant_list); // Get a list of groups $oMemberModel = getModel('member'); - $group_list = $oMemberModel->getGroups($module_info->site_srl); + $group_list = $oMemberModel->getGroups(); Context::set('group_list', $group_list); $security = new Security(); $security->encodeHTML('group_list..title'); @@ -270,9 +273,7 @@ class moduleAdminView extends module function dispModuleAdminLangcode() { // Get the language file of the current site - $site_module_info = Context::get('site_module_info'); $args = new stdClass(); - $args->site_srl = (int)$site_module_info->site_srl; $args->langCode = Context::get('lang_type'); $args->page = Context::get('page'); // /< Page $args->list_count = 30; // /< the number of posts to display on a single page diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php index 183388676..41a842d76 100644 --- a/modules/module/module.controller.php +++ b/modules/module/module.controller.php @@ -189,16 +189,16 @@ class moduleController extends module return $output; } - function updateModuleConfig($module, $config, $site_srl = 0) + function updateModuleConfig($module, $config) { - $origin_config = ModuleModel::getModuleConfig($module, $site_srl) ?: new stdClass; + $origin_config = ModuleModel::getModuleConfig($module) ?: new stdClass; foreach($config as $key => $val) { $origin_config->{$key} = $val; } - return $this->insertModuleConfig($module, $origin_config, $site_srl); + return $this->insertModuleConfig($module, $origin_config); } function updateModulePartConfig($module, $module_srl, $config) @@ -217,12 +217,11 @@ class moduleController extends module * @brief Enter a specific set of modules * In order to manage global configurations of modules such as board, member and so on */ - function insertModuleConfig($module, $config, $site_srl = 0) + function insertModuleConfig($module, $config) { $args =new stdClass(); $args->module = $module; $args->config = serialize($config); - $args->site_srl = $site_srl; $oDB = DB::getInstance(); $oDB->begin(); @@ -288,30 +287,7 @@ class moduleController extends module */ function insertSite($domain, $index_module_srl) { - if(isSiteID($domain)) - { - if(ModuleModel::isIDExists($domain, 0)) return new BaseObject(-1, 'msg_already_registed_vid'); - } - else - { - $domain = strtolower($domain); - } - - $args = new stdClass; - $args->site_srl = getNextSequence(); - $args->domain = (substr_compare($domain, '/', -1) === 0) ? substr($domain, 0, -1) : $domain; - $args->index_module_srl = $index_module_srl; - $args->default_language = Context::getLangType(); - - $columnList = array('modules.site_srl'); - $output = ModuleModel::getSiteInfoByDomain($args->domain, $columnList); - if($output) return new BaseObject(-1,'msg_already_registed_vid'); - - $output = executeQuery('module.insertSite', $args); - if(!$output->toBool()) return $output; - - $output->add('site_srl', $args->site_srl); - return $output; + throw new Rhymix\Framework\Exceptions\FeatureDisabled; } /** @@ -319,36 +295,7 @@ class moduleController extends module */ function updateSite($args) { - $columnList = array('sites.site_srl', 'sites.domain'); - $site_info = ModuleModel::getSiteInfo($args->site_srl, $columnList); - - if(!$args->domain && $site_info->site_srl == $args->site_srl) - { - $args->domain = $site_info->domain; - } - - if($site_info->domain != $args->domain) - { - $info = ModuleModel::getSiteInfoByDomain($args->domain, $columnList); - if($info->site_srl && $info->site_srl != $args->site_srl) return new BaseObject(-1, 'msg_already_registed_domain'); - if(isSiteID($args->domain) && ModuleModel::isIDExists($args->domain)) return new BaseObject(-1, 'msg_already_registed_vid'); - - if($args->domain && !isSiteID($args->domain)) - { - $args->domain = (strlen($args->domain) >= 1 && substr_compare($args->domain, '/', -1) === 0) ? substr($args->domain, 0, -1) : $args->domain; - } - } - $output = executeQuery('module.updateSite', $args); - //clear cache for default mid - if($args->site_srl == 0) $vid=''; - else $vid=$args->domain; - - $module_info = ModuleModel::getModuleInfoByModuleSrl($args->index_module_srl); - $mid = $module_info->mid; - - Rhymix\Framework\Cache::clearGroup('site_and_module'); - ModuleModel::$_mid_map = ModuleModel::$_module_srl_map = []; - return $output; + throw new Rhymix\Framework\Exceptions\FeatureDisabled; } /** @@ -360,6 +307,7 @@ class moduleController extends module unset($args->body); unset($args->act); unset($args->page); + unset($args->site_srl); // Test mid value if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new BaseObject(-1, 'msg_limit_mid'); // Test variables (separate basic vars and other vars in modules) @@ -407,8 +355,7 @@ class moduleController extends module $output = $this->arrangeModuleInfo($args, $extra_vars); if(!$output->toBool()) return $output; // Check whether the module name already exists - if(!$args->site_srl) $args->site_srl = 0; - if(ModuleModel::isIDExists($args->mid, $args->site_srl)) return new BaseObject(-1, 'msg_module_name_exists'); + if(ModuleModel::isIDExists($args->mid)) return new BaseObject(-1, 'msg_module_name_exists'); // begin transaction $oDB = &DB::getInstance(); @@ -465,7 +412,7 @@ class moduleController extends module $menuOutput = executeQuery('menu.getMenu', $menuArgs); // if menu is not created, create menu also. and does not supported that in virtual site. - if(!$menuOutput->data && !$args->site_srl) + if(!$menuOutput->data) { $oMenuAdminController = getAdminController('menu'); $menuSrl = $oMenuAdminController->getUnlinkedMenu(); @@ -533,10 +480,9 @@ class moduleController extends module $module_info = ModuleModel::getModuleInfoByModuleSrl($args->module_srl); - if(!$args->site_srl || !$args->browser_title) + if(!$args->browser_title) { - if(!$args->site_srl) $args->site_srl = (int)$module_info->site_srl; - if(!$args->browser_title) $args->browser_title = $module_info->browser_title; + $args->browser_title = $module_info->browser_title; } $args->browser_title = strip_tags($args->browser_title); @@ -591,7 +537,6 @@ class moduleController extends module { $menuArgs = new stdClass; $menuArgs->url = $module_info->mid; - $menuArgs->site_srl = $module_info->site_srl; $menuOutput = executeQueryArray('menu.getMenuItemByUrl', $menuArgs); if($menuOutput->data && count($menuOutput->data)) { @@ -648,11 +593,10 @@ class moduleController extends module /** * @brief Change the module's virtual site */ - function updateModuleSite($module_srl, $site_srl, $layout_srl = 0) + function updateModuleSite($module_srl, $site_srl = 0, $layout_srl = 0) { $args = new stdClass; $args->module_srl = $module_srl; - $args->site_srl = $site_srl; $args->layout_srl = $layout_srl; $output = executeQuery('module.updateModuleSite', $args); if(!$output->toBool()) return $output; @@ -668,7 +612,7 @@ class moduleController extends module * Attempt to delete all related information when deleting a module. * Origin method is changed. because menu validation check is needed */ - function deleteModule($module_srl, $site_srl = 0) + function deleteModule($module_srl) { if(!$module_srl) return new BaseObject(-1,'msg_invalid_request'); @@ -679,15 +623,9 @@ class moduleController extends module $args = new stdClass(); $args->url = $output->mid; $args->is_shortcut = 'N'; - if(!$site_srl) $args->site_srl = $site_module_info->site_srl; - else $args->site_srl = $site_srl; - - unset($output); $oMenuAdminModel = getAdminModel('menu'); $menuOutput = $oMenuAdminModel->getMenuList($args); - - // get menu_srl by site_srl if(is_array($menuOutput->data)) { foreach($menuOutput->data AS $key=>$value) diff --git a/modules/module/module.model.php b/modules/module/module.model.php index aadf68da5..613cd08da 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -227,7 +227,7 @@ class moduleModel extends module /** * @brief Get module information by mid */ - public static function getModuleInfoByMid($mid, $site_srl = 0, $columnList = array()) + public static function getModuleInfoByMid($mid) { if(!$mid || ($mid && !preg_match("/^[a-z][a-z0-9_-]+$/i", $mid))) { @@ -537,9 +537,13 @@ class moduleModel extends module $list = Rhymix\Framework\Cache::get('site_and_module:module:mid_list'); if($list === null) { - $argsCount = countobj($args); + if (is_object($args) && isset($args->site_srl)) + { + unset($args->site_srl); + } - if(!$argsCount || ($argsCount === 1 && isset($args->site_srl))) + $argsCount = countobj($args); + if(!$argsCount) { $columnList = array(); } @@ -548,7 +552,7 @@ class moduleModel extends module if(!$output->toBool()) return $output; $list = $output->data; - if((!$argsCount || ($argsCount === 1 && isset($args->site_srl))) && !$columnList) + if(!$argsCount && !$columnList) { Rhymix\Framework\Cache::set('site_and_module:module:mid_list', $list, 0, true); } @@ -1189,13 +1193,11 @@ class moduleModel extends module * Global configuration is used to manage board, member and others * * @param string $module - * @param int $site_srl @deprecated * @return mixed */ - public static function getModuleConfig($module, $site_srl = 0) + public static function getModuleConfig($module) { - $site_srl = 0; - if(!isset($GLOBALS['__ModuleConfig__'][$site_srl][$module])) + if(!isset($GLOBALS['__ModuleConfig__'][$module])) { $config = Rhymix\Framework\Cache::get('site_and_module:module_config:' . $module); if($config === null) @@ -1220,10 +1222,10 @@ class moduleModel extends module Rhymix\Framework\Cache::set('site_and_module:module_config:' . $module, $config, 0, true); } } - $GLOBALS['__ModuleConfig__'][$site_srl][$module] = $config; + $GLOBALS['__ModuleConfig__'][$module] = $config; } - $config = $GLOBALS['__ModuleConfig__'][$site_srl][$module]; + $config = $GLOBALS['__ModuleConfig__'][$module]; return $config === -1 ? null : $config; } @@ -1601,7 +1603,7 @@ class moduleModel extends module /** * @brief Check if it is an administrator of site_module_info */ - public static function isSiteAdmin($member_info, $site_srl = null) + public static function isSiteAdmin($member_info) { if ($member_info && $member_info->is_admin == 'Y') { @@ -1616,7 +1618,7 @@ class moduleModel extends module /** * @brief Get admin information of the site */ - public static function getSiteAdmin($site_srl) + public static function getSiteAdmin() { return array(); } @@ -1763,9 +1765,7 @@ class moduleModel extends module public static function getModuleDefaultSkin($module_name, $skin_type = 'P', $site_srl = 0, $updateCache = true) { $target = ($skin_type == 'M') ? 'mskin' : 'skin'; - $site_srl = 0; - - $designInfoFile = sprintf(RX_BASEDIR.'files/site_design/design_%s.php', $site_srl); + $designInfoFile = RX_BASEDIR.'files/site_design/design_0.php'; if(is_readable($designInfoFile)) { include($designInfoFile); @@ -1812,7 +1812,7 @@ class moduleModel extends module $designInfo->module->{$module_name}->{$target} = $skinName; $oAdminController = getAdminController('admin'); - $oAdminController->makeDefaultDesignFile($designInfo, $site_srl); + $oAdminController->makeDefaultDesignFile($designInfo); } } @@ -2317,19 +2317,13 @@ class moduleModel extends module public function getLangListByLangcodeForAutoComplete() { - $keyword = Context::get('search_keyword'); - - $requestVars = Context::getRequestVars(); - $args = new stdClass; - $args->site_srl = (int)$requestVars->site_srl; $args->page = 1; // /< Page $args->list_count = 100; // /< the number of posts to display on a single page $args->page_count = 5; // /< the number of pages that appear in the page navigation $args->sort_index = 'name'; $args->order_type = 'asc'; $args->search_keyword = Context::get('search_keyword'); // /< keyword to search*/ - $output = executeQueryArray('module.getLangListByLangcode', $args); $list = array(); diff --git a/modules/module/queries/deleteLang.xml b/modules/module/queries/deleteLang.xml index 734f5e534..b63fcbf9b 100644 --- a/modules/module/queries/deleteLang.xml +++ b/modules/module/queries/deleteLang.xml @@ -3,7 +3,7 @@
- + diff --git a/modules/module/queries/deleteLangs.xml b/modules/module/queries/deleteLangs.xml index 796fbd7cc..4dece4ef2 100644 --- a/modules/module/queries/deleteLangs.xml +++ b/modules/module/queries/deleteLangs.xml @@ -3,6 +3,6 @@
- + diff --git a/modules/module/queries/deleteModuleConfig.xml b/modules/module/queries/deleteModuleConfig.xml index 1f164d183..5c0a230ec 100644 --- a/modules/module/queries/deleteModuleConfig.xml +++ b/modules/module/queries/deleteModuleConfig.xml @@ -4,6 +4,6 @@ - + diff --git a/modules/module/queries/getLang.xml b/modules/module/queries/getLang.xml index b9c5db367..8dbe2296a 100644 --- a/modules/module/queries/getLang.xml +++ b/modules/module/queries/getLang.xml @@ -6,7 +6,7 @@ - + diff --git a/modules/module/queries/getLangCount.xml b/modules/module/queries/getLangCount.xml index cfc786b42..b3078c68c 100644 --- a/modules/module/queries/getLangCount.xml +++ b/modules/module/queries/getLangCount.xml @@ -6,7 +6,7 @@ - + diff --git a/modules/module/queries/getLangList.xml b/modules/module/queries/getLangList.xml index f371db29c..f2e7f29cf 100644 --- a/modules/module/queries/getLangList.xml +++ b/modules/module/queries/getLangList.xml @@ -6,7 +6,7 @@ - + diff --git a/modules/module/queries/getLangListByLangcode.xml b/modules/module/queries/getLangListByLangcode.xml index a0b7c8311..6a7bb6500 100644 --- a/modules/module/queries/getLangListByLangcode.xml +++ b/modules/module/queries/getLangListByLangcode.xml @@ -7,7 +7,7 @@ - + diff --git a/modules/module/queries/getLangListByName.xml b/modules/module/queries/getLangListByName.xml index 967e186f8..ca238f54e 100644 --- a/modules/module/queries/getLangListByName.xml +++ b/modules/module/queries/getLangListByName.xml @@ -6,7 +6,7 @@ - + diff --git a/modules/module/queries/getLangNameByValue.xml b/modules/module/queries/getLangNameByValue.xml index 494bd8c81..fc51b6bcc 100644 --- a/modules/module/queries/getLangNameByValue.xml +++ b/modules/module/queries/getLangNameByValue.xml @@ -6,7 +6,7 @@ - + diff --git a/modules/module/queries/insertLang.xml b/modules/module/queries/insertLang.xml index d16fc6774..30b008116 100644 --- a/modules/module/queries/insertLang.xml +++ b/modules/module/queries/insertLang.xml @@ -3,7 +3,7 @@
- + diff --git a/modules/module/queries/insertModule.xml b/modules/module/queries/insertModule.xml index 99a2ee63a..b155b09c3 100644 --- a/modules/module/queries/insertModule.xml +++ b/modules/module/queries/insertModule.xml @@ -3,7 +3,7 @@
- + diff --git a/modules/module/queries/insertModuleConfig.xml b/modules/module/queries/insertModuleConfig.xml index a39fa4282..6ec3d5f41 100644 --- a/modules/module/queries/insertModuleConfig.xml +++ b/modules/module/queries/insertModuleConfig.xml @@ -5,7 +5,7 @@ - + diff --git a/modules/module/queries/updateModule.xml b/modules/module/queries/updateModule.xml index be8d283ee..281fad367 100644 --- a/modules/module/queries/updateModule.xml +++ b/modules/module/queries/updateModule.xml @@ -24,7 +24,6 @@ - - + diff --git a/modules/module/queries/updateModuleSite.xml b/modules/module/queries/updateModuleSite.xml index d997b244e..e0d8b3c4a 100644 --- a/modules/module/queries/updateModuleSite.xml +++ b/modules/module/queries/updateModuleSite.xml @@ -3,7 +3,7 @@
- +