diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php index d823ff420..d32b8cac4 100644 --- a/classes/display/HTMLDisplayHandler.php +++ b/classes/display/HTMLDisplayHandler.php @@ -179,10 +179,12 @@ class HTMLDisplayHandler { if(Context::get('module')=='admin' || strpos(Context::get('act'),'Admin')>0){ if(__DEBUG__) { $oContext->addCSSFile('./modules/admin/tpl/css/admin.css', false, 'all', '', 100000); - $oContext->addJsFile('./modules/admin/tpl/js/admin.js'); + //$oContext->addJsFile('./modules/admin/tpl/js/admin.js'); + $oContext->addJsFile('http://svn.xpressengine.com/internal/etc/xeAdmin/js/admin.js'); } else { $oContext->addCSSFile('./modules/admin/tpl/css/admin.min.css', false, 'all', '',10000); - $oContext->addJsFile('./modules/admin/tpl/js/admin.js'); + //$oContext->addJsFile('./modules/admin/tpl/js/admin.js'); + $oContext->addJsFile('http://svn.xpressengine.com/internal/etc/xeAdmin/js/admin.js'); } } } diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index f7daf51dc..51dba2b9c 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -492,7 +492,6 @@ $layout_list[] = $layout_info; } } -// debugPrint($layout_list); Context::set('theme_list', $theme_list); Context::set('layout_list', $layout_list); diff --git a/modules/admin/admin.class.php b/modules/admin/admin.class.php index 290efd0aa..cfcc2cce1 100644 --- a/modules/admin/admin.class.php +++ b/modules/admin/admin.class.php @@ -75,7 +75,6 @@ //insert menu $args->title = $this->xeMenuTitle; $args->menu_srl = getNextSequence(); - //$args->menu_srl = 3302; $args->listorder = $args->menu_srl * -1; $output = executeQuery('menu.insertMenu', $args); $menuSrl = $args->menu_srl; @@ -129,26 +128,22 @@ foreach($installed_module_list AS $key=>$value) { - //if($value->module == 'document') - //{ - $moduleActionInfo = $oModuleModel->getModuleActionXml($value->module); - if(is_object($moduleActionInfo->menu)) + $moduleActionInfo = $oModuleModel->getModuleActionXml($value->module); + if(is_object($moduleActionInfo->menu)) + { + foreach($moduleActionInfo->menu AS $key2=>$value2) { - foreach($moduleActionInfo->menu AS $key2=>$value2) - { - $gnbKey = "'".$this->_getGnbKey($key2)."'"; + $gnbKey = "'".$this->_getGnbKey($key2)."'"; - //insert menu item - $args->menu_item_srl = getNextSequence(); - $args->parent_srl = $gnbDBList[$gnbKey]; - //$args->name = '{$lang->menu_gnb_sub['.$gnbKey.'][\''.$key2.'\']}'; - $args->name = '{$lang->menu_gnb_sub[\''.$key2.'\']}'; - $args->url = getNotEncodedUrl('', 'module', 'admin', 'act', $value2->index); - $args->listorder = -1*$args->menu_item_srl; - $output = executeQuery('menu.insertMenuItem', $args); - } + //insert menu item + $args->menu_item_srl = getNextSequence(); + $args->parent_srl = $gnbDBList[$gnbKey]; + $args->name = '{$lang->menu_gnb_sub[\''.$key2.'\']}'; + $args->url = getNotEncodedUrl('', 'module', 'admin', 'act', $value2->index); + $args->listorder = -1*$args->menu_item_srl; + $output = executeQuery('menu.insertMenuItem', $args); } - //} + } } } diff --git a/modules/communication/communication.admin.controller.php b/modules/communication/communication.admin.controller.php index 71cfd9130..1066b38cb 100644 --- a/modules/communication/communication.admin.controller.php +++ b/modules/communication/communication.admin.controller.php @@ -29,7 +29,7 @@ if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispCommunicationAdminConfig'); - header('location:'.$returnUrl); + $this->setRedirectUrl($returnUrl); return; } else return $output; diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 5706fb6bb..2c98982cf 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -1532,14 +1532,15 @@ class documentController extends document { if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted'); $type = Context::get('type'); - $module_srl = Context::get('target_module'); + $target_module = Context::get('target_module'); + $module_srl = Context::get('module_srl'); $category_srl = Context::get('target_category'); $message_content = Context::get('message_content'); if($message_content) $message_content = nl2br($message_content); $cart = Context::get('cart'); - if($cart) $document_srl_list = explode('|@|', $cart); - else $document_srl_list = array(); + if(!is_array($cart)) $document_srl_list = explode('|@|', $cart); + else $document_srl_list = $cart; $document_srl_count = count($document_srl_list); // Send a message @@ -1613,6 +1614,11 @@ class documentController extends document { $_SESSION['document_management'] = array(); $this->setMessage($msg_code); + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList'); + $this->setRedirectUrl($returnUrl); + return; + } } function procDocumentInsertModuleConfig() @@ -1708,11 +1714,17 @@ class documentController extends document { } } - if(count($documentSrlList)) { + if(count($documentSrlList) > 0) { $oDocumentModel = &getModel('document'); $documentList = $oDocumentModel->getDocuments($documentSrlList, $this->grant->is_admin); + $this->add('document_list', $documentList); + } + else + { + global $lang; + $documentList = array(); + $this->setMessage($lang->no_documents); } - $this->add('document_list', $documentList); } /** diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html index a311969c2..c287ccabc 100644 --- a/modules/document/tpl/document_list.html +++ b/modules/document/tpl/document_list.html @@ -1,4 +1,7 @@ +
+

{$XE_VALIDATOR_MESSAGE}

+

Document

@@ -42,7 +45,9 @@
diff --git a/modules/document/tpl/js/document_admin.js b/modules/document/tpl/js/document_admin.js index de9314f12..a60da1354 100644 --- a/modules/document/tpl/js/document_admin.js +++ b/modules/document/tpl/js/document_admin.js @@ -28,46 +28,6 @@ function completeManageDocument(ret_obj) { window.close(); } -/* 선택된 모듈의 카테고리 목록을 가져오는 함수 */ -function doGetCategoryFromModule(module_srl) { - var params = new Array(); - params['module_srl'] = module_srl; - - var response_tags = ['error','message','categories']; - - exec_xml('document','getDocumentCategories',params, completeGetCategoryFromModules, response_tags); -} - -function completeGetCategoryFromModules(ret_obj, response_tags) { - var obj = jQuery('#target_category').get(0); - var length = obj.options.length; - for(var i=0;i 0) category_title = depth_str.substr(0, depth) + ' ' + category_title; - var opt = new Option(category_title, category_srl, false, false); - obj.options[obj.options.length] = opt; - } -} function doCancelDeclare() { var document_srl = []; @@ -157,33 +117,119 @@ function getDocumentList() { function completeGetDocumentList(ret_obj, response_tags) { - var document_list = ret_obj['document_list']['item']; var htmlListBuffer = ''; var statusNameList = {"PUBLIC":"Public", "SECRET":"Secret", "PRIVATE":"Private", "TEMP":"Temp"}; - - for(var x in document_list) + if(ret_obj['document_list'] == null) { - var objDocument = document_list[x]; - htmlListBuffer += '' + - ''+ objDocument.variables.title +'' + - ''+ objDocument.variables.nick_name +'' + - ''+ statusNameList[objDocument.variables.status] +'' + - '' + + htmlListBuffer = '' + + ''+ret_obj['message']+'' + ''; } + else + { + var document_list = ret_obj['document_list']['item']; + if(!jQuery.isArray(document_list)) document_list = [document_list]; + for(var x in document_list) + { + var objDocument = document_list[x]; + htmlListBuffer += '' + + ''+ objDocument.variables.title +'' + + ''+ objDocument.variables.nick_name +'' + + ''+ statusNameList[objDocument.variables.status] +'' + + ''+ + ''; + } + } jQuery('#documentManageListTable>tbody').html(htmlListBuffer); } function getModuleList() { var params = new Array(); - var response_tags = ['error', 'message']; + var response_tags = ['error', 'message', 'module_list']; + var formObj = jQuery("#manageForm").get(0); - exec_xml('document','procModuleAdminGetList',params, completeGetModuleList, response_tags); + params['site_keyword'] = formObj.site_keyword.value; + + exec_xml('module','procModuleAdminGetList',params, completeGetModuleList, response_tags); } +var module_list = ''; function completeGetModuleList(ret_obj, response_tags) { - console.log(ret_obj['error']); - console.log(ret_obj['message']); + var formObj = jQuery("#manageForm").get(0); + module_list = ret_obj['module_list']; + var htmlListBuffer = ''; + + for(var x in module_list) + { + if(x == 'page') continue; + var moduleObject = module_list[x]; + htmlListBuffer += ''; + } + jQuery('#module_list').html(htmlListBuffer); + makeMidList(jQuery('#module_list').val()); +} + +jQuery(document).ready(function($){ + $('#module_list').bind('change', function(e){ + makeMidList($('#module_list').val()); + }); + $('#mid_list').bind('change', function(e){ + doGetCategoryFromModule($('#mid_list').val()); + }); +}); + +function makeMidList(moduleName) +{ + var mid_list = module_list[moduleName].list; + var htmlListBuffer = ''; + for(var x in mid_list) + { + var moduleInstance = mid_list[x]; + htmlListBuffer += ''; + } + jQuery('#mid_list').html(htmlListBuffer); + doGetCategoryFromModule(jQuery('#mid_list').val()); +} + +/* 선택된 모듈의 카테고리 목록을 가져오는 함수 */ +function doGetCategoryFromModule(module_srl) { + var params = new Array(); + params['module_srl'] = module_srl; + + var response_tags = ['error','message','categories']; + + exec_xml('document','getDocumentCategories',params, completeGetCategoryFromModules, response_tags); +} + +function completeGetCategoryFromModules(ret_obj, response_tags) { + var obj = jQuery('#target_category').get(0); + var length = obj.options.length; + for(var i=0;i 0) category_title = depth_str.substr(0, depth) + ' ' + category_title; + var opt = new Option(category_title, category_srl, false, false); + obj.options[obj.options.length] = opt; + } } diff --git a/modules/file/conf/module.xml b/modules/file/conf/module.xml index 7c73ec63d..65c77b3d1 100644 --- a/modules/file/conf/module.xml +++ b/modules/file/conf/module.xml @@ -3,7 +3,7 @@ - + diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php index 26367c213..1518c24ce 100644 --- a/modules/file/file.admin.model.php +++ b/modules/file/file.admin.model.php @@ -17,6 +17,48 @@ * @brief Get all the attachments in order by time descending (for administrators) **/ function getFileList($obj, $columnList = array()) { + $this->_makeSearchParam($obj, $args); + + // Set valid/invalid state + if($obj->isvalid == 'Y') $args->isvalid = 'Y'; + elseif($obj->isvalid == 'N') $args->isvalid = 'N'; + // Set multimedia/common file + if($obj->direct_download == 'Y') $args->direct_download = 'Y'; + elseif($obj->direct_download == 'N') $args->direct_download= 'N'; + // Set variables + $args->sort_index = $obj->sort_index; + $args->page = $obj->page?$obj->page:1; + $args->list_count = $obj->list_count?$obj->list_count:20; + $args->page_count = $obj->page_count?$obj->page_count:10; + $args->s_module_srl = $obj->module_srl; + $args->exclude_module_srl = $obj->exclude_module_srl; + // Execute the file.getFileList query + $output = executeQuery('file.getFileList', $args, $columnList); + // Return if no result or an error occurs + if(!$output->toBool()||!count($output->data)) return $output; + + $oFileModel = &getModel('file'); + + foreach($output->data as $key => $file) { + $file->download_url = $oFileModel->getDownloadUrl($file->file_srl, $file->sid); + $output->data[$key] = $file; + } + + return $output; + } + + /** + * @brief Return number of attachments which belongs to a specific document + **/ + function getFilesCountByGroupValid($obj) { + $this->_makeSearchParam($obj, $args); + + $output = executeQueryArray('file.getFilesCountByGroupValid', $args); + return $output->data; + } + + function _makeSearchParam(&$obj, &$args) + { // Search options $search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target')); $search_keyword = $obj->search_keyword?$obj->search_keyword:trim(Context::get('search_keyword')); @@ -57,35 +99,11 @@ case 'nick_name' : $args->s_nick_name = $search_keyword; break; + case 'isvalid' : + $args->isvalid = $search_keyword; + break; } } - // Set valid/invalid state - if($obj->isvalid == 'Y') $args->isvalid = 'Y'; - elseif($obj->isvalid == 'N') $args->isvalid = 'N'; - // Set multimedia/common file - if($obj->direct_download == 'Y') $args->direct_download = 'Y'; - elseif($obj->direct_download == 'N') $args->direct_download= 'N'; - // Set variables - $args->sort_index = $obj->sort_index; - $args->page = $obj->page?$obj->page:1; - $args->list_count = $obj->list_count?$obj->list_count:20; - $args->page_count = $obj->page_count?$obj->page_count:10; - $args->s_module_srl = $obj->module_srl; - $args->exclude_module_srl = $obj->exclude_module_srl; - // Execute the file.getFileList query - $output = executeQuery('file.getFileList', $args, $columnList); - // Return if no result or an error occurs - if(!$output->toBool()||!count($output->data)) return $output; - - $oFileModel = &getModel('file'); - - foreach($output->data as $key => $file) { - $file->download_url = $oFileModel->getDownloadUrl($file->file_srl, $file->sid); - $output->data[$key] = $file; - } - - return $output; - } - + } } ?> diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php index c65ecbc26..dbb2978d7 100644 --- a/modules/file/file.admin.view.php +++ b/modules/file/file.admin.view.php @@ -26,10 +26,10 @@ $args->isvalid = Context::get('isvalid'); $args->module_srl = Context::get('module_srl'); // Get a list - $oFileModel = &getAdminModel('file'); + $oFileAdminModel = &getAdminModel('file'); $columnList = array('file_srl', 'upload_target_srl', 'upload_target_type', 'module_srl' , 'source_filename', 'isvalid', 'file_size', 'download_count', 'files.regdate', 'ipaddress'); - $output = $oFileModel->getFileList($args, $columnList); + $output = $oFileAdminModel->getFileList($args, $columnList); // Get the document for looping a list if($output->data) { $oCommentModel = &getModel('comment'); @@ -154,6 +154,17 @@ } } } + + $countOutput = $oFileAdminModel->getFilesCountByGroupValid($args); + $validCount = array(); + if(is_array($countOutput)) + { + foreach($countOutput AS $key=>$value) + { + $validCount[$value->isvalid] = $value->count; + } + } + Context::set('file_list', $file_list); Context::set('document_list', $document_list); Context::set('comment_list', $comment_list); @@ -162,6 +173,7 @@ Context::set('total_page', $output->total_page); Context::set('page', $output->page); Context::set('page_navigation', $output->page_navigation); + Context::set('valid_count', $validCount); // Set a template $this->setTemplatePath($this->module_path.'tpl'); $this->setTemplateFile('file_list'); diff --git a/modules/file/lang/en.lang.php b/modules/file/lang/en.lang.php index fe3d0b0eb..820ed2694 100644 --- a/modules/file/lang/en.lang.php +++ b/modules/file/lang/en.lang.php @@ -51,6 +51,7 @@ 'user_name' => 'User Name', 'nick_name' => 'Nickname', 'ipaddress' => 'IP Address', + 'isvalid' => 'Status', ); $lang->msg_not_allowed_outlink = 'It is not allowed to download files from sites other than this.'; $lang->msg_not_permitted_create = 'Failed to create a file or directory.'; diff --git a/modules/file/lang/es.lang.php b/modules/file/lang/es.lang.php index 187f2a78d..da9ded268 100644 --- a/modules/file/lang/es.lang.php +++ b/modules/file/lang/es.lang.php @@ -48,6 +48,7 @@ 'nick_name' => 'Apodo', 'regdate' => 'La fecha registrada', 'ipaddress' => 'Dirección IP', + 'isvalid' => 'Status', ); $lang->msg_not_allowed_outlink = 'It is not allowed to download files not from this site.'; $lang->msg_not_permitted_create = '파일 또는 디렉토리를 생성할 수 없습니다.'; diff --git a/modules/file/lang/fr.lang.php b/modules/file/lang/fr.lang.php index e2bcf13f8..cdc448780 100644 --- a/modules/file/lang/fr.lang.php +++ b/modules/file/lang/fr.lang.php @@ -48,6 +48,7 @@ 'nick_name' => '닉네임', 'regdate' => 'Enrgistre', 'ipaddress' => 'Adresse IP', + 'isvalid' => 'Status', ); $lang->msg_not_allowed_outlink = 'It is not allowed to download files not from this site.'; $lang->msg_not_permitted_create = '파일 또는 디렉토리를 생성할 수 없습니다.'; diff --git a/modules/file/lang/jp.lang.php b/modules/file/lang/jp.lang.php index 3b2911931..c2c5e1caa 100644 --- a/modules/file/lang/jp.lang.php +++ b/modules/file/lang/jp.lang.php @@ -50,6 +50,7 @@ 'nick_name' => 'ニックネーム', 'regdate' => '登録日', 'ipaddress' => 'IPアドレス', + 'isvalid' => 'Status', ); $lang->msg_not_allowed_outlink = '外部リンクからのダウンロードは許可されていません。'; $lang->msg_not_permitted_create = 'ファイルまたはディレクトリを生成できません。'; diff --git a/modules/file/lang/ko.lang.php b/modules/file/lang/ko.lang.php index 7782ea9de..db92011f5 100644 --- a/modules/file/lang/ko.lang.php +++ b/modules/file/lang/ko.lang.php @@ -45,6 +45,7 @@ 'nick_name' => '닉네임', 'regdate' => '등록일', 'ipaddress' => 'IP 주소', + 'isvalid' => '상태', ); $lang->msg_not_allowed_outlink = '외부링크에서 다운로드 할 수 없습니다.'; $lang->msg_not_permitted_create = '파일 또는 디렉토리를 생성할 수 없습니다.'; diff --git a/modules/file/lang/ru.lang.php b/modules/file/lang/ru.lang.php index 308e378e7..ff88fae17 100644 --- a/modules/file/lang/ru.lang.php +++ b/modules/file/lang/ru.lang.php @@ -50,6 +50,7 @@ 'nick_name' => 'Ник', 'regdate' => 'Дата регистрации', 'ipaddress' => 'IP-Адрес', + 'isvalid' => 'Status', ); $lang->msg_not_allowed_outlink = 'It is not allowed to download files not from this site.'; $lang->msg_not_permitted_create = '파일 또는 디렉토리를 생성할 수 없습니다.'; diff --git a/modules/file/lang/tr.lang.php b/modules/file/lang/tr.lang.php index e6eac509e..a25377052 100644 --- a/modules/file/lang/tr.lang.php +++ b/modules/file/lang/tr.lang.php @@ -51,6 +51,7 @@ 'user_name' => 'Kullanıcı İsmi', 'nick_name' => 'Rumuz', 'ipaddress' => 'IP Adresi', + 'isvalid' => 'Status', ); $lang->msg_not_allowed_outlink = 'Bu siteden dosya indirimine izin verilmemektedir.'; $lang->msg_not_permitted_create = 'Dosya veya dizin oluşturma hatası.'; diff --git a/modules/file/lang/vi.lang.php b/modules/file/lang/vi.lang.php index 79db54515..ce44c395b 100644 --- a/modules/file/lang/vi.lang.php +++ b/modules/file/lang/vi.lang.php @@ -54,6 +54,7 @@ 'user_name' => 'Tên Sử dụng', 'nick_name' => 'Nickname', 'ipaddress' => 'IP', + 'isvalid' => 'Status', ); $lang->msg_not_allowed_outlink = 'Không cho phép tải file từ những trang khác ngoài trang này.'; $lang->msg_not_permitted_create = '파일 또는 디렉토리를 생성할 수 없습니다.'; diff --git a/modules/file/lang/zh-CN.lang.php b/modules/file/lang/zh-CN.lang.php index a340c9bd0..02edc0c3e 100644 --- a/modules/file/lang/zh-CN.lang.php +++ b/modules/file/lang/zh-CN.lang.php @@ -48,6 +48,7 @@ 'nick_name' => '昵称', 'regdate' => '登录日期', 'ipaddress' => 'IP地址', + 'isvalid' => 'Status', ); $lang->msg_not_allowed_outlink = '此站不允许外链下载。'; $lang->msg_not_permitted_create = '无法生成文件或文件夹。'; diff --git a/modules/file/lang/zh-TW.lang.php b/modules/file/lang/zh-TW.lang.php index dae35623b..82823120e 100644 --- a/modules/file/lang/zh-TW.lang.php +++ b/modules/file/lang/zh-TW.lang.php @@ -50,6 +50,7 @@ 'nick_name' => '暱稱', 'regdate' => '登錄日期', 'ipaddress' => 'IP位址', + 'isvalid' => 'Status', ); $lang->msg_not_allowed_outlink = '無法從網站下載檔案。'; $lang->msg_not_permitted_create = '파일 또는 디렉토리를 생성할 수 없습니다.'; diff --git a/modules/file/queries/getFilesCountByGroupValid.xml b/modules/file/queries/getFilesCountByGroupValid.xml new file mode 100644 index 000000000..869d7a3fd --- /dev/null +++ b/modules/file/queries/getFilesCountByGroupValid.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html index 2657b00fa..e7c54ec0f 100644 --- a/modules/file/tpl/file_list.html +++ b/modules/file/tpl/file_list.html @@ -1,136 +1,189 @@ - - - - -
+

{$XE_VALIDATOR_MESSAGE}

-
- - - + + + +

File

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {@ $document_srl = $val->target_document_srl} + {@ $move_uri = getUrl('', 'document_srl', $document_srl).'#comment_'.$val->upload_target_srl} + + {@ $document_srl = $val->upload_target_srl} + {@ $move_uri = getUrl('', 'document_srl', $document_srl)} + + {@ $cur_upload_target_srl = $val->upload_target_srl} + + + + + + + + + + + + + + + + + +
+ All({number_format($total_count)}) + | {$lang->is_valid}({number_format((int)$valid_count['Y'])}) + | {$lang->is_stand_by}({number_format((int)$valid_count['N'])}) + 선택한 파일 관리... +
{$lang->file}{$lang->file_size}{$lang->cmd_download}{$lang->nick_name}{$lang->date}{$lang->ipaddress}{$lang->status}
{$lang->file}{$lang->file_size}{$lang->cmd_download}{$lang->nick_name}{$lang->date}{$lang->ipaddress}{$lang->status}
+ + + {$lang->is_valid} + + {$lang->is_stand_by} + + + [{$lang->comment}] + [{$lang->module}] -
- + [{$lang->cmd_temp_save}] + [{$lang->cmd_trash}] + {$module_list[$val->module_srl]->browser_title} + + - {$document_list[$document_srl]->getTitle()}{$document_list[$document_srl]->getTitle()} + + +
{htmlspecialchars($val->source_filename)}{FileHandler::filesize($val->file_size)}{$val->download_count} + + {$document_list[$document_srl]->getNickName()} + + {$comment_list[$val->upload_target_srl]->getNickName()} + + {zdate($val->regdate,"Y-m-d H:i")}{$val->ipaddress}{$lang->is_valid}{$lang->is_stand_by} + +
+ +
+ 선택한 파일 관리... +
+ + +
+ +
+ + + - - - - {$lang->cmd_cancel} - -
+ + + Cancel + +
- -
- - - - -
- {$lang->cmd_find_module} - -
- - - - - - - - - - - - - - - - - - - - - - - {@ $document_srl = $val->target_document_srl} - {@ $move_uri = getUrl('', 'document_srl', $document_srl).'#comment_'.$val->upload_target_srl} - - {@ $document_srl = $val->upload_target_srl} - {@ $move_uri = getUrl('', 'document_srl', $document_srl)} - - {@ $cur_upload_target_srl = $val->upload_target_srl} - - - - - - - - - - - - - - - - - - -
Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}
{$lang->no}
{$lang->file}
{$lang->file_size}
{$lang->status}
{$lang->cmd_download}
{$lang->date}
{$lang->ipaddress}
{$lang->nick_name}
- - - {$lang->is_valid} - - {$lang->is_stand_by} - - - [{$lang->comment}] - [{$lang->module}] - - [{$lang->cmd_temp_save}] - [{$lang->cmd_trash}] - {$module_list[$val->module_srl]->browser_title} - - - {$document_list[$document_srl]->getTitle()}{$document_list[$document_srl]->getTitle()} - - -
{$no}{htmlspecialchars($val->source_filename)}{FileHandler::filesize($val->file_size)} - - {$lang->is_valid} - - {$lang->is_stand_by} - - {$val->download_count}{zdate($val->regdate,"Y-m-d")}{$val->ipaddress} - - {$document_list[$document_srl]->getNickName()} - - {$comment_list[$val->upload_target_srl]->getNickName()} - -
- -
- - - - diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index ed2411f96..8df49a7c3 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -473,28 +473,28 @@ // Get a list of modules at the site $output = executeQueryArray('module.getSiteModules', $args); - $category_list = $mid_list = array(); + $mid_list = array(); if(count($output->data)) { foreach($output->data as $key => $val) { - /*$module = trim($val->module); + $module = trim($val->module); if(!$module) continue; - $category = $val->category; $obj = null; $obj->module_srl = $val->module_srl; $obj->browser_title = $val->browser_title; - $mid_list[$module]->list[$category][$val->mid] = $obj;*/ + $mid_list[$module]->list[$val->mid] = $obj; } } - /*$selected_module = Context::get('selected_module'); + $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; } - }*/ + } + $this->add('module_list', $mid_list); } /**