Remove trailing whitespace in module module

This commit is contained in:
Kijin Sung 2023-01-17 21:00:45 +09:00
parent 1dca4adf42
commit f05d3b4ab6
8 changed files with 191 additions and 191 deletions

View file

@ -285,10 +285,10 @@ class ModuleAdminController extends Module
$columnList = array('module_srl', 'module'); $columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList); $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
if(!$module_info) throw new Rhymix\Framework\Exceptions\InvalidRequest; if(!$module_info) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$oDB = DB::getInstance(); $oDB = DB::getInstance();
$oDB->begin(); $oDB->begin();
// Register Admin ID // Register Admin ID
$oModuleController->deleteAdminId($module_srl); $oModuleController->deleteAdminId($module_srl);
$admin_member = Context::get('admin_member'); $admin_member = Context::get('admin_member');
@ -357,9 +357,9 @@ class ModuleAdminController extends Module
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
} }
} }
$oDB->commit(); $oDB->commit();
Rhymix\Framework\Cache::delete("site_and_module:module_grants:$module_srl"); Rhymix\Framework\Cache::delete("site_and_module:module_grants:$module_srl");
$this->setMessage('success_registed'); $this->setMessage('success_registed');
} }
@ -646,10 +646,10 @@ class ModuleAdminController extends Module
} }
} }
} }
Rhymix\Framework\Cache::delete("site_and_module:module_grants:$module_srl"); Rhymix\Framework\Cache::delete("site_and_module:module_grants:$module_srl");
$this->setMessage('success_registed'); $this->setMessage('success_registed');
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
{ {
if(Context::get('success_return_url')) if(Context::get('success_return_url'))
@ -876,10 +876,10 @@ class ModuleAdminController extends Module
$langMap[$langCode] += $langMap[$targetLangCode]; $langMap[$langCode] += $langMap[$targetLangCode];
} }
Rhymix\Framework\Cache::set('site_and_module:user_defined_langs:0:' . $langCode, $langMap[$langCode], 0, true); Rhymix\Framework\Cache::set('site_and_module:user_defined_langs:0:' . $langCode, $langMap[$langCode], 0, true);
} }
$currentLang = Context::getLangType(); $currentLang = Context::getLangType();
return isset($langMap[$currentLang]) ? $langMap[$currentLang] : array(); return isset($langMap[$currentLang]) ? $langMap[$currentLang] : array();
} }

View file

