diff --git a/modules/member/skins/default/comment_list.html b/modules/member/skins/default/comment_list.html index fcdd074dc..23a766b57 100644 --- a/modules/member/skins/default/comment_list.html +++ b/modules/member/skins/default/comment_list.html @@ -3,10 +3,6 @@ diff --git a/modules/member/skins/default/document_list.html b/modules/member/skins/default/document_list.html index bf5093492..87d5cb1b8 100644 --- a/modules/member/skins/default/document_list.html +++ b/modules/member/skins/default/document_list.html @@ -3,10 +3,6 @@
Total: {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)} - - {$lang->cmd_find_module} - {$lang->cmd_cancel} -
diff --git a/modules/member/skins/simple_world/comment_list.html b/modules/member/skins/simple_world/comment_list.html index ac923f484..10c95023a 100644 --- a/modules/member/skins/simple_world/comment_list.html +++ b/modules/member/skins/simple_world/comment_list.html @@ -30,8 +30,4 @@
  • {lang('common.last_page')} ›
    • -
    - {lang('module.cmd_find_module')} - {lang('common.cmd_cancel')} -
    diff --git a/modules/member/skins/simple_world/document_list.html b/modules/member/skins/simple_world/document_list.html index 924796150..99835ddd8 100644 --- a/modules/member/skins/simple_world/document_list.html +++ b/modules/member/skins/simple_world/document_list.html @@ -36,8 +36,4 @@
  • {lang('common.last_page')} ›
    • -
    - {lang('module.cmd_find_module')} - {lang('common.cmd_cancel')} -
    diff --git a/modules/module/module.view.php b/modules/module/module.view.php index 862509d36..480b290d3 100644 --- a/modules/module/module.view.php +++ b/modules/module/module.view.php @@ -43,92 +43,79 @@ class moduleView extends module */ function dispModuleSelectList() { - if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted'); - - $oModuleModel = getModel('module'); - // Extract the number of virtual sites - $output = executeQuery('module.getSiteCount'); - $site_count = $output->data->count; - Context::set('site_count', $site_count); - // 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 = new stdClass(); - $logged_info = Context::get('logged_info'); - if($logged_info->is_admin == 'Y') + $args = new stdClass; + + if(Context::get('logged_info')->is_admin === 'Y') { - $query_id = 'module.getSiteModules'; - $module_category_exists = false; - if(!$site_keyword) + // If site keyword exists, extract information from the sites + if($site_keyword = Context::get('site_keyword')) { - $site_module_info = Context::get('site_module_info'); - if($site_module_info && $logged_info->is_admin != 'Y') - { - $site_keyword = $site_module_info->domain; - $args->site_srl = (int)$site_module_info->site_srl; - Context::set('site_keyword', $site_keyword); - } - else - { - $query_id = 'module.getDefaultModules'; - $args->site_srl = 0; - $module_category_exists = true; - } - // If site keyword exists, extract information from the sites + $args->site_keyword = $site_keyword; + } + // If there is no site keyword, use as information of the current virtual site + else + { + $args->site_srl = 0; + $query_id = 'module.getDefaultModules'; + } + + Context::set('site_count', executeQuery('module.getSiteCount')->data->count); + } + else + { + $args->site_srl = (int) Context::get('site_module_info')->site_srl; + } + + // Get a list of modules at the site + $output = executeQueryArray(isset($query_id) ? $query_id : 'module.getSiteModules', $args); + + $mid_list = array(); + $oModuleModel = getModel('module'); + + foreach($output->data as $key => $val) + { + if(!$oModuleModel->getGrant($val, Context::get('logged_info'))->manager) + { + continue; + } + + if(!isset($mid_list[$val->module])) + { + $mid_list[$val->module] = new stdClass; + $mid_list[$val->module]->list = array(); + } + + $obj = new stdClass; + $obj->module_srl = $val->module_srl; + $obj->browser_title = $val->browser_title; + + $mid_list[$val->module]->list[$val->category ?: 0][$val->mid] = $obj; + $mid_list[$val->module]->title = $oModuleModel->getModuleInfoXml($val->module)->title; + } + + Context::set('mid_list', $mid_list); + + if(!empty($mid_list)) + { + if(($selected_module = Context::get('selected_module')) && isset($mid_list[$selected_module]->list)) + { + Context::set('selected_mids', $mid_list[$selected_module]->list); } else { - $args->site_keyword = $site_keyword; + Context::set('selected_mids', array_first($mid_list)->list); + Context::set('selected_module', array_first_key($mid_list)); } } else { - $query_id = 'module.getSiteModules'; - $site_module_info = Context::get('site_module_info'); - $args->site_srl = (int)$site_module_info->site_srl; - } - //if(is_null($args->site_srl)) $query_id = 'module.getDefaultModules'; - // Get a list of modules at the site - $output = executeQueryArray($query_id, $args); - $category_list = $mid_list = array(); - if(count($output->data)) - { - foreach($output->data as $key => $val) - { - $module = trim($val->module); - if(!$module) continue; - - $category = $val->category; - $obj = new stdClass(); - $obj->module_srl = $val->module_srl; - $obj->browser_title = $val->browser_title; - $mid_list[$module]->list[$category][$val->mid] = $obj; - } - } - - $selected_module = Context::get('selected_module'); - if(count($mid_list)) - { - foreach($mid_list as $module => $val) - { - if(!$selected_module) $selected_module = $module; - $xml_info = $oModuleModel->getModuleInfoXml($module); - $mid_list[$module]->title = $xml_info->title; - } + Context::set('selected_mids', array()); } - // not show admin bar - Context::set('mid_list', $mid_list); - Context::set('selected_module', $selected_module); - Context::set('selected_mids', $mid_list[$selected_module]->list); - Context::set('module_category_exists', $module_category_exists); - $security = new Security(); - $security->encodeHTML('id', 'type'); - - // Set the layout to be pop-up + $security->encodeHTML('id', 'type', 'site_keyword'); + $this->setLayoutFile('popup_layout'); - // Set a template file $this->setTemplateFile('module_selector'); } diff --git a/modules/module/tpl/module_selector.html b/modules/module/tpl/module_selector.html index abc1ce359..8e790a920 100644 --- a/modules/module/tpl/module_selector.html +++ b/modules/module/tpl/module_selector.html @@ -8,7 +8,8 @@ -
    + +
    @@ -18,18 +19,19 @@

    {$lang->about_search_virtual_site}

    +
    - - -

    {$key}

    + + +

    {$category_name}

    Total: {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)} - - {$lang->cmd_find_module} - {$lang->cmd_cancel} -
    @@ -39,41 +41,12 @@ - - {@ $_idx =0; } - - - {@ $browser_title = str_replace("'", "\\'", htmlspecialchars($v->browser_title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); } - - - - - {@ $_idx ++; } - + + + +
    {$k}{$v->browser_title}{$type=='single'?$lang->cmd_select:$lang->cmd_insert}
    {$mid_name}{$module_info->browser_title}{$type=='single'?$lang->cmd_select:$lang->cmd_insert}
    - - - - - - - - - - - - - - - - - - - - -
    {$lang->mid}{$lang->browser_title}{$type=='single'?$lang->cmd_select:$lang->cmd_insert}
    {$k}{$v->browser_title}browser_title)}',{$type=='single'?'false':'true'}); return false;" class="button green">{$type=='single'?$lang->cmd_select:$lang->cmd_insert}
    -