diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index df639a65c..678abf9cf 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -503,7 +503,11 @@ $_SESSION['XE_VALIDATOR_ERROR'] = $error; if ($message != 'success') $_SESSION['XE_VALIDATOR_MESSAGE'] = $message; $_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = $messageType; - $_SESSION['XE_VALIDATOR_RETURN_URL'] = $redirectUrl; + + if(Context::get('xeVirtualRequestMethod') != 'xml') + { + $_SESSION['XE_VALIDATOR_RETURN_URL'] = $redirectUrl; + } } unset($logged_info); diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html index 78c6a7fd5..a18cf965f 100644 --- a/common/tpl/common_layout.html +++ b/common/tpl/common_layout.html @@ -42,7 +42,7 @@ var request_uri = "{$request_uri}"; var xeVid = "{$vid}"; var current_mid = "{$mid}"; var waiting_message = "{$lang->msg_call_server}"; -var ssl_actions = new Array("{implode('","',$ssl_actions)}"); +var ssl_actions = new Array("{implode('","',array_keys($ssl_actions))}"); var default_url = "{Context::getDefaultUrl()}"; var http_port = {Context::get("_http_port")}; var https_port = {Context::get("_https_port")}; diff --git a/common/tpl/mobile_layout.html b/common/tpl/mobile_layout.html index c2ab5b842..7cabe0900 100644 --- a/common/tpl/mobile_layout.html +++ b/common/tpl/mobile_layout.html @@ -43,7 +43,7 @@ var xeVid = "{$vid}"; var current_mid = "{$mid}"; var waiting_message = "{$lang->msg_call_server}"; - var ssl_actions = new Array("{implode('","',$ssl_actions)}"); + var ssl_actions = new Array("{implode('","',array_keys($ssl_actions))}"); var default_url = "{Context::getDefaultUrl()}"; var http_port = {Context::get("_http_port")}; var https_port = {Context::get("_https_port")}; diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php index 1efc37ae3..c283ae265 100644 --- a/modules/comment/comment.model.php +++ b/modules/comment/comment.model.php @@ -71,7 +71,7 @@ $url = getUrl('','module','admin','act','dispCommentAdminList','search_target','ipaddress','search_keyword',$oComment->getIpAddress()); $oCommentController->addCommentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress'); - $url = sprintf("var params = new Array(); params['ipaddress']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oComment->getIpAddress()); + $url = sprintf("var params = new Array(); params['ipaddress_list']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oComment->getIpAddress()); $oCommentController->addCommentPopupMenu($url,'cmd_add_ip_to_spamfilter','','javascript'); } } diff --git a/modules/document/document.model.php b/modules/document/document.model.php index 1d3bdff9b..20db35639 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -474,7 +474,7 @@ $url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','ipaddress','search_keyword',$oDocument->getIpAddress()); $oDocumentController->addDocumentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress'); - $url = sprintf("var params = new Array(); params['ipaddress']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oDocument->getIpAddress()); + $url = sprintf("var params = new Array(); params['ipaddress_list']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oDocument->getIpAddress()); $oDocumentController->addDocumentPopupMenu($url,'cmd_add_ip_to_spamfilter','','javascript'); } } diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php index 2f26a0350..6c112c6c5 100644 --- a/modules/layout/layout.model.php +++ b/modules/layout/layout.model.php @@ -482,7 +482,11 @@ $layout_config = $oModuleModel->getModulePartConfig('layout', $layout_srl); $header_script = trim($layout_config->header_script); - if($header_script) $buff .= sprintf(' $layout_info->header_script = "%s"; ', str_replace('"','\\"',$header_script)); + if($header_script) + { + $header_script = str_replace('"','\\"',$header_script); + $buff .= sprintf(' $layout_info->header_script = "%s"; ', str_replace('$','\$',$header_script)); + } $buff = ''; FileHandler::writeFile($cache_file, $buff); diff --git a/modules/page/page.view.php b/modules/page/page.view.php index 13f54a545..5d5025b04 100644 --- a/modules/page/page.view.php +++ b/modules/page/page.view.php @@ -86,6 +86,8 @@ } Context::set('oDocument', $oDocument); + Context::set('module_info', $this->module_info); + if ($this->module_info->skin) $this->setTemplatePath(sprintf($this->module_path.'skins/%s', $this->module_info->skin)); else diff --git a/modules/page/skins/default/content.html b/modules/page/skins/default/content.html index 87699a3db..5563e47bb 100644 --- a/modules/page/skins/default/content.html +++ b/modules/page/skins/default/content.html @@ -1,5 +1,5 @@ -

{$oDocument->getTitle()}

-{$oDocument->getContent()} +

{$oDocument->getTitle()}