@ -201,7 +201,7 @@ class ModuleAdminModel extends Module
$group_list = MemberModel::getGroups(); $group_list = MemberModel::getGroups();
Context::set('group_list', $group_list); Context::set('group_list', $group_list);
//Security //Security
$security = new Security(); $security = new Security();
$security->encodeHTML('group_list..title'); $security->encodeHTML('group_list..title');
$security->encodeHTML('group_list..description'); $security->encodeHTML('group_list..description');
@ -360,12 +360,12 @@ class ModuleAdminModel extends Module
if($skin_info->extra_vars) if($skin_info->extra_vars)
{ {
foreach($skin_info->extra_vars as $key => $val) foreach($skin_info->extra_vars as $key => $val)
{ {
$group = $val->group; $group = $val->group;
$name = $val->name; $name = $val->name;
$type = $val->type; $type = $val->type;
if($skin_vars[$name]) if($skin_vars[$name])
{ {
$value = $skin_vars[$name]->value; $value = $skin_vars[$name]->value;
} }
@ -387,7 +387,7 @@ class ModuleAdminModel extends Module
Context::set('mode', $mode); Context::set('mode', $mode);
//Security //Security
$security = new Security(); $security = new Security();
$security->encodeHTML('mid'); $security->encodeHTML('mid');
$security->encodeHTML('module_info.browser_title'); $security->encodeHTML('module_info.browser_title');
$security->encodeHTML('skin_info...'); $security->encodeHTML('skin_info...');

View file

@ -87,7 +87,7 @@ class ModuleAdminView extends Module
$module_info = $oModuleModel->getModuleInfoXml(Context::get('selected_module')); $module_info = $oModuleModel->getModuleInfoXml(Context::get('selected_module'));
Context::set('module_info', $module_info); Context::set('module_info', $module_info);
$security = new Security(); $security = new Security();
$security->encodeHTML('module_info...'); $security->encodeHTML('module_info...');
// Set the layout to be pop-up // Set the layout to be pop-up
@ -257,7 +257,7 @@ class ModuleAdminView extends Module
$oMemberModel = getModel('member'); $oMemberModel = getModel('member');
$group_list = $oMemberModel->getGroups(); $group_list = $oMemberModel->getGroups();
Context::set('group_list', $group_list); Context::set('group_list', $group_list);
$security = new Security(); $security = new Security();
$security->encodeHTML('group_list..title'); $security->encodeHTML('group_list..title');
// Set the layout to be pop-up // Set the layout to be pop-up
@ -310,10 +310,10 @@ class ModuleAdminView extends Module
Context::set('filebox_list', $output->data); Context::set('filebox_list', $output->data);
Context::set('page_navigation', $output->page_navigation); Context::set('page_navigation', $output->page_navigation);
Context::set('page', $page); Context::set('page', $page);
$max_filesize = min(FileHandler::returnBytes(ini_get('upload_max_filesize')), FileHandler::returnBytes(ini_get('post_max_size'))); $max_filesize = min(FileHandler::returnBytes(ini_get('upload_max_filesize')), FileHandler::returnBytes(ini_get('post_max_size')));
Context::set('max_filesize', $max_filesize); Context::set('max_filesize', $max_filesize);
$oSecurity = new Security(); $oSecurity = new Security();
$oSecurity->encodeHTML('filebox_list..comment', 'filebox_list..attributes.'); $oSecurity->encodeHTML('filebox_list..comment', 'filebox_list..attributes.');
$this->setTemplateFile('adminFileBox'); $this->setTemplateFile('adminFileBox');

View file

@ -43,7 +43,7 @@ class Module extends ModuleObject
return $output; return $output;
} }
} }
// Create a directory to use in the module module // Create a directory to use in the module module
FileHandler::makeDir('./files/cache/module_info'); FileHandler::makeDir('./files/cache/module_info');
FileHandler::makeDir('./files/cache/triggers'); FileHandler::makeDir('./files/cache/triggers');
@ -56,7 +56,7 @@ class Module extends ModuleObject
function checkUpdate() function checkUpdate()
{ {
$oDB = DB::getInstance(); $oDB = DB::getInstance();
// check ruleset directory // check ruleset directory
if(!is_dir(RX_BASEDIR . 'files/ruleset')) return true; if(!is_dir(RX_BASEDIR . 'files/ruleset')) return true;
@ -104,7 +104,7 @@ class Module extends ModuleObject
if(!$oDB->isColumnExists('action_forward', 'route_regexp')) return true; if(!$oDB->isColumnExists('action_forward', 'route_regexp')) return true;
if(!$oDB->isColumnExists('action_forward', 'route_config')) return true; if(!$oDB->isColumnExists('action_forward', 'route_config')) return true;
if(!$oDB->isColumnExists('action_forward', 'global_route')) return true; if(!$oDB->isColumnExists('action_forward', 'global_route')) return true;
// check additional indexes on lang table // check additional indexes on lang table
$column_info = $oDB->getColumnInfo('lang', 'name'); $column_info = $oDB->getColumnInfo('lang', 'name');
if($column_info->size > 100) if($column_info->size > 100)
@ -115,7 +115,7 @@ class Module extends ModuleObject
if(!$oDB->isIndexExists('lang', 'idx_name')) return true; if(!$oDB->isIndexExists('lang', 'idx_name')) return true;
if(!$oDB->isIndexExists('lang', 'idx_lang_code')) return true; if(!$oDB->isIndexExists('lang', 'idx_lang_code')) return true;
if(!$oDB->isIndexExists('lang', 'idx_lang')) return true; if(!$oDB->isIndexExists('lang', 'idx_lang')) return true;
// check module_trigger table // check module_trigger table
if($oDB->isIndexExists('module_trigger', 'idx_trigger')) if($oDB->isIndexExists('module_trigger', 'idx_trigger'))
{ {
@ -130,7 +130,7 @@ class Module extends ModuleObject
{ {
return true; return true;
} }
// check deprecated lang code // check deprecated lang code
$output = executeQuery('module.getLangCount', ['site_srl' => 0, 'lang_code' => 'jp']); $output = executeQuery('module.getLangCount', ['site_srl' => 0, 'lang_code' => 'jp']);
if ($output->data->count > 0) if ($output->data->count > 0)
@ -151,7 +151,7 @@ class Module extends ModuleObject
{ {
$this->migrateDomains(); $this->migrateDomains();
} }
// check ruleset directory // check ruleset directory
FileHandler::makeDir(RX_BASEDIR . 'files/ruleset'); FileHandler::makeDir(RX_BASEDIR . 'files/ruleset');
@ -192,7 +192,7 @@ class Module extends ModuleObject
$oDB->addIndex('module_part_config', 'unique_module_part_config', array('module', 'module_srl'), false); $oDB->addIndex('module_part_config', 'unique_module_part_config', array('module', 'module_srl'), false);
} }
} }
// check route columns in action_forward table // check route columns in action_forward table
if(!$oDB->isColumnExists('action_forward', 'route_regexp')) if(!$oDB->isColumnExists('action_forward', 'route_regexp'))
{ {
@ -206,7 +206,7 @@ class Module extends ModuleObject
{ {
$oDB->addColumn('action_forward', 'global_route', 'char', 1, 'N', true); $oDB->addColumn('action_forward', 'global_route', 'char', 1, 'N', true);
} }
// check additional indexes on lang table // check additional indexes on lang table
$column_info = $oDB->getColumnInfo('lang', 'name'); $column_info = $oDB->getColumnInfo('lang', 'name');
if($column_info->size > 100) if($column_info->size > 100)
@ -229,7 +229,7 @@ class Module extends ModuleObject
{ {
$oDB->addIndex('lang', 'idx_lang', array('site_srl', 'name', 'lang_code'), false); $oDB->addIndex('lang', 'idx_lang', array('site_srl', 'name', 'lang_code'), false);
} }
// check module_trigger table // check module_trigger table
if($oDB->isIndexExists('module_trigger', 'idx_trigger')) if($oDB->isIndexExists('module_trigger', 'idx_trigger'))
{ {
@ -249,7 +249,7 @@ class Module extends ModuleObject
$oDB->addIndex('module_trigger', 'idx_trigger_name', array('trigger_name', 'called_position')); $oDB->addIndex('module_trigger', 'idx_trigger_name', array('trigger_name', 'called_position'));
$oDB->addIndex('module_trigger', 'idx_trigger_target', array('module', 'type', 'called_method')); $oDB->addIndex('module_trigger', 'idx_trigger_target', array('module', 'type', 'called_method'));
} }
// check deprecated lang code // check deprecated lang code
$output = executeQuery('module.getLangCount', ['site_srl' => 0, 'lang_code' => 'jp']); $output = executeQuery('module.getLangCount', ['site_srl' => 0, 'lang_code' => 'jp']);
if ($output->data->count > 0) if ($output->data->count > 0)
@ -261,7 +261,7 @@ class Module extends ModuleObject
} }
} }
} }
/** /**
* @brief Migrate old sites and multidomain info to new 'domains' table * @brief Migrate old sites and multidomain info to new 'domains' table
*/ */
@ -273,14 +273,14 @@ class Module extends ModuleObject
{ {
$oDB->createTable($this->module_path . 'schemas/domains.xml'); $oDB->createTable($this->module_path . 'schemas/domains.xml');
} }
// Get current site configuration. // Get current site configuration.
$config = ModuleModel::getModuleConfig('module'); $config = ModuleModel::getModuleConfig('module');
// Initialize domains data. // Initialize domains data.
$domains = array(); $domains = array();
$default_domain = new stdClass; $default_domain = new stdClass;
// Check XE sites. // Check XE sites.
$output = executeQueryArray('module.getSites'); $output = executeQueryArray('module.getSites');
if ($output->data) if ($output->data)
@ -292,7 +292,7 @@ class Module extends ModuleObject
{ {
$site_domain = 'http://' . $site_domain; $site_domain = 'http://' . $site_domain;
} }
$domain = new stdClass(); $domain = new stdClass();
$domain->domain_srl = $site_info->site_srl; $domain->domain_srl = $site_info->site_srl;
$domain->domain = Rhymix\Framework\URL::getDomainFromURL(strtolower($site_domain)); $domain->domain = Rhymix\Framework\URL::getDomainFromURL(strtolower($site_domain));
@ -322,7 +322,7 @@ class Module extends ModuleObject
{ {
$output = executeQuery('module.getDefaultMidInfo', $args); $output = executeQuery('module.getDefaultMidInfo', $args);
$default_hostinfo = parse_url(Rhymix\Framework\URL::getCurrentURL()); $default_hostinfo = parse_url(Rhymix\Framework\URL::getCurrentURL());
$domain = new stdClass(); $domain = new stdClass();
$domain->domain_srl = 0; $domain->domain_srl = 0;
$domain->domain = Rhymix\Framework\URL::decodeIdna(strtolower($default_hostinfo['host'])); $domain->domain = Rhymix\Framework\URL::decodeIdna(strtolower($default_hostinfo['host']));
@ -343,7 +343,7 @@ class Module extends ModuleObject
$domains[$domain->domain] = $domain; $domains[$domain->domain] = $domain;
$default_domain = $domain; $default_domain = $domain;
} }
// Check multidomain module. // Check multidomain module.
if (getModel('multidomain')) if (getModel('multidomain'))
{ {
@ -357,7 +357,7 @@ class Module extends ModuleObject
{ {
$site_domain = 'http://' . $site_domain; $site_domain = 'http://' . $site_domain;
} }
$domain = new stdClass(); $domain = new stdClass();
$domain->domain_srl = $site_info->multidomain_srl; $domain->domain_srl = $site_info->multidomain_srl;
$domain->domain = Rhymix\Framework\URL::getDomainFromURL(strtolower($site_domain)); $domain->domain = Rhymix\Framework\URL::getDomainFromURL(strtolower($site_domain));
@ -384,7 +384,7 @@ class Module extends ModuleObject
} }
} }
} }
// Insert into DB. // Insert into DB.
foreach ($domains as $domain) foreach ($domains as $domain)
{ {
@ -394,11 +394,11 @@ class Module extends ModuleObject
return $output; return $output;
} }
} }
// Clear cache. // Clear cache.
Rhymix\Framework\Cache::clearGroup('site_and_module'); Rhymix\Framework\Cache::clearGroup('site_and_module');
ModuleModel::$_mid_map = ModuleModel::$_module_srl_map = []; ModuleModel::$_mid_map = ModuleModel::$_module_srl_map = [];
// Return the default domain info. // Return the default domain info.
return $default_domain; return $default_domain;
} }
@ -413,7 +413,7 @@ class Module extends ModuleObject
$module_names = array_map(function($module_info) { $module_names = array_map(function($module_info) {
return $module_info->module; return $module_info->module;
}, $module_list); }, $module_list);
// Delete triggers belonging to modules that don't exist // Delete triggers belonging to modules that don't exist
$args = new stdClass; $args = new stdClass;
$args->module = $module_names ?: []; $args->module = $module_names ?: [];

View file

