diff --git a/modules/spamfilter/lang/lang.xml b/modules/spamfilter/lang/lang.xml index e4d94b88d..ac6369dbf 100644 --- a/modules/spamfilter/lang/lang.xml +++ b/modules/spamfilter/lang/lang.xml @@ -237,15 +237,8 @@ l'article qui comporte le mot ne sera pas affichagé.]]> - - + + + - - - - - - - - - \ No newline at end of file + diff --git a/modules/spamfilter/tpl/index.html b/modules/spamfilter/tpl/index.html index ebdd98500..b6da991fc 100644 --- a/modules/spamfilter/tpl/index.html +++ b/modules/spamfilter/tpl/index.html @@ -1,13 +1,22 @@ +
-
-
+ @@ -18,16 +27,16 @@

{$lang->cmd_interval}

limits=='Y' || $config->limits =='')-->checked="checked" /> - - limits!='Y' && $config->limits !='')--> checked="checked" /> + + limits!='Y' && $config->limits !='')--> checked="checked" />

  • {$lang->cmd_check_trackback}

    check_trackback=='Y' || $config->check_trackback=='')--> checked="checked" /> - - check_trackback!='Y' && $config->check_trackback!='')--> checked="checked" / > + + check_trackback!='Y' && $config->check_trackback!='')--> checked="checked" / >

  • @@ -36,14 +45,14 @@
  • - + {$lang->about_denied_ip}

    @@ -52,13 +61,13 @@

    - + {$lang->about_denied_word}

    diff --git a/modules/spamfilter/tpl/js/spamfilter_admin.js b/modules/spamfilter/tpl/js/spamfilter_admin.js index 85a0a63ba..a8b93f945 100644 --- a/modules/spamfilter/tpl/js/spamfilter_admin.js +++ b/modules/spamfilter/tpl/js/spamfilter_admin.js @@ -20,23 +20,30 @@ function doDeleteDeniedWord(word) { fo_obj.submit(); } -function doInsertDeniedSome(some){ +function checkSomeValid(some){ var fo_obj = get_by_id('spamfilterInsert'); - if(some == 'ipaddressList'){ - var reg = /^(\d{1,3}(?:.(\d{1,3}|\*)){3}\s*(\/\/[^\r\n]*)?[\r\n]*)*$/; - var matchStr = fo_obj.ipaddressList.value; + var reg_ipaddress = /^(\d{1,3}(?:.(\d{1,3}|\*)){3}\s*(\/\/[^\r\n]*)?[\r\n]*)*$/; + var matchStr_ipaddress = fo_obj.ipaddressList.value; + + var reg_word = /^(.{2,40}[\r\n]+)*.{0,40}$/; + var matchStr_word = fo_obj.wordList.value; + + var valid_word = true; + var valid_ip = true; + + if(!matchStr_ipaddress.match(reg_ipaddress)) valid_ip = false; + if(!matchStr_word.match(reg_word)) valid_word = false; + + if(some == 'ip'){ fo_obj.wordList.value = ''; - } - else if(some == 'wordList'){ - var reg = /^(.{2,40}[\r\n]+)*.{2,40}$/; - var matchStr = fo_obj.wordList.value; + valid_word = true; + } else if(some == 'word'){ fo_obj.ipaddressList.value = ''; + valid_ip = true; } - if(!matchStr.match(reg)){ - alert('형식에 맞게 입력하세요'); return false; - } - - fo_obj.submit(); + if(valid_ip && valid_word) return true; + else return false; } +