fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-27 22:33:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 2119. supporting php 5.4. modules and widgets.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12706 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-02-05 09:45:04 +00:00
parent ff75082eee
commit 8a7c28babc
90 changed files with 572 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -115,6 +115,7 @@ class moduleAdminController extends module
$columnList = array('module', 'module_category_srl', 'layout_srl', 'use_mobile', 'mlayout_srl', 'menu_srl', 'site_srl', 'skin', 'mskin', 'description', 'mcontent', 'open_rss', 'header_text', 'footer_text', 'regdate');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
// Get permission information
$module_args = new stdClass();
$module_args->module_srl = $module_srl;
$output = executeQueryArray('module.getModuleGrants', $module_args);
$grant = array();
@ -124,10 +125,12 @@ class moduleAdminController extends module
}
// get Extra Vars
$extra_args = new stdClass();
$extra_args->module_srl = $module_srl;
$extra_output = executeQueryArray('module.getModuleExtraVars', $extra_args);
if($extra_output->toBool() && is_array($extra_output->data))
{
$extra_vars = new stdClass();
foreach($extra_output->data as $info)
{
$extra_vars->{$info->name} = $info->value;
@ -156,6 +159,7 @@ class moduleAdminController extends module
$oDB = &DB::getInstance();
$oDB->begin();
// Copy a module
$triggerObj = new stdClass();
$triggerObj->originModuleSrl = $module_srl;
$triggerObj->moduleSrlList = array();
@ -275,7 +279,9 @@ class moduleAdminController extends module
$grant_list = $xml_info->grant;
$grant_list->access = new stdClass();
$grant_list->access->default = 'guest';
$grant_list->manager = new stdClass();
$grant_list->manager->default = 'manager';
foreach($grant_list as $grant_name => $grant_info)
@ -305,6 +311,7 @@ class moduleAdminController extends module
}
// Stored in the DB
$args = new stdClass();
$args->module_srl = $module_srl;
$output = executeQuery('module.deleteModuleGrants', $args);
if(!$output->toBool()) return $output;
@ -315,7 +322,7 @@ class moduleAdminController extends module
{
foreach($group_srls as $key => $val)
{
$args = null;
$args = new stdClass();
$args->module_srl = $module_srl;
$args->name = $grant_name;
$args->group_srl = $val;
@ -532,7 +539,9 @@ class moduleAdminController extends module
$xml_info = $oModuleModel->getModuleActionXml($module_info->module);
$grant_list = $xml_info->grant;
$grant_list->access = new stdClass();
$grant_list->access->default = 'guest';
$grant_list->manager = new stdClass();
$grant_list->manager->default = 'manager';
foreach($grant_list as $grant_name => $grant_info)
@ -567,7 +576,7 @@ class moduleAdminController extends module
// Stored in the DB
foreach($modules as $module_srl)
{
$args = null;
$args = new stdClass();
$args->module_srl = $module_srl;
$output = executeQuery('module.deleteModuleGrants', $args);
if(!$output->toBool()) continue;
@ -576,7 +585,7 @@ class moduleAdminController extends module
{
foreach($group_srls as $key => $val)
{
$args = null;
$args = new stdClass();
$args->module_srl = $module_srl;
$args->name = $grant_name;
$args->group_srl = $val;
@ -614,6 +623,7 @@ class moduleAdminController extends module
$site_module_info = Context::get('site_module_info');
$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'));
@ -664,6 +674,7 @@ 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'));
@ -794,6 +805,8 @@ class moduleAdminController extends module
*/
function makeCacheDefinedLangCode($site_srl = 0)
{
$args = new stdClass();
// Get the language file of the current site
if(!$site_srl)
{

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

@ -56,7 +56,13 @@ class moduleAdminModel extends module
function getSelectedManageHTML($grantList, $tabChoice = array())
{
$grant_list =new stdClass();
// Grant virtual permission for access and manager
if(!$grantList)
{
$grantList =new stdClass();
}
$grantList->access = new stdClass();
$grantList->access->title = Context::getLang('grant_access');
$grantList->access->default = 'guest';
if(count($grantList))
@ -68,6 +74,7 @@ class moduleAdminModel extends module
$grant_list->{$key} = $val;
}
}
$grant_list->manager = new stdClass();
$grant_list->manager->title = Context::getLang('grant_manager');
$grant_list->manager->default = 'manager';
Context::set('grant_list', $grant_list);
@ -116,6 +123,8 @@ class moduleAdminModel extends module
$columnList = array('module_srl', 'site_srl');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
// Grant virtual permission for access and manager
$grant_list = new stdClass();
$grant_list->access = new stdClass();
$grant_list->access->title = Context::getLang('grant_access');
$grant_list->access->default = 'guest';
if(count($source_grant_list))
@ -127,11 +136,13 @@ class moduleAdminModel extends module
$grant_list->{$key} = $val;
}
}
$grant_list->manager = new stdClass();
$grant_list->manager->title = Context::getLang('grant_manager');
$grant_list->manager->default = 'manager';
Context::set('grant_list', $grant_list);
// Get a permission group granted to the current module
$default_grant = array();
$args = new stdClass();
$args->module_srl = $module_srl;
$output = executeQueryArray('module.getModuleGrants', $args);
if($output->data)
@ -189,6 +200,8 @@ class moduleAdminModel extends module
$xmlInfo = $oModuleModel->getModuleActionXml($targetModule);
// Grant virtual permission for access and manager
$grantList = new stdClass();
$grantList->access = new stdClass();
$grantList->access->title = Context::getLang('grant_access');
$grantList->access->default = 'guest';
if(count($xmlInfo->grant))
@ -200,11 +213,13 @@ class moduleAdminModel extends module
$grantList->{$key} = $val;
}
}
$grantList->manager = new stdClass();
$grantList->manager->title = Context::getLang('grant_manager');
$grantList->manager->default = 'manager';
// Get a permission group granted to the current module
$defaultGrant = new stdClass();
$args = new stdClass();
$args->module_srl = $moduleSrl;
$output = executeQueryArray('module.getModuleGrants', $args);
if($output->data)
@ -360,6 +375,7 @@ 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);
@ -489,6 +505,7 @@ class moduleAdminModel extends module
function getModuleAdminLangListHtml()
{
$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');

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

@ -263,6 +263,7 @@ class moduleAdminView extends module
{
// 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

1
modules/module/module.class.php
View file

@ -62,6 +62,7 @@ class module extends ModuleObject
if($oDB->isColumnExists("documents","extra_vars".$i)) return true;
}
// Insert site information to the table, sites
$args = new stdClass();
$args->site_srl = 0;
$output = $oDB->executeQuery('module.getSite', $args);
if(!$output->data) return true;

22
modules/module/module.controller.php
View file

@ -20,6 +20,7 @@ class moduleController extends module
*/
function insertActionForward($module, $type, $act)
{
$args = new stdClass();
$args->module = $module;
$args->type = $type;
$args->act = $act;
@ -33,6 +34,7 @@ class moduleController extends module
*/
function deleteActionForward($module, $type, $act)
{
$args = new stdClass();
$args->module = $module;
$args->type = $type;
$args->act = $act;
@ -48,6 +50,7 @@ class moduleController extends module
*/
function insertTrigger($trigger_name, $module, $type, $called_method, $called_position)
{
$args = new stdClass();
$args->trigger_name = $trigger_name;
$args->module = $module;
$args->type = $type;
@ -76,6 +79,7 @@ class moduleController extends module
*/
function deleteTrigger($trigger_name, $module, $type, $called_method, $called_position)
{
$args = new stdClass();
$args->trigger_name = $trigger_name;
$args->module = $module;
$args->type = $type;
@ -144,6 +148,7 @@ class moduleController extends module
function updateModuleConfig($module, $config, $site_srl = 0)
{
$args = new stdClass();
$args->module = $module;
$args->site_srl = $site_srl;
@ -164,6 +169,7 @@ class moduleController extends module
*/
function insertModuleConfig($module, $config, $site_srl = 0)
{
$args =new stdClass();
$args->module = $module;
$args->config = serialize($config);
$args->site_srl = $site_srl;
@ -189,6 +195,7 @@ class moduleController extends module
*/
function insertModulePartConfig($module, $module_srl, $config)
{
$args = new stdClass();
$args->module = $module;
$args->module_srl = $module_srl;
$args->config = serialize($config);
@ -338,6 +345,7 @@ class moduleController extends module
// Get colorset from the skin information
$module_path = ModuleHandler::getModulePath($args->module);
$skin_info = $oModuleModel->loadSkinInfo($module_path, $args->skin);
$skin_vars = new stdClass();
$skin_vars->colorset = $skin_info->colorset[0]->name;
// Arrange variables and then execute a query
if(!$args->module_srl) $args->module_srl = getNextSequence();
@ -506,6 +514,7 @@ class moduleController extends module
$oModuleModel = &getModel('module');
$output = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
$args = new stdClass();
$args->url = $output->mid;
$args->is_shortcut = 'N';
$args->site_srl = $site_module_info->site_srl;
@ -555,6 +564,7 @@ class moduleController extends module
if($module_srl == $start_module->index_module_srl) return new Object(-1, 'msg_cannot_delete_startmodule');
// Call a trigger (before)
$trigger_obj = new stdClass();
$trigger_obj->module_srl = $module_srl;
$output = ModuleHandler::triggerCall('module.deleteModule', 'before', $trigger_obj);
if(!$output->toBool()) return $output;
@ -563,6 +573,7 @@ class moduleController extends module
$oDB = &DB::getInstance();
$oDB->begin();
$args = new stdClass();
$args->module_srl = $module_srl;
// Delete module information from the DB
$output = executeQuery('module.deleteModule', $args);
@ -703,6 +714,7 @@ class moduleController extends module
$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
if(!$member_info->member_srl) return;
$args = new stdClass();
$args->module_srl = $module_srl;
$args->member_srl = $member_info->member_srl;
return executeQuery('module.insertAdminId', $args);
@ -713,6 +725,7 @@ class moduleController extends module
*/
function deleteAdminId($module_srl, $admin_id = '')
{
$args = new stdClass();
$args->module_srl = $module_srl;
if($admin_id)
@ -820,6 +833,7 @@ class moduleController extends module
*/
function _deleteModuleSkinVars($module_srl, $mode)
{
$args = new stdClass();
$args->module_srl = $module_srl;
$mode = $mode === 'P' ? 'P' : 'M';
@ -854,7 +868,7 @@ class moduleController extends module
foreach($obj as $key => $val)
{
$args = null;
$args = new stdClass();
$args->module_srl = $module_srl;
$args->name = trim($key);
$args->value = trim($val);
@ -868,6 +882,7 @@ class moduleController extends module
*/
function deleteModuleExtraVars($module_srl)
{
$args = new stdClass();
$args->module_srl = $module_srl;
return executeQuery('module.deleteModuleExtraVars', $args);
//remove from cache
@ -893,7 +908,7 @@ class moduleController extends module
foreach($val as $group_srl)
{
$args = null;
$args = new stdClass();
$args->module_srl = $module_srl;
$args->name = $name;
$args->group_srl = trim($group_srl);
@ -908,6 +923,7 @@ class moduleController extends module
*/
function deleteModuleGrants($module_srl)
{
$args = new stdClass();
$args->module_srl = $module_srl;
return executeQuery('module.deleteModuleGrants', $args);
}
@ -1111,6 +1127,7 @@ class moduleController extends module
$module_filebox_srl = Context::get('module_filebox_srl');
if(!$module_filebox_srl) return new Object(-1, 'msg_invalid_request');
$vars = new stdClass();
$vars->module_filebox_srl = $module_filebox_srl;
$output = $this->deleteModuleFileBox($vars);
if(!$output->toBool()) return $output;
@ -1123,6 +1140,7 @@ class moduleController extends module
$output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
FileHandler::removeFile($output->data->filename);
$args = new stdClass();
$args->module_filebox_srl = $vars->module_filebox_srl;
return executeQuery('module.deleteModuleFileBox', $args);
}

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

@ -26,6 +26,7 @@ class moduleModel extends module
$dirs[] = 'api';
if(in_array($id, $dirs)) return true;
// mid test
$args = new stdClass();
$args->mid = $id;
$args->site_srl = $site_srl;
$output = executeQuery('module.isExistsModuleName', $args);
@ -33,6 +34,7 @@ class moduleModel extends module
// vid test (check mid != vid if site_srl=0, which means it is not a virtual site)
if(!$site_srl)
{
$site_args = new stdClass();
$site_args->domain = $id;
$output = executeQuery('module.isExistsSiteDomain', $site_args);
if($output->data->count) return true;
@ -46,6 +48,7 @@ class moduleModel extends module
*/
function getSiteInfo($site_srl, $columnList = array())
{
$args = new stdClass();
$args->site_srl = $site_srl;
$output = executeQuery('module.getSiteInfo', $args, $columnList);
return $output->data;
@ -53,6 +56,7 @@ class moduleModel extends module
function getSiteInfoByDomain($domain, $columnList = array())
{
$args = new stdClass();
$args->domain= $domain;
$output = executeQuery('module.getSiteInfoByDomain', $args, $columnList);
return $output->data;
@ -64,6 +68,7 @@ class moduleModel extends module
*/
function getModuleInfoByDocumentSrl($document_srl)
{
$args = new stdClass();
$args->document_srl = $document_srl;
$output = executeQuery('module.getModuleInfoByDocument', $args);
$this->applyDefaultSkin($output->data);
@ -109,6 +114,7 @@ class moduleModel extends module
if($oCacheHandler->isSupport()) $output = $oCacheHandler->get('domain_' . $domain);
if(!$output)
{
$args = new stdClass();
$args->domain = $domain;
$output = executeQuery('module.getSiteInfoByDomain', $args);
if($oCacheHandler->isSupport() && $output->data) $oCacheHandler->put('domain_' . $domain, $output);
@ -126,6 +132,7 @@ class moduleModel extends module
if($oCacheHandler->isSupport()) $output = $oCacheHandler->get('default_site');
if(!$output)
{
$args = new stdClass();
$args->site_srl = 0;
$output = executeQuery('module.getSiteInfo', $args);
// Update the related informaion if there is no default site info
@ -176,6 +183,7 @@ class moduleModel extends module
return;
}
$args = new stdClass();
$args->mid = $mid;
$args->site_srl = (int)$site_srl;
$oCacheHandler = &CacheHandler::getInstance('object');
@ -225,6 +233,7 @@ class moduleModel extends module
return;
}
$args = new stdClass();
$args->menu_item_srl = $menuItemSrl;
$output = executeQuery('module.getModuleInfoByMenuItemSrl', $args);
if(!$output->toBool())
@ -314,6 +323,7 @@ class moduleModel extends module
function getModuleInfoByModuleSrl($module_srl, $columnList = array())
{
// Get data
$args = new stdClass();
$args->module_srl = $module_srl;
$oCacheHandler = &CacheHandler::getInstance('object');
if($oCacheHandler->isSupport())
@ -330,6 +340,7 @@ class moduleModel extends module
}
if(count($columnList))
{
$module_info = new stdClass();
foreach($output->data as $key => $item)
{
if(in_array($key, $columnList))
@ -384,6 +395,7 @@ class moduleModel extends module
function getModulesInfo($module_srls, $columnList = array())
{
if(is_array($module_srls)) $module_srls = implode(',',$module_srls);
$args = new stdClass();
$args->module_srls = $module_srls;
$output = executeQueryArray('module.getModulesInfo', $args, $columnList);
if(!$output->toBool()) return;
@ -490,6 +502,7 @@ class moduleModel extends module
*/
function getActionForward($act, $module = "")
{
$args = new stdClass();
$args->act = $act;
$args->module = ($module)?$module:null;
if(strlen ($args->module) > 0) $output = executeQuery ('module.getActionForwardWithModule', $args);
@ -511,6 +524,7 @@ class moduleModel extends module
}
if(!$output)
{
$args = new stdClass();
$args->trigger_name = $trigger_name;
$args->called_position = $called_position;
$output = executeQueryArray('module.getTriggers',$args);
@ -524,6 +538,7 @@ class moduleModel extends module
*/
function getTrigger($trigger_name, $module, $type, $called_method, $called_position)
{
$args = new stdClass();
$args->trigger_name = $trigger_name;
$args->module = $module;
$args->type = $type;
@ -613,6 +628,7 @@ class moduleModel extends module
if($xml_obj->version && $xml_obj->attrs->version == '0.2')
{
// module format 0.2
$module_info = new stdClass();
$module_info->title = $xml_obj->title->body;
$module_info->description = $xml_obj->description->body;
$module_info->version = $xml_obj->version->body;
@ -629,7 +645,7 @@ class moduleModel extends module
foreach($author_list as $author)
{
unset($author_obj);
$author_obj = new stdClass();
$author_obj->name = $author->name->body;
$author_obj->email_address = $author->attrs->email_address;
$author_obj->homepage = $author->attrs->link;
@ -728,6 +744,7 @@ class moduleModel extends module
// Update if no cache file exists or it is older than xml file
if(!file_exists($cache_file) || filemtime($cache_file)<filemtime($xml_file))
{
$info = new stdClass();
$buff = ""; // /< Set buff variable to use in the cache file
$xml_obj = XmlParser::loadXmlFile($xml_file); // /< Read xml file and convert it to xml object
@ -746,12 +763,14 @@ class moduleModel extends module
if(is_array($grants)) $grant_list = $grants;
else $grant_list[] = $grants;
$info->grant = new stdClass();
foreach($grant_list as $grant)
{
$name = $grant->attrs->name;
$default = $grant->attrs->default?$grant->attrs->default:'guest';
$title = $grant->title->body;
$info->grant->{$name} = new stdClass();
$info->grant->{$name}->title = $title;
$info->grant->{$name}->default = $default;
@ -765,6 +784,7 @@ class moduleModel extends module
if(is_array($permissions)) $permission_list = $permissions;
else $permission_list[] = $permissions;
$info->permission = new stdClass();
foreach($permission_list as $permission)
{
$action = $permission->attrs->action;
@ -781,12 +801,14 @@ class moduleModel extends module
if(is_array($menus)) $menu_list = $menus;
else $menu_list[] = $menus;
$info->menu = new stdClass();
foreach($menu_list as $menu)
{
$menu_name = $menu->attrs->name;
$menu_title = is_array($menu->title) ? $menu->title[0]->body : $menu->title->body;
$menu_type = $menu->attrs->type;
$info->menu->{$menu_name} = new stdClass();
$info->menu->{$menu_name}->title = $menu_title;
$info->menu->{$menu_name}->acts = array();
$info->menu->{$menu_name}->type = $menu_type;
@ -802,6 +824,7 @@ class moduleModel extends module
if(is_array($actions)) $action_list = $actions;
else $action_list[] = $actions;
$info->action = new stdClass();
foreach($action_list as $action)
{
$name = $action->attrs->name;
@ -817,10 +840,7 @@ class moduleModel extends module
$simple_setup_index = $action->attrs->simple_setup_index;
$menu_index = $action->attrs->menu_index;
$output->action->{$name}->type = $type;
$output->action->{$name}->grant = $grant;
$output->action->{$name}->standalone= $standalone;
$info->action->{$name} = new stdClass();
$info->action->{$name}->type = $type;
$info->action->{$name}->grant = $grant;
$info->action->{$name}->standalone = $standalone=='true'?true:false;
@ -919,7 +939,11 @@ class moduleModel extends module
{
unset($skin_info);
$skin_info = $this->loadSkinInfo($path, $skin_name, $dir);
if(!$skin_info) $skin_info->title = $skin_name;
if(!$skin_info)
{
$skin_info = new stdClass();
$skin_info->title = $skin_name;
}
$skin_list[$skin_name] = $skin_info;
}
@ -997,6 +1021,7 @@ class moduleModel extends module
if(!$_xml_obj->skin) return;
$xml_obj = $_xml_obj->skin;
// Skin Name
$skin_info = new stdClass();
$skin_info->title = $xml_obj->title->body;
// Author information
if($xml_obj->version && $xml_obj->attrs->version == '0.2')
@ -1015,7 +1040,7 @@ class moduleModel extends module
foreach($author_list as $author)
{
unset($author_obj);
$author_obj = new stdClass();
$author_obj->name = $author->name->body;
$author_obj->email_address = $author->attrs->email_address;
$author_obj->homepage = $author->attrs->link;
@ -1039,7 +1064,7 @@ class moduleModel extends module
foreach($extra_vars as $key => $val)
{
unset($obj);
$obj = new stdClass();
if(!$val->attrs->type) { $val->attrs->type = 'text'; }
$obj->group = $group->title->body;
@ -1058,12 +1083,14 @@ class moduleModel extends module
for($i = 0; $i < $option_count; $i++)
{
$obj->options[$i] = new stdClass();
$obj->options[$i]->title = $val->options[$i]->title->body;
$obj->options[$i]->value = $val->options[$i]->attrs->value;
}
}
else
{
$obj->options[0] = new stdClass();
$obj->options[0]->title = $val->options->title->body;
$obj->options[0]->value = $val->options->attrs->value;
}
@ -1133,6 +1160,7 @@ class moduleModel extends module
$skin_info->license_link = $xml_obj->license->attrs->link;
$skin_info->description = $xml_obj->maker->description->body;
$skin_info->author[0] = new stdClass();
$skin_info->author[0]->name = $xml_obj->maker->name->body;
$skin_info->author[0]->email_address = $xml_obj->maker->attrs->email_address;
$skin_info->author[0]->homepage = $xml_obj->maker->attrs->link;
@ -1214,7 +1242,7 @@ class moduleModel extends module
}
else $screenshot = "";
unset($obj);
$obj = new stdClass();
$obj->name = $name;
$obj->title = $title;
$obj->screenshot = $screenshot;
@ -1275,6 +1303,7 @@ class moduleModel extends module
{
if(!$GLOBALS['__ModuleConfig__'][$site_srl][$module])
{
$args = new stdClass();
$args->module = $module;
$args->site_srl = $site_srl;
$output = executeQuery('module.getModuleConfig', $args);
@ -1310,6 +1339,7 @@ class moduleModel extends module
{
if(!$GLOBALS['__ModulePartConfig__'][$module][$module_srl])
{
$args = new stdClass();
$args->module = $module;
$args->module_srl = $module_srl;
$output = executeQuery('module.getModulePartConfig', $args);
@ -1332,6 +1362,7 @@ class moduleModel extends module
*/
function getModulePartConfigs($module, $site_srl = 0)
{
$args = new stdClass();
$args->module = $module;
if($site_srl) $args->site_srl = $site_srl;
$output = executeQueryArray('module.getModulePartConfigs', $args);
@ -1349,6 +1380,7 @@ class moduleModel extends module
*/
function getModuleCategories($moduleCategorySrl = array())
{
$args = new stdClass();
$args->moduleCategorySrl = $moduleCategorySrl;
// Get data from the DB
$output = executeQuery('module.getModuleCategories', $args);
@ -1526,6 +1558,7 @@ class moduleModel extends module
$module_srls[] = $data->module_srl;
}
$args = new stdClass();
$args->module_srls = implode(',',$module_srls);
$output = executeQueryArray('module.getModuleSites', $args);
if(!$output->data) return array();
@ -1555,6 +1588,7 @@ class moduleModel extends module
if(!$member_info->member_srl) return false;
if($member_info->is_admin == 'Y') return true;
$args = new stdClass();
if(!isset($site_srl))
{
$site_module_info = Context::get('site_module_info');
@ -1587,6 +1621,7 @@ class moduleModel extends module
*/
function getAdminId($module_srl)
{
$obj = new stdClass();
$obj->module_srl = $module_srl;
$output = executeQueryArray('module.getAdminID', $obj);
if(!$output->toBool() || !$output->data) return;
@ -1610,6 +1645,7 @@ class moduleModel extends module
}
if(!$vars)
{
$args = new stdClass();
$args->module_srl = $module_srl;
$output = executeQueryArray('module.getModuleExtraVars',$args);
if(!$output->toBool() || !$output->data)
@ -1621,6 +1657,10 @@ class moduleModel extends module
foreach($output->data as $key => $val)
{
if(in_array($val->name, array('mid','module')) || $val->value == 'Array') continue;
if(!isset($vars[$val->module_srl]))
{
$vars[$val->module_srl] = new stdClass();
}
$vars[$val->module_srl]->{$val->name} = $val->value;
}
if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key,$vars);
@ -1637,6 +1677,7 @@ class moduleModel extends module
*/
function getModuleSkinVars($module_srl)
{
$args = new stdClass();
$args->module_srl = $module_srl;
$output = executeQueryArray('module.getModuleSkinVars',$args);
if(!$output->toBool() || !$output->data) return;
@ -1689,6 +1730,7 @@ class moduleModel extends module
if($updateCache && $skinName)
{
$designInfo->module->{$module_name} = new stdClass();
$designInfo->module->{$module_name}->{$target} = $skinName;
$oAdminController = getAdminController('admin');
@ -1725,6 +1767,7 @@ class moduleModel extends module
}
if(!$output)
{
$args = new stdClass();
$args->module_srl = $module_info->module_srl;
$output = executeQueryArray($query,$args);
//insert in cache
@ -1746,6 +1789,7 @@ class moduleModel extends module
*/
function getModuleMobileSkinVars($module_srl)
{
$args = new stdClass();
$args->module_srl = $module_srl;
$output = executeQueryArray('module.getModuleMobileSkinVars',$args);
if(!$output->toBool() || !$output->data) return;
@ -1790,6 +1834,8 @@ class moduleModel extends module
*/
function getGrant($module_info, $member_info, $xml_info = '')
{
$grant = new stdClass();
if(!$xml_info)
{
$module = $module_info->module;
@ -1822,6 +1868,7 @@ class moduleModel extends module
// If a just logged-in member is, check if the member is a module administrator
if(!$grant->manager && $member_info->member_srl)
{
$args = new stdClass();
$args->module_srl = $module_srl;
$args->member_srl = $member_info->member_srl;
$output = executeQuery('module.getModuleAdmin',$args);
@ -1830,7 +1877,7 @@ class moduleModel extends module
// If not an administrator, get information from the DB and grant manager privilege.
if(!$grant->manager)
{
$args = null;
$args = new stdClass();
// If planet, get permission settings from the planet home
if($module_info->module == 'planet')
{
@ -1938,6 +1985,7 @@ class moduleModel extends module
function getModuleFileBox($module_filebox_srl)
{
$args = new stdClass();
$args->module_filebox_srl = $module_filebox_srl;
return executeQuery('module.getModuleFileBox', $args);
}
@ -1946,6 +1994,7 @@ class moduleModel extends module
{
$oModuleModel = &getModel('module');
$args = new stdClass();
$args->page = Context::get('page');
$args->list_count = 5;
$args->page_count = 5;
@ -2093,6 +2142,7 @@ class moduleModel extends module
*/
function getModuleListByInstance($site_srl = 0, $columnList = array())
{
$args = new stdClass();
$args->site_srl = $site_srl;
$output = executeQueryArray('module.getModuleListByInstance', $args, $columnList);
return $output;

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

@ -52,7 +52,7 @@ class moduleView extends module
// Variable setting for site keyword
$site_keyword = Context::get('site_keyword');
// If there is no site keyword, use as information of the current virtual site
$args = null;
$args = new stdClass();
$logged_info = Context::get('logged_info');
if($logged_info->is_admin == 'Y')
{
@ -98,7 +98,7 @@ class moduleView extends module
if(!$module) continue;
$category = $val->category;
$obj = null;
$obj = new stdClass();
$obj->module_srl = $val->module_srl;
$obj->browser_title = $val->browser_title;
$mid_list[$module]->list[$category][$val->mid] = $obj;