@ -28,7 +28,7 @@ class ModuleController extends Module
$args->route_regexp = is_scalar($route_regexp) ? $route_regexp : serialize($route_regexp); $args->route_regexp = is_scalar($route_regexp) ? $route_regexp : serialize($route_regexp);
$args->route_config = is_scalar($route_config) ? $route_config : serialize($route_config); $args->route_config = is_scalar($route_config) ? $route_config : serialize($route_config);
$args->global_route = $global_route === 'Y' ? 'Y' : 'N'; $args->global_route = $global_route === 'Y' ? 'Y' : 'N';
$oDB = DB::getInstance(); $oDB = DB::getInstance();
$oDB->begin(); $oDB->begin();
$output = executeQuery('module.deleteActionForward', ['act' => $act]); $output = executeQuery('module.deleteActionForward', ['act' => $act]);
@ -56,7 +56,7 @@ class ModuleController extends Module
/** /**
* @brief Add trigger callback function * @brief Add trigger callback function
* *
* @param string $trigger_name * @param string $trigger_name
* @param string $called_position * @param string $called_position
* @param callable $callback_function * @param callable $callback_function
@ -147,18 +147,18 @@ class ModuleController extends Module
{ {
return false; return false;
} }
if(in_array($parent_module, array('module', 'addon', 'widget', 'layout'))) if(in_array($parent_module, array('module', 'addon', 'widget', 'layout')))
{ {
return false; return false;
} }
$args = new stdClass; $args = new stdClass;
$args->parent_module = $parent_module; $args->parent_module = $parent_module;
$args->extend_module = $extend_module; $args->extend_module = $extend_module;
$args->type = $type; $args->type = $type;
$args->kind = $kind == 'admin' ? 'admin' : ''; $args->kind = $kind == 'admin' ? 'admin' : '';
$output = executeQuery('module.insertModuleExtend', $args); $output = executeQuery('module.insertModuleExtend', $args);
if($output->toBool()) if($output->toBool())
{ {
@ -166,7 +166,7 @@ class ModuleController extends Module
unset($GLOBALS['__MODULE_EXTEND__']); unset($GLOBALS['__MODULE_EXTEND__']);
FileHandler::removeFile('files/cache/common/module_extend.php'); FileHandler::removeFile('files/cache/common/module_extend.php');
} }
return $output; return $output;
} }
@ -197,10 +197,10 @@ class ModuleController extends Module
{ {
$origin_config->{$key} = $val; $origin_config->{$key} = $val;
} }
return $this->insertModuleConfig($module, $origin_config); return $this->insertModuleConfig($module, $origin_config);
} }
public function updateModuleSectionConfig($module, $section, $config) public function updateModuleSectionConfig($module, $section, $config)
{ {
$origin_config = ModuleModel::getModuleSectionConfig($module, $section) ?: new stdClass; $origin_config = ModuleModel::getModuleSectionConfig($module, $section) ?: new stdClass;
@ -208,7 +208,7 @@ class ModuleController extends Module
{ {
$origin_config->{$key} = $val; $origin_config->{$key} = $val;
} }
return $this->insertModuleSectionConfig($module, $section, $origin_config); return $this->insertModuleSectionConfig($module, $section, $origin_config);
} }
@ -219,13 +219,13 @@ class ModuleController extends Module
{ {
$origin_config->{$key} = $val; $origin_config->{$key} = $val;
} }
return $this->insertModulePartConfig($module, $module_srl, $origin_config); return $this->insertModulePartConfig($module, $module_srl, $origin_config);
} }
/** /**
* Save global config for a module. * Save global config for a module.
* *
* @param string $module * @param string $module
* @param object $config * @param object $config
* @return BaseObject * @return BaseObject
@ -254,7 +254,7 @@ class ModuleController extends Module
} }
$oDB->commit(); $oDB->commit();
//remove from cache //remove from cache
Rhymix\Framework\Cache::clearGroup('site_and_module'); Rhymix\Framework\Cache::clearGroup('site_and_module');
return $output; return $output;
@ -262,7 +262,7 @@ class ModuleController extends Module
/** /**
* Save an independent section of module config. * Save an independent section of module config.
* *
* @param string $module * @param string $module
* @param string $section * @param string $section
* @param object $config * @param object $config
@ -275,7 +275,7 @@ class ModuleController extends Module
/** /**
* Save module config for a specific module_srl. * Save module config for a specific module_srl.
* *
* @param string $module * @param string $module
* @param int $module_srl * @param int $module_srl
* @param object $config * @param object $config
@ -378,7 +378,7 @@ class ModuleController extends Module
{ {
return $output; return $output;
} }
// Check whether the module name already exists // Check whether the module name already exists
if(ModuleModel::isIDExists($args->mid)) if(ModuleModel::isIDExists($args->mid))
{ {
@ -494,7 +494,7 @@ class ModuleController extends Module
{ {
$isMenuCreate = TRUE; $isMenuCreate = TRUE;
} }
$output = $this->arrangeModuleInfo($args, $extra_vars); $output = $this->arrangeModuleInfo($args, $extra_vars);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
// begin transaction // begin transaction
@ -567,7 +567,7 @@ class ModuleController extends Module
foreach($menuOutput->data as $itemInfo) foreach($menuOutput->data as $itemInfo)
{ {
$itemInfo->url = $args->mid; $itemInfo->url = $args->mid;
$updateMenuItemOutput = $oMenuAdminController->updateMenuItem($itemInfo); $updateMenuItemOutput = $oMenuAdminController->updateMenuItem($itemInfo);
if(!$updateMenuItemOutput->toBool()) if(!$updateMenuItemOutput->toBool())
{ {
@ -804,12 +804,12 @@ class ModuleController extends Module
{ {
return; return;
} }
$args = new stdClass(); $args = new stdClass();
$args->module_srl = intval($module_srl); $args->module_srl = intval($module_srl);
$args->member_srl = $member_info->member_srl; $args->member_srl = $member_info->member_srl;
$output = executeQuery('module.insertAdminId', $args); $output = executeQuery('module.insertAdminId', $args);
Rhymix\Framework\Cache::delete("site_and_module:module_admins:" . intval($module_srl)); Rhymix\Framework\Cache::delete("site_and_module:module_admins:" . intval($module_srl));
return $output; return $output;
} }
@ -837,7 +837,7 @@ class ModuleController extends Module
$args->member_srl = $member_info->member_srl; $args->member_srl = $member_info->member_srl;
} }
} }
$output = executeQuery('module.deleteAdminId', $args); $output = executeQuery('module.deleteAdminId', $args);
Rhymix\Framework\Cache::delete("site_and_module:module_admins:" . intval($module_srl)); Rhymix\Framework\Cache::delete("site_and_module:module_admins:" . intval($module_srl));
return $output; return $output;
@ -969,7 +969,7 @@ class ModuleController extends Module
{ {
$this->deleteModuleExtraVars($module_srl); $this->deleteModuleExtraVars($module_srl);
getDestroyXeVars($obj); getDestroyXeVars($obj);
foreach(get_object_vars($obj) as $key => $val) foreach(get_object_vars($obj) as $key => $val)
{ {
if(is_object($val) || is_array($val)) continue; if(is_object($val) || is_array($val)) continue;
@ -981,7 +981,7 @@ class ModuleController extends Module
if(!$args->name || !$args->value) continue; if(!$args->name || !$args->value) continue;
$output = executeQuery('module.insertModuleExtraVars', $args); $output = executeQuery('module.insertModuleExtraVars', $args);
} }
Rhymix\Framework\Cache::delete("site_and_module:module_extra_vars:$module_srl"); Rhymix\Framework\Cache::delete("site_and_module:module_extra_vars:$module_srl");
} }
@ -1021,7 +1021,7 @@ class ModuleController extends Module
executeQuery('module.insertModuleGrant', $args); executeQuery('module.insertModuleGrant', $args);
} }
} }
Rhymix\Framework\Cache::delete("site_and_module:module_grants:$module_srl"); Rhymix\Framework\Cache::delete("site_and_module:module_grants:$module_srl");
} }
@ -1033,7 +1033,7 @@ class ModuleController extends Module
$args = new stdClass(); $args = new stdClass();
$args->module_srl = $module_srl; $args->module_srl = $module_srl;
$output = executeQuery('module.deleteModuleGrants', $args); $output = executeQuery('module.deleteModuleGrants', $args);
Rhymix\Framework\Cache::delete("site_and_module:module_grants:$module_srl"); Rhymix\Framework\Cache::delete("site_and_module:module_grants:$module_srl");
return $output; return $output;
} }
@ -1048,7 +1048,7 @@ class ModuleController extends Module
$output = Context::replaceUserLang($output); $output = Context::replaceUserLang($output);
} }
} }
/** /**
* @brief Add and update a file into the file box * @brief Add and update a file into the file box
*/ */
@ -1181,7 +1181,7 @@ class ModuleController extends Module
// get file path // get file path
$path = ModuleModel::getModuleFileBoxPath($vars->module_filebox_srl); $path = ModuleModel::getModuleFileBoxPath($vars->module_filebox_srl);
FileHandler::makeDir($path); FileHandler::makeDir($path);
$random = Rhymix\Framework\Security::getRandom(32, 'hex'); $random = Rhymix\Framework\Security::getRandom(32, 'hex');
$ext = substr(strrchr($vars->addfile['name'], '.'), 1); $ext = substr(strrchr($vars->addfile['name'], '.'), 1);
$save_filename = sprintf('%s%s.%s', $path, $random, $ext); $save_filename = sprintf('%s%s.%s', $path, $random, $ext);
@ -1224,7 +1224,7 @@ class ModuleController extends Module
{ {
throw new Rhymix\Framework\Exceptions\InvalidRequest; throw new Rhymix\Framework\Exceptions\InvalidRequest;
} }
$vars = new stdClass(); $vars = new stdClass();
$vars->module_filebox_srl = $module_filebox_srl; $vars->module_filebox_srl = $module_filebox_srl;
$output = $this->deleteModuleFileBox($vars); $output = $this->deleteModuleFileBox($vars);
@ -1286,10 +1286,10 @@ class ModuleController extends Module
ModuleModel::$_mid_map = ModuleModel::$_module_srl_map = []; ModuleModel::$_mid_map = ModuleModel::$_module_srl_map = [];
return $output; return $output;
} }
/** /**
* Check if all action-forwardable routes are registered. If not, register them. * Check if all action-forwardable routes are registered. If not, register them.
* *
* @param string $module_name * @param string $module_name
* @return object * @return object
*/ */
@ -1297,7 +1297,7 @@ class ModuleController extends Module
{ {
$action_forward = ModuleModel::getActionForward(); $action_forward = ModuleModel::getActionForward();
$module_action_info = ModuleModel::getModuleActionXml($module_name); $module_action_info = ModuleModel::getModuleActionXml($module_name);
// Get the list of forwardable actions and their routes. // Get the list of forwardable actions and their routes.
$forwardable_routes = array(); $forwardable_routes = array();
foreach ($module_action_info->action ?: [] as $action_name => $action_info) foreach ($module_action_info->action ?: [] as $action_name => $action_info)
@ -1326,7 +1326,7 @@ class ModuleController extends Module
$forwardable_routes[$action_name]['regexp'][] = ['POST', $regexp]; $forwardable_routes[$action_name]['regexp'][] = ['POST', $regexp];
} }
} }
// Insert or delete from the action_forward table. // Insert or delete from the action_forward table.
foreach ($forwardable_routes as $action_name => $route_info) foreach ($forwardable_routes as $action_name => $route_info)
{ {
@ -1348,7 +1348,7 @@ class ModuleController extends Module
{ {
return $output; return $output;
} }
$output = $this->insertActionForward($module_name, $route_info['type'], $action_name, $output = $this->insertActionForward($module_name, $route_info['type'], $action_name,
$route_info['regexp'], $route_info['config'], $route_info['global_route']); $route_info['regexp'], $route_info['config'], $route_info['global_route']);
if (!$output->toBool()) if (!$output->toBool())
@ -1357,7 +1357,7 @@ class ModuleController extends Module
} }
} }
} }
// Clean up any action-forward routes that are no longer needed. // Clean up any action-forward routes that are no longer needed.
foreach ($forwardable_routes as $action_name => $route_info) foreach ($forwardable_routes as $action_name => $route_info)
{ {
@ -1374,7 +1374,7 @@ class ModuleController extends Module
} }
} }
} }
return new BaseObject(); return new BaseObject();
} }
} }