+{$oDocument->getContent($module_info->display_popupmenu != 'hide')}
diff --git a/modules/page/skins/default/skin.xml b/modules/page/skins/default/skin.xml new file mode 100644 index 000000000..e50001310 --- /dev/null +++ b/modules/page/skins/default/skin.xml @@ -0,0 +1,53 @@ + + + Default Page Skin + Default Page Skin + + 문서형 페이지의 기본 스킨입니다. + + 0.2 + 2012-08-28 + + + NHN + NHN + NHN + NHN + NHN + NHN + NHN + NHN + + + + 제목표시 + Display title + + 문서의 제목을 표시 할지 결정합니다. + + + 출력 + Show + + + 출력하지 않음 + Hide + + + + 팝업메뉴 표시 + Display popup menu + + 문서 하단의 팝업 메뉴를 표시 할지 선택합니다. + + + 출력 + Show + + + 출력하지 않음 + Hide + + + + diff --git a/modules/page/tpl/skin_info.html b/modules/page/tpl/skin_info.html new file mode 100644 index 000000000..0ad67b69f --- /dev/null +++ b/modules/page/tpl/skin_info.html @@ -0,0 +1,3 @@ + + +{$skin_content} diff --git a/modules/spamfilter/conf/module.xml b/modules/spamfilter/conf/module.xml index 217791868..e35175440 100644 --- a/modules/spamfilter/conf/module.xml +++ b/modules/spamfilter/conf/module.xml @@ -25,7 +25,7 @@ - + diff --git a/modules/spamfilter/ruleset/insertConfig.xml b/modules/spamfilter/ruleset/insertConfig.xml new file mode 100644 index 000000000..904889876 --- /dev/null +++ b/modules/spamfilter/ruleset/insertConfig.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/modules/spamfilter/ruleset/insertSetting.xml b/modules/spamfilter/ruleset/insertSetting.xml deleted file mode 100644 index fb23e85ad..000000000 --- a/modules/spamfilter/ruleset/insertSetting.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/modules/spamfilter/spamfilter.admin.controller.php b/modules/spamfilter/spamfilter.admin.controller.php index a20bb6b61..96a038cf7 100644 --- a/modules/spamfilter/spamfilter.admin.controller.php +++ b/modules/spamfilter/spamfilter.admin.controller.php @@ -33,10 +33,10 @@ function procSpamfilterAdminInsertDeniedIP(){ //스팸IP 추가 - $ipaddressList = Context::get('ipaddressList'); + $ipaddress_list = Context::get('ipaddress_list'); $oSpamfilterController = &getController('spamfilter'); - if($ipaddressList){ - $insertIPOutput = $oSpamfilterController->insertIP($ipaddressList); + if($ipaddress_list){ + $insertIPOutput = $oSpamfilterController->insertIP($ipaddress_list); if(!$insertIPOutput->toBool()) return $insertIPOutput; } @@ -45,9 +45,9 @@ } function procSpamfilterAdminInsertDeniedWord(){ //스팸 키워드 추가 - $wordList = Context::get('wordList'); - if($wordList){ - $insertWordOutput = $this->insertWord($wordList); + $word_list = Context::get('word_list'); + if($word_list){ + $insertWordOutput = $this->insertWord($word_list); if(!$insertWordOutput->toBool()) return $insertWordOutput; } @@ -93,10 +93,10 @@ * @brief Register the spam word * The post, which contains the newly registered spam word, should be considered as a spam **/ - function insertWord($wordList) { - $wordList = str_replace("\r","",$wordList); - $wordList = explode("\n",$wordList); - foreach($wordList as $wordKey => $word) { + function insertWord($word_list) { + $word_list = str_replace("\r","",$word_list); + $word_list = explode("\n",$word_list); + foreach($word_list as $word) { if(trim($word)) $args->word = $word; $output = executeQuery('spamfilter.insertDeniedWord', $args); if(!$output->toBool()) return $output; diff --git a/modules/spamfilter/spamfilter.controller.php b/modules/spamfilter/spamfilter.controller.php index 3a10946c2..525d896a3 100644 --- a/modules/spamfilter/spamfilter.controller.php +++ b/modules/spamfilter/spamfilter.controller.php @@ -136,11 +136,10 @@ * @brief IP registration * The registered IP address is considered as a spammer **/ - function insertIP($ipaddressList, $description = null) { - //리눅스시.. 변환부분 체크하는 것 다시 봐야할 듯. - $ipaddressList = str_replace("\r","",$ipaddressList); - $ipaddressList = explode("\n",$ipaddressList); - foreach($ipaddressList as $ipaddressKey => $ipaddressValue) { + function insertIP($ipaddress_list, $description = null) { + $ipaddress_list = str_replace("\r","",$ipaddress_list); + $ipaddress_list = explode("\n",$ipaddress_list); + foreach($ipaddress_list as $ipaddressValue) { preg_match("/(\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/\s*(.*))?/",$ipaddressValue,$matches); if($ipaddress=trim($matches[1])) { $args->ipaddress = $ipaddress; diff --git a/modules/spamfilter/tpl/index.html b/modules/spamfilter/tpl/index.html index 4fc4fe263..a20da945b 100644 --- a/modules/spamfilter/tpl/index.html +++ b/modules/spamfilter/tpl/index.html @@ -1,5 +1,3 @@ -

{$XE_VALIDATOR_MESSAGE}

@@ -55,7 +53,7 @@

- + {$lang->about_denied_ip}

@@ -70,7 +68,7 @@

- + {$lang->about_denied_word}