diff --git a/modules/file/conf/module.xml b/modules/file/conf/module.xml index 5f74ecf78..524fea82e 100644 --- a/modules/file/conf/module.xml +++ b/modules/file/conf/module.xml @@ -11,8 +11,8 @@ - - - + + + diff --git a/modules/file/file.admin.controller.php b/modules/file/file.admin.controller.php index a98a2bb99..470af17a9 100644 --- a/modules/file/file.admin.controller.php +++ b/modules/file/file.admin.controller.php @@ -53,7 +53,8 @@ // An error appears if no document is selected $cart = Context::get('cart'); if(!$cart) return $this->stop('msg_cart_is_null'); - $file_srl_list= explode('|@|', $cart); + if(!is_array($cart)) $file_srl_list= explode('|@|', $cart); + else $file_srl_list = $cart; $file_count = count($file_srl_list); if(!$file_count) return $this->stop('msg_cart_is_null'); @@ -67,6 +68,11 @@ } $this->setMessage( sprintf(Context::getLang('msg_checked_file_is_deleted'), $file_count) ); + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminList'); + header('location:'.$returnUrl); + return; + } } /** @@ -76,13 +82,18 @@ // Get configurations (using module model object) $config->allowed_filesize = Context::get('allowed_filesize'); $config->allowed_attach_size = Context::get('allowed_attach_size'); - $config->allowed_filetypes = Context::get('allowed_filetypes'); + $config->allowed_filetypes = str_replace(' ', '', Context::get('allowed_filetypes')); $config->allow_outlink = Context::get('allow_outlink'); $config->allow_outlink_format = Context::get('allow_outlink_format'); $config->allow_outlink_site = Context::get('allow_outlink_site'); // Create module Controller object $oModuleController = &getController('module'); $output = $oModuleController->insertModuleConfig('file',$config); + if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminConfig'); + header('location:'.$returnUrl); + return; + } return $output; } @@ -96,16 +107,17 @@ if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl); else $module_srl = array($module_srl); - $download_grant = trim(Context::get('download_grant')); + $download_grant = Context::get('download_grant'); $file_config->allow_outlink = Context::get('allow_outlink'); $file_config->allow_outlink_format = Context::get('allow_outlink_format'); $file_config->allow_outlink_site = Context::get('allow_outlink_site'); $file_config->allowed_filesize = Context::get('allowed_filesize'); $file_config->allowed_attach_size = Context::get('allowed_attach_size'); - $file_config->allowed_filetypes = Context::get('allowed_filetypes'); - if($download_grant) $file_config->download_grant = explode('|@|',$download_grant); - else $file_config->download_grant = array(); + $file_config->allowed_filetypes = str_replace(' ', '', Context::get('allowed_filetypes')); + + if(!is_array($download_grant)) $file_config->download_grant = explode('|@|',$download_grant); + else $file_config->download_grant = $download_grant; //관리자가 허용한 첨부파일의 사이즈가 php.ini의 값보다 큰지 확인하기 - by ovclas $userFileAllowSize = $this->_changeBytes($file_config->allowed_filesize.'M'); @@ -126,6 +138,11 @@ $this->setError(-1); $this->setMessage('success_updated'); + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent'); + header('location:'.$returnUrl); + return; + } } /** diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php index 7843d7cd5..c65ecbc26 100644 --- a/modules/file/file.admin.view.php +++ b/modules/file/file.admin.view.php @@ -129,9 +129,12 @@ $doc_srls_count = count($doc_srls); if($doc_srls_count) { $document_output = $oDocumentModel->getDocuments($doc_srls); - foreach($document_output as $document) { - $document_list[$document->document_srl] = $document; - } + if(is_array($document_output)) + { + foreach($document_output as $document) { + $document_list[$document->document_srl] = $document; + } + } } // Module List $mod_srls_count = count($mod_srls); diff --git a/modules/file/tpl/file_config.html b/modules/file/tpl/file_config.html index 59ec81090..0b6e14d59 100644 --- a/modules/file/tpl/file_config.html +++ b/modules/file/tpl/file_config.html @@ -1,7 +1,9 @@ -
+

{$XE_VALIDATOR_ERROR}

+ + @@ -55,4 +57,4 @@
{$lang->allow_outlink}
-
+ diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html index e11061e38..6cc987b64 100644 --- a/modules/file/tpl/file_list.html +++ b/modules/file/tpl/file_list.html @@ -1,10 +1,10 @@ -
-
+

{$XE_VALIDATOR_ERROR}

+ @@ -29,7 +29,9 @@
-
+ + + @@ -91,7 +93,7 @@ {$no} - + {htmlspecialchars($val->source_filename)} {FileHandler::filesize($val->file_size)} diff --git a/modules/file/tpl/file_module_config.html b/modules/file/tpl/file_module_config.html index c8c976f39..c74d37ac6 100644 --- a/modules/file/tpl/file_module_config.html +++ b/modules/file/tpl/file_module_config.html @@ -1,5 +1,6 @@ - - + + +

{$lang->file}

@@ -30,7 +31,7 @@
{$lang->enable_download_group}
- group_srl, $file_config->download_grant))-->checked="checked"/> + group_srl, $file_config->download_grant))-->checked="checked"/>