View file

@ -2,5 +2,5 @@
class ModuleMobile extends ModuleView class ModuleMobile extends ModuleView
{ {
} }

View file

@ -33,7 +33,7 @@ class ModuleModel extends Module
{ {
return true; return true;
} }
$dirs = array_map('strtolower', FileHandler::readDir(RX_BASEDIR)); $dirs = array_map('strtolower', FileHandler::readDir(RX_BASEDIR));
$dirs[] = 'rss'; $dirs[] = 'rss';
$dirs[] = 'atom'; $dirs[] = 'atom';
@ -42,7 +42,7 @@ class ModuleModel extends Module
{ {
return true; return true;
} }
// mid test // mid test
$args = new stdClass(); $args = new stdClass();
$args->mid = $id; $args->mid = $id;
@ -51,7 +51,7 @@ class ModuleModel extends Module
return false; return false;
} }
/** /**
* @brief Get all domains * @brief Get all domains
*/ */
@ -92,7 +92,7 @@ class ModuleModel extends Module
$domain_info = false; $domain_info = false;
} }
} }
return $domain_info; return $domain_info;
} }
@ -121,7 +121,7 @@ class ModuleModel extends Module
$domain_info = false; $domain_info = false;
} }
} }
return $domain_info; return $domain_info;
} }
@ -142,7 +142,7 @@ class ModuleModel extends Module
{ {
return false; return false;
} }
$domain = strtolower($domain); $domain = strtolower($domain);
$domain_info = Rhymix\Framework\Cache::get('site_and_module:domain_info:domain:' . $domain); $domain_info = Rhymix\Framework\Cache::get('site_and_module:domain_info:domain:' . $domain);
if ($domain_info === null) if ($domain_info === null)
@ -164,7 +164,7 @@ class ModuleModel extends Module
$domain_info = false; $domain_info = false;
} }
} }
return $domain_info; return $domain_info;
} }
@ -187,7 +187,7 @@ class ModuleModel extends Module
Rhymix\Framework\Cache::set('site_and_module:document_srl:' . $document_srl, $module_info, 0, true); Rhymix\Framework\Cache::set('site_and_module:document_srl:' . $document_srl, $module_info, 0, true);
} }
} }
self::_applyDefaultSkin($module_info); self::_applyDefaultSkin($module_info);
return self::addModuleExtraVars($module_info); return self::addModuleExtraVars($module_info);
} }
@ -200,7 +200,7 @@ class ModuleModel extends Module
// Get current domain. // Get current domain.
$domain = $domain ?: strtolower(preg_replace('/:\d+$/', '', $_SERVER['HTTP_HOST'])); $domain = $domain ?: strtolower(preg_replace('/:\d+$/', '', $_SERVER['HTTP_HOST']));
$domain = Rhymix\Framework\URL::decodeIdna($domain); $domain = Rhymix\Framework\URL::decodeIdna($domain);
// Find the domain information. // Find the domain information.
$domain_info = self::getSiteInfoByDomain($domain); $domain_info = self::getSiteInfoByDomain($domain);
if (!$domain_info) if (!$domain_info)
@ -212,7 +212,7 @@ class ModuleModel extends Module
} }
$domain_info->is_default_replaced = true; $domain_info->is_default_replaced = true;
} }
// Fill in module extra vars and return. // Fill in module extra vars and return.
if ($domain_info->module_srl) if ($domain_info->module_srl)
{ {
@ -246,7 +246,7 @@ class ModuleModel extends Module
{ {
$module_info = null; $module_info = null;
} }
if($module_info === null) if($module_info === null)
{ {
$output = executeQuery('module.getMidInfo', $args); $output = executeQuery('module.getMidInfo', $args);
@ -339,7 +339,7 @@ class ModuleModel extends Module
{ {
$mid_info = null; $mid_info = null;
} }
if($mid_info === null) if($mid_info === null)
{ {
Rhymix\Framework\Cache::set('site_and_module:module_srl:' . $mid, $output->data->module_srl, 0, true); Rhymix\Framework\Cache::set('site_and_module:module_srl:' . $mid, $output->data->module_srl, 0, true);
@ -411,7 +411,7 @@ class ModuleModel extends Module
/** /**
* @brief Shortcut to getModuleInfoByModuleSrl() * @brief Shortcut to getModuleInfoByModuleSrl()
* *
* @param int $module_srl * @param int $module_srl
* @return object * @return object
*/ */
@ -471,14 +471,14 @@ class ModuleModel extends Module
{ {
return []; return [];
} }
$cache_key = 'site_and_module:modules_info:' . implode(',', $module_srls) . ':' . implode(',', $columnList ?: []); $cache_key = 'site_and_module:modules_info:' . implode(',', $module_srls) . ':' . implode(',', $columnList ?: []);
$result = Rhymix\Framework\Cache::get($cache_key); $result = Rhymix\Framework\Cache::get($cache_key);
if ($result !== null) if ($result !== null)
{ {
return $result; return $result;
} }
$args = new stdClass(); $args = new stdClass();
$args->module_srls = $module_srls; $args->module_srls = $module_srls;
$output = executeQueryArray('module.getModulesInfo', $args, $columnList); $output = executeQueryArray('module.getModulesInfo', $args, $columnList);
@ -487,7 +487,7 @@ class ModuleModel extends Module
{ {
$result = self::addModuleExtraVars($result); $result = self::addModuleExtraVars($result);
} }
Rhymix\Framework\Cache::set($cache_key, $result, 0, true); Rhymix\Framework\Cache::set($cache_key, $result, 0, true);
return $result; return $result;
} }
@ -539,14 +539,14 @@ class ModuleModel extends Module
{ {
unset($args->site_srl); unset($args->site_srl);
} }
// Check if there are any arguments. // Check if there are any arguments.
$argsCount = $args === null ? 0 : countobj($args); $argsCount = $args === null ? 0 : countobj($args);
if(!$argsCount) if(!$argsCount)
{ {
$columnList = array(); $columnList = array();
} }
// Use cache only if there are no arguments. Otherwise, get data from DB. // Use cache only if there are no arguments. Otherwise, get data from DB.
$list = $argsCount ? null : Rhymix\Framework\Cache::get('site_and_module:module:mid_list'); $list = $argsCount ? null : Rhymix\Framework\Cache::get('site_and_module:module:mid_list');
if($list === null) if($list === null)
@ -554,14 +554,14 @@ class ModuleModel extends Module
$output = executeQueryArray('module.getMidList', $args, $columnList); $output = executeQueryArray('module.getMidList', $args, $columnList);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
$list = $output->data; $list = $output->data;
// Set cache only if there are no arguments. // Set cache only if there are no arguments.
if(!$argsCount) if(!$argsCount)
{ {
Rhymix\Framework\Cache::set('site_and_module:module:mid_list', $list, 0, true); Rhymix\Framework\Cache::set('site_and_module:module:mid_list', $list, 0, true);
} }
} }
if(!$list) return; if(!$list) return;
if(!is_array($list)) $list = array($list); if(!is_array($list)) $list = array($list);
@ -590,7 +590,7 @@ class ModuleModel extends Module
/** /**
* @brief Return an array of module_srl corresponding to a mid list * @brief Return an array of module_srl corresponding to a mid list
* *
* @param int|string|array $mid * @param int|string|array $mid
* @param bool $assoc * @param bool $assoc
* @return array * @return array
@ -601,7 +601,7 @@ class ModuleModel extends Module
{ {
$mid = explode(',', $mid); $mid = explode(',', $mid);
} }
if (count($mid) == 1 && ($first_mid = array_first($mid)) && isset(self::$_mid_map[$first_mid])) if (count($mid) == 1 && ($first_mid = array_first($mid)) && isset(self::$_mid_map[$first_mid]))
{ {
return array($first_mid => self::$_mid_map[$first_mid]); return array($first_mid => self::$_mid_map[$first_mid]);
@ -610,7 +610,7 @@ class ModuleModel extends Module
$args = new stdClass; $args = new stdClass;
$args->mid = $mid; $args->mid = $mid;
$output = executeQueryArray('module.getModuleSrlByMid', $args); $output = executeQueryArray('module.getModuleSrlByMid', $args);
$module_srl_list = []; $module_srl_list = [];
foreach($output->data as $row) foreach($output->data as $row)
{ {
@ -623,7 +623,7 @@ class ModuleModel extends Module
/** /**
* @brief Return mid corresponding to a module_srl list * @brief Return mid corresponding to a module_srl list
* *
* @param int|array $module_srl * @param int|array $module_srl
* @return string|array * @return string|array
*/ */
@ -638,19 +638,19 @@ class ModuleModel extends Module
} }
return $result; return $result;
} }
$module_srl = intval($module_srl); $module_srl = intval($module_srl);
if (isset(self::$_module_srl_map[$module_srl])) if (isset(self::$_module_srl_map[$module_srl]))
{ {
return self::$_module_srl_map[$module_srl]; return self::$_module_srl_map[$module_srl];
} }
$mid = Rhymix\Framework\Cache::get('site_and_module:module_srl_mid:' . $module_srl); $mid = Rhymix\Framework\Cache::get('site_and_module:module_srl_mid:' . $module_srl);
if (isset($mid)) if (isset($mid))
{ {
return $mid; return $mid;
} }
$args = new stdClass; $args = new stdClass;
$args->module_srls = $module_srl; $args->module_srls = $module_srl;
$output = executeQuery('module.getModuleInfoByModuleSrl', $args, ['mid']); $output = executeQuery('module.getModuleInfoByModuleSrl', $args, ['mid']);
@ -680,7 +680,7 @@ class ModuleModel extends Module
{ {
return; return;
} }
$action_forward = array(); $action_forward = array();
foreach($output->data as $item) foreach($output->data as $item)
{ {
@ -688,10 +688,10 @@ class ModuleModel extends Module
if ($item->route_config) $item->route_config = unserialize($item->route_config); if ($item->route_config) $item->route_config = unserialize($item->route_config);
$action_forward[$item->act] = $item; $action_forward[$item->act] = $item;
} }
Rhymix\Framework\Cache::set('action_forward', $action_forward, 0, true); Rhymix\Framework\Cache::set('action_forward', $action_forward, 0, true);
} }
if(!isset($act)) if(!isset($act))
{ {
return $action_forward; return $action_forward;
@ -700,7 +700,7 @@ class ModuleModel extends Module
{ {
return; return;
} }
return $action_forward[$act]; return $action_forward[$act];
} }
@ -736,7 +736,7 @@ class ModuleModel extends Module
Rhymix\Framework\Cache::set('triggers', $triggers, 0, true); Rhymix\Framework\Cache::set('triggers', $triggers, 0, true);
} }
} }
$triggers = $triggers ?: array(); $triggers = $triggers ?: array();
foreach($triggers as $item) foreach($triggers as $item)
{ {
@ -770,7 +770,7 @@ class ModuleModel extends Module
/** /**
* @brief Get module extend * @brief Get module extend
* *
* @deprecated * @deprecated
*/ */
public static function getModuleExtend($parent_module, $type, $kind = '') public static function getModuleExtend($parent_module, $type, $kind = '')
@ -780,9 +780,9 @@ class ModuleModel extends Module
/** /**
* @brief Get all the module extend * @brief Get all the module extend
* *
* @deprecated * @deprecated
* *
*/ */
public static function loadModuleExtends() public static function loadModuleExtends()
{ {
@ -799,7 +799,7 @@ class ModuleModel extends Module
if (!$module_path) return; if (!$module_path) return;
$xml_file = $module_path . 'conf/info.xml'; $xml_file = $module_path . 'conf/info.xml';
if (!file_exists($xml_file)) return; if (!file_exists($xml_file)) return;
// Load the XML file and cache the definition. // Load the XML file and cache the definition.
$lang_type = Context::getLangType() ?: 'en'; $lang_type = Context::getLangType() ?: 'en';
$mtime1 = filemtime($xml_file); $mtime1 = filemtime($xml_file);
@ -811,7 +811,7 @@ class ModuleModel extends Module
$info = Rhymix\Framework\Parsers\ModuleInfoParser::loadXML($xml_file); $info = Rhymix\Framework\Parsers\ModuleInfoParser::loadXML($xml_file);
Rhymix\Framework\Cache::set($cache_key, $info, 0, true); Rhymix\Framework\Cache::set($cache_key, $info, 0, true);
} }
return $info; return $info;
} }
@ -825,7 +825,7 @@ class ModuleModel extends Module
if (!$module_path) return; if (!$module_path) return;
$xml_file = $module_path . 'conf/module.xml'; $xml_file = $module_path . 'conf/module.xml';
if (!file_exists($xml_file)) return; if (!file_exists($xml_file)) return;
// Load the XML file and cache the definition. // Load the XML file and cache the definition.
$lang_type = Context::getLangType() ?: 'en'; $lang_type = Context::getLangType() ?: 'en';
$mtime = filemtime($xml_file); $mtime = filemtime($xml_file);
@ -836,10 +836,10 @@ class ModuleModel extends Module
$info = Rhymix\Framework\Parsers\ModuleActionParser::loadXML($xml_file); $info = Rhymix\Framework\Parsers\ModuleActionParser::loadXML($xml_file);
Rhymix\Framework\Cache::set($cache_key, $info, 0, true); Rhymix\Framework\Cache::set($cache_key, $info, 0, true);
} }
return $info; return $info;
} }
/** /**
* Get a skin list for js API. * Get a skin list for js API.
* return void * return void
@ -925,7 +925,7 @@ class ModuleModel extends Module
{ {
$moduleName = 'ARTICLE'; $moduleName = 'ARTICLE';
} }
$useDefaultList = array(); $useDefaultList = array();
if(array_key_exists($moduleName, $installedMenuTypes)) if(array_key_exists($moduleName, $installedMenuTypes))
{ {
@ -966,7 +966,7 @@ class ModuleModel extends Module
{ {
return; return;
} }
// Create XmlParser object // Create XmlParser object
$oXmlParser = new XeXmlParser(); $oXmlParser = new XeXmlParser();
$_xml_obj = $oXmlParser->loadXmlFile($skin_xml_file); $_xml_obj = $oXmlParser->loadXmlFile($skin_xml_file);
@ -1017,12 +1017,12 @@ class ModuleModel extends Module
{ {
continue; continue;
} }
if(!is_array($group->var)) if(!is_array($group->var))
{ {
$extra_vars = array($group->var); $extra_vars = array($group->var);
} }
foreach($extra_vars as $key => $val) foreach($extra_vars as $key => $val)
{ {
$obj = new stdClass; $obj = new stdClass;
@ -1033,7 +1033,7 @@ class ModuleModel extends Module
$obj->description = $val->description->body ?? null; $obj->description = $val->description->body ?? null;
$obj->value = $val->attrs->value ?? null; $obj->value = $val->attrs->value ?? null;
$obj->default = $val->attrs->default ?? null; $obj->default = $val->attrs->default ?? null;
if(preg_match('/,|\|@\|/', $obj->value ?? '', $delimiter) && $delimiter[0]) if(preg_match('/,|\|@\|/', $obj->value ?? '', $delimiter) && $delimiter[0])
{ {
$obj->value = explode($delimiter[0], $obj->value); $obj->value = explode($delimiter[0], $obj->value);
@ -1042,7 +1042,7 @@ class ModuleModel extends Module
{ {
$obj->value = array($obj->value); $obj->value = array($obj->value);
} }
// Get an option list from 'select'type // Get an option list from 'select'type
if(is_array($val->options)) if(is_array($val->options))
{ {
@ -1061,7 +1061,7 @@ class ModuleModel extends Module
$obj->options[0]->title = $val->options->title->body ?? null; $obj->options[0]->title = $val->options->title->body ?? null;
$obj->options[0]->value = $val->options->attrs->value ?? null; $obj->options[0]->value = $val->options->attrs->value ?? null;
} }
$skin_info->extra_vars[] = $obj; $skin_info->extra_vars[] = $obj;
} }
} }
@ -1209,7 +1209,7 @@ class ModuleModel extends Module
/** /**
* Get global config for a module. * Get global config for a module.
* *
* @param string $module * @param string $module
* @return mixed * @return mixed
*/ */
@ -1223,7 +1223,7 @@ class ModuleModel extends Module
$args = new stdClass; $args = new stdClass;
$args->module = $module; $args->module = $module;
$output = executeQuery('module.getModuleConfig', $args); $output = executeQuery('module.getModuleConfig', $args);
// Only object type // Only object type
if(isset($output->data->config) && $output->data->config) if(isset($output->data->config) && $output->data->config)
{ {
@ -1233,7 +1233,7 @@ class ModuleModel extends Module
{ {
$config = -1; // Use -1 as a temporary value because null cannot be cached $config = -1; // Use -1 as a temporary value because null cannot be cached
} }
// Set cache // Set cache
if($output->toBool()) if($output->toBool())
{ {
@ -1242,14 +1242,14 @@ class ModuleModel extends Module
} }
$GLOBALS['__ModuleConfig__'][$module] = $config; $GLOBALS['__ModuleConfig__'][$module] = $config;
} }
$config = $GLOBALS['__ModuleConfig__'][$module]; $config = $GLOBALS['__ModuleConfig__'][$module];
return $config === -1 ? null : $config; return $config === -1 ? null : $config;
} }
/** /**
* Get an independent section of module config. * Get an independent section of module config.
* *
* @param string $module * @param string $module
* @param string $section * @param string $section
* @return mixed * @return mixed
@ -1261,7 +1261,7 @@ class ModuleModel extends Module
/** /**
* Get config for a specific module_srl. * Get config for a specific module_srl.
* *
* @param string module * @param string module
* @param int $module_srl * @param int $module_srl
* @return mixed * @return mixed
@ -1277,7 +1277,7 @@ class ModuleModel extends Module
$args->module = $module; $args->module = $module;
$args->module_srl = $module_srl ?: 0; $args->module_srl = $module_srl ?: 0;
$output = executeQuery('module.getModulePartConfig', $args); $output = executeQuery('module.getModulePartConfig', $args);
// Object or Array(compatibility) type // Object or Array(compatibility) type
if($output->data && isset($output->data->config)) if($output->data && isset($output->data->config))
{ {
@ -1287,13 +1287,13 @@ class ModuleModel extends Module
{ {
$config = -1; // Use -1 as a temporary value because null cannot be cached $config = -1; // Use -1 as a temporary value because null cannot be cached
} }
// Deprecate use of ArrayObject because of https://bugs.php.net/bug.php?id=77298 // Deprecate use of ArrayObject because of https://bugs.php.net/bug.php?id=77298
if($config instanceof ArrayObject) if($config instanceof ArrayObject)
{ {
$config = (object)($config->getArrayCopy()); $config = (object)($config->getArrayCopy());
} }
// Set cache // Set cache
if($output->toBool()) if($output->toBool())
{ {
@ -1302,7 +1302,7 @@ class ModuleModel extends Module
} }
$GLOBALS['__ModulePartConfig__'][$module][$module_srl] = $config; $GLOBALS['__ModulePartConfig__'][$module][$module_srl] = $config;
} }
$config = $GLOBALS['__ModulePartConfig__'][$module][$module_srl]; $config = $GLOBALS['__ModulePartConfig__'][$module][$module_srl];
return $config === -1 ? null : $config; return $config === -1 ? null : $config;
} }
@ -1315,18 +1315,18 @@ class ModuleModel extends Module
$args = new stdClass(); $args = new stdClass();
$args->module = $module; $args->module = $module;
$output = executeQueryArray('module.getModulePartConfigs', $args); $output = executeQueryArray('module.getModulePartConfigs', $args);
if(!$output->toBool() || !$output->data) if(!$output->toBool() || !$output->data)
{ {
return array(); return array();
} }
$result = array(); $result = array();
foreach($output->data as $key => $val) foreach($output->data as $key => $val)
{ {
$result[$val->module_srl] = unserialize($val->config); $result[$val->module_srl] = unserialize($val->config);
} }
return $result; return $result;
} }
@ -1395,9 +1395,9 @@ class ModuleModel extends Module
/** /**
* Get module install class * Get module install class
* *
* This method supports namespaced modules as well as XE-compatible modules. * This method supports namespaced modules as well as XE-compatible modules.
* *
* @param string $module_name * @param string $module_name
* @return ModuleObject|null * @return ModuleObject|null
*/ */
@ -1487,7 +1487,7 @@ class ModuleModel extends Module
$searched_count = count($searched_list); $searched_count = count($searched_list);
if(!$searched_count) return; if(!$searched_count) return;
// Get action forward // Get action forward
$action_forward = self::getActionForward(); $action_forward = self::getActionForward();
@ -1506,7 +1506,7 @@ class ModuleModel extends Module
$table_count++; $table_count++;
} }
} }
// Check if the table is created // Check if the table is created
$created_table_count = 0; $created_table_count = 0;
foreach ($schema_files as $filename) foreach ($schema_files as $filename)
@ -1515,7 +1515,7 @@ class ModuleModel extends Module
{ {
continue; continue;
} }
if($oDB->isTableExists($matches[1])) if($oDB->isTableExists($matches[1]))
{ {
$created_table_count++; $created_table_count++;
@ -1532,7 +1532,7 @@ class ModuleModel extends Module
$info->table_count = $table_count; $info->table_count = $table_count;
$info->path = $path; $info->path = $path;
$info->admin_index_act = $info->admin_index_act ?? null; $info->admin_index_act = $info->admin_index_act ?? null;
if(!Context::isBlacklistedPlugin($module_name, 'module')) if(!Context::isBlacklistedPlugin($module_name, 'module'))
{ {
// Check if DB is installed // Check if DB is installed
@ -1544,7 +1544,7 @@ class ModuleModel extends Module
{ {
$info->need_install = false; $info->need_install = false;
} }
// Check if it is upgraded to module.class.php on each module // Check if it is upgraded to module.class.php on each module
$oDummy = self::getModuleInstallClass($module_name); $oDummy = self::getModuleInstallClass($module_name);
if($oDummy && method_exists($oDummy, "checkUpdate")) if($oDummy && method_exists($oDummy, "checkUpdate"))
@ -1552,7 +1552,7 @@ class ModuleModel extends Module
$info->need_update = $oDummy->checkUpdate(); $info->need_update = $oDummy->checkUpdate();
} }
unset($oDummy); unset($oDummy);
// Check if all action-forwardable routes are registered // Check if all action-forwardable routes are registered
$module_action_info = self::getModuleActionXml($module_name); $module_action_info = self::getModuleActionXml($module_name);
$forwardable_routes = array(); $forwardable_routes = array();
@ -1589,7 +1589,7 @@ class ModuleModel extends Module
$info->need_update = true; $info->need_update = true;
} }
} }
// Clean up any action-forward routes that are no longer needed. // Clean up any action-forward routes that are no longer needed.
foreach ($forwardable_routes as $action_name => $route_info) foreach ($forwardable_routes as $action_name => $route_info)
{ {
@ -1694,7 +1694,7 @@ class ModuleModel extends Module
if(!$site_module_info) return false; if(!$site_module_info) return false;
$module_srl = $site_module_info->module_srl; $module_srl = $site_module_info->module_srl;
} }
$module_srl = $module_srl ?: 0; $module_srl = $module_srl ?: 0;
$module_admins = Rhymix\Framework\Cache::get("site_and_module:module_admins:$module_srl"); $module_admins = Rhymix\Framework\Cache::get("site_and_module:module_admins:$module_srl");
if ($module_admins === null) if ($module_admins === null)
@ -1930,7 +1930,7 @@ class ModuleModel extends Module
public static function syncMobileSkinInfoToModuleInfo(&$module_info) public static function syncMobileSkinInfoToModuleInfo(&$module_info)
{ {
if(!$module_info->module_srl) return; if(!$module_info->module_srl) return;
$skin_vars = Rhymix\Framework\Cache::get('site_and_module:module_mobile_skin_vars:' . $module_info->module_srl); $skin_vars = Rhymix\Framework\Cache::get('site_and_module:module_mobile_skin_vars:' . $module_info->module_srl);
if($skin_vars === null) if($skin_vars === null)
{ {
@ -1950,7 +1950,7 @@ class ModuleModel extends Module
$module_info->{$val->name} = $val->value; $module_info->{$val->name} = $val->value;
} }
} }
/** /**
* @brief Return privileges(granted) information by using module info, xml info and member info * @brief Return privileges(granted) information by using module info, xml info and member info
*/ */
@ -1961,7 +1961,7 @@ class ModuleModel extends Module
$module_info = new stdClass; $module_info = new stdClass;
$module_info->module = $module_info->module_srl = 0; $module_info->module = $module_info->module_srl = 0;
} }
if (isset($GLOBALS['__MODULE_GRANT__'][$module_info->module][intval($module_info->module_srl ?? 0)][intval($member_info->member_srl ?? 0)])) if (isset($GLOBALS['__MODULE_GRANT__'][$module_info->module][intval($module_info->module_srl ?? 0)][intval($member_info->member_srl ?? 0)]))
{ {
$__cache = &$GLOBALS['__MODULE_GRANT__'][$module_info->module][intval($module_info->module_srl ?? 0)][intval($member_info->member_srl ?? 0)]; $__cache = &$GLOBALS['__MODULE_GRANT__'][$module_info->module][intval($module_info->module_srl ?? 0)][intval($member_info->member_srl ?? 0)];
@ -1970,30 +1970,30 @@ class ModuleModel extends Module
return $__cache; return $__cache;
} }
} }
$grant = new stdClass; $grant = new stdClass;
// Get information of module.xml // Get information of module.xml
if(!$xml_info) if(!$xml_info)
{ {
$xml_info = self::getModuleActionXml($module_info->module); $xml_info = self::getModuleActionXml($module_info->module);
} }
$xml_grant_list = isset($xml_info->grant) ? (array)$xml_info->grant : array(); $xml_grant_list = isset($xml_info->grant) ? (array)$xml_info->grant : array();
// Get group information of member // Get group information of member
$member_group = !empty($member_info->group_list) ? array_keys($member_info->group_list) : array(); $member_group = !empty($member_info->group_list) ? array_keys($member_info->group_list) : array();
$is_module_admin = !empty($module_info->module_srl) ? self::isModuleAdmin($member_info, $module_info->module_srl) : false; $is_module_admin = !empty($module_info->module_srl) ? self::isModuleAdmin($member_info, $module_info->module_srl) : false;
// Get 'privilege name' list from module.xml // Get 'privilege name' list from module.xml
$privilege_list = array_keys($xml_grant_list); $privilege_list = array_keys($xml_grant_list);
// Prepend default 'privilege name' // Prepend default 'privilege name'
// manager, is_site_admin not distinguish because of compatibility. // manager, is_site_admin not distinguish because of compatibility.
array_unshift($privilege_list, 'access', 'is_admin', 'manager', 'is_site_admin', 'root'); array_unshift($privilege_list, 'access', 'is_admin', 'manager', 'is_site_admin', 'root');
// Unique // Unique
$privilege_list = array_unique($privilege_list, SORT_STRING); $privilege_list = array_unique($privilege_list, SORT_STRING);
// Grant first // Grant first
foreach($privilege_list as $val) foreach($privilege_list as $val)
{ {
@ -2018,12 +2018,12 @@ class ModuleModel extends Module
$grant->{$val} = false; $grant->{$val} = false;
} }
} }
// If access were not granted, check more // If access were not granted, check more
if(!$grant->access) if(!$grant->access)
{ {
$checked = array(); $checked = array();
// Grant privileges by information that get from the DB // Grant privileges by information that get from the DB
foreach(self::getModuleGrants($module_info->module_srl)->data as $val) foreach(self::getModuleGrants($module_info->module_srl)->data as $val)
{ {
@ -2032,14 +2032,14 @@ class ModuleModel extends Module
{ {
continue; continue;
} }
// All user // All user
if($val->group_srl == 0) if($val->group_srl == 0)
{ {
$grant->{$val->name} = true; $grant->{$val->name} = true;
continue; continue;
} }
// Log-in member only // Log-in member only
if($member_info && $member_info->member_srl) if($member_info && $member_info->member_srl)
{ {
@ -2062,13 +2062,13 @@ class ModuleModel extends Module
} }
} }
} }
// Grant access by default // Grant access by default
if(!isset($checked['access'])) if(!isset($checked['access']))
{ {
$grant->access = true; $grant->access = true;
} }
// Grant privileges by default information of module // Grant privileges by default information of module
foreach($xml_grant_list as $name => $item) foreach($xml_grant_list as $name => $item)
{ {
@ -2076,15 +2076,15 @@ class ModuleModel extends Module
{ {
continue; continue;
} }
// All user // All user
if($item->default == 'guest') if($item->default == 'guest')
{ {
$grant->{$name} = true; $grant->{$name} = true;
continue; continue;
} }
// Log-in member only // Log-in member only
if($member_info && $member_info->member_srl) if($member_info && $member_info->member_srl)
{ {
@ -2095,13 +2095,13 @@ class ModuleModel extends Module
} }
} }
} }
return $__cache = $grant; return $__cache = $grant;
} }
/** /**
* Get the list of modules that the member can access. * Get the list of modules that the member can access.
* *
* @param object $member_info * @param object $member_info
* @return array * @return array
*/ */
@ -2111,13 +2111,13 @@ class ModuleModel extends Module
{ {
$member_info = Context::get('logged_info'); $member_info = Context::get('logged_info');
} }
$result = Rhymix\Framework\Cache::get(sprintf('site_and_module:accessible_modules:%d', $member_info->member_srl)); $result = Rhymix\Framework\Cache::get(sprintf('site_and_module:accessible_modules:%d', $member_info->member_srl));
if($result === null) if($result === null)
{ {
$mid_list = self::getMidList(); $mid_list = self::getMidList();
$result = array(); $result = array();
foreach($mid_list as $module_info) foreach($mid_list as $module_info)
{ {
$grant = self::getGrant($module_info, $member_info); $grant = self::getGrant($module_info, $member_info);
@ -2135,13 +2135,13 @@ class ModuleModel extends Module
$result[$module_info->module_srl] = $module_info; $result[$module_info->module_srl] = $module_info;
} }
ksort($result); ksort($result);
Rhymix\Framework\Cache::set(sprintf('site_and_module:accessible_modules:%d', $member_info->member_srl), $result); Rhymix\Framework\Cache::set(sprintf('site_and_module:accessible_modules:%d', $member_info->member_srl), $result);
} }
return $result; return $result;
} }
/** /**
* Get privileges(granted) information of the member for target module by target_srl * Get privileges(granted) information of the member for target module by target_srl
* @param string $target_srl as module_srl. It may be a reference serial number * @param string $target_srl as module_srl. It may be a reference serial number
@ -2155,7 +2155,7 @@ class ModuleModel extends Module
{ {
return false; return false;
} }
if($type) if($type)
{ {
if($type == 'document') if($type == 'document')
@ -2175,25 +2175,25 @@ class ModuleModel extends Module
$module_info = self::getModuleInfoByMid($target_srl); $module_info = self::getModuleInfoByMid($target_srl);
} }
} }
if(!isset($module_info)) if(!isset($module_info))
{ {
$module_info = self::getModuleInfoByModuleSrl($target_srl); $module_info = self::getModuleInfoByModuleSrl($target_srl);
} }
if(!$module_info->module_srl) if(!$module_info->module_srl)
{ {
return false; return false;
} }
if(!$member_info) if(!$member_info)
{ {
$member_info = Context::get('logged_info'); $member_info = Context::get('logged_info');
} }
return self::getGrant($module_info, $member_info); return self::getGrant($module_info, $member_info);
} }
/** /**
* @brief Search all modules to find manager privilege of the member * @brief Search all modules to find manager privilege of the member
* @param object $member_info member information * @param object $member_info member information
@ -2206,23 +2206,23 @@ class ModuleModel extends Module
{ {
return false; return false;
} }
foreach($mid_list as $module_info) foreach($mid_list as $module_info)
{ {
if($module && $module_info->module != $module) if($module && $module_info->module != $module)
{ {
continue; continue;
} }
if(($grant = self::getGrant($module_info, $member_info)) && $grant->manager) if(($grant = self::getGrant($module_info, $member_info)) && $grant->manager)
{ {
return $grant; return $grant;
} }
} }
return false; return false;
} }
/** /**
* @brief Get module grants * @brief Get module grants
*/ */

View file

@ -23,7 +23,7 @@ class ModuleView extends Module
{ {
$selected_module = Context::get('selected_module'); $selected_module = Context::get('selected_module');
$skin = preg_replace('/[^a-zA-Z0-9-_]/', '', Context::get('skin')); $skin = preg_replace('/[^a-zA-Z0-9-_]/', '', Context::get('skin'));
// Get modules/skin information // Get modules/skin information
$module_path = sprintf("./modules/%s/", $selected_module); $module_path = sprintf("./modules/%s/", $selected_module);
if(!is_dir($module_path)) throw new Rhymix\Framework\Exceptions\InvalidRequest; if(!is_dir($module_path)) throw new Rhymix\Framework\Exceptions\InvalidRequest;
@ -46,32 +46,32 @@ class ModuleView extends Module
// Get a list of modules at the site // Get a list of modules at the site
$args = new stdClass; $args = new stdClass;
$output = executeQueryArray(isset($query_id) ? $query_id : 'module.getSiteModules', $args); $output = executeQueryArray(isset($query_id) ? $query_id : 'module.getSiteModules', $args);
$mid_list = array(); $mid_list = array();
foreach($output->data as $key => $val) foreach($output->data as $key => $val)
{ {
if(!ModuleModel::getGrant($val, Context::get('logged_info'))->manager) if(!ModuleModel::getGrant($val, Context::get('logged_info'))->manager)
{ {
continue; continue;
} }
if(!isset($mid_list[$val->module])) if(!isset($mid_list[$val->module]))
{ {
$mid_list[$val->module] = new stdClass; $mid_list[$val->module] = new stdClass;
$mid_list[$val->module]->list = array(); $mid_list[$val->module]->list = array();
} }
$obj = new stdClass; $obj = new stdClass;
$obj->module_srl = $val->module_srl; $obj->module_srl = $val->module_srl;
$obj->browser_title = $val->browser_title; $obj->browser_title = $val->browser_title;
$mid_list[$val->module]->list[$val->category ?: 0][$val->mid] = $obj; $mid_list[$val->module]->list[$val->category ?: 0][$val->mid] = $obj;
$mid_list[$val->module]->title = ModuleModel::getModuleInfoXml($val->module)->title; $mid_list[$val->module]->title = ModuleModel::getModuleInfoXml($val->module)->title;
} }
Context::set('mid_list', $mid_list); Context::set('mid_list', $mid_list);
if(!empty($mid_list)) if(!empty($mid_list))
{ {
if(($selected_module = Context::get('selected_module')) && isset($mid_list[$selected_module]->list)) if(($selected_module = Context::get('selected_module')) && isset($mid_list[$selected_module]->list))
@ -88,10 +88,10 @@ class ModuleView extends Module
{ {
Context::set('selected_mids', array()); Context::set('selected_mids', array());
} }
$security = new Security(); $security = new Security();
$security->encodeHTML('id', 'type', 'site_keyword'); $security->encodeHTML('id', 'type', 'site_keyword');
$this->setLayoutFile('popup_layout'); $this->setLayoutFile('popup_layout');
$this->setTemplateFile('module_selector'); $this->setTemplateFile('module_selector');
} }