fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-14 00:39:57 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 160, modify javscript in spamfilter page and language

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9250 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2011-09-21 06:53:02 +00:00
parent 7828df256a
commit 3c3481f377
3 changed files with 43 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/spamfilter/lang/lang.xml
View file

@ -237,15 +237,8 @@ l'article qui comporte le mot ne sera pas affichagé.]]></value>
<item name="cmd_check_trackback">
<value xml:lang="ko"><![CDATA[하나의 글에 2회 이상 엮인글을 등록하면 스패머로 간주할까요? 엮인글을 차단합니다.]]></value>
</item>
<item name="add">
<value xml:lang="ko"><![CDATA[추가]]></value>
<item name="invalid">
<value xml:lang="ko"><![CDATA[형식이 올바르지 않습니다]]></value>
<value xml:lang="de"><![CDATA[inavlid]]></value>
</item>
<item name="yes">
<value xml:lang="ko"><![CDATA[예]]></value>
</item>
<item name="no">
<value xml:lang="ko"><![CDATA[아니오]]></value>
<value xml:lang="de"><![CDATA[Nein]]></value>
<value xml:lang="mn"><![CDATA[Дугаар]]></value>
</item>
</lang>
</lang>

29
modules/spamfilter/tpl/index.html
View file

@ -1,13 +1,22 @@
<script type="text/javascript">
function doInsertDeniedSome(some){
if(!checkSomeValid(some)) {
alert('{$lang->invalid}');
return false;
} else {
jQuery("#spamfilterInsert").submit();
}
}
</script>
<load target="js/spamfilter_admin.js" usecdn="true" />
<div class="content" id="content">
<form id="spamfilterDelete" action="" method="post">
<input type="hidden" name="act" value="" />
<input type="hidden" name="ipaddress" value="" />
<input type="hidden" name="word" value="" />
<input type="hidden" name="ruleset" value="">
</form>
<form action="" id="spamfilterInsert" class="form" ruleset="insertSetting">
<form action="" onsubmit="doInsertDeniedSome('all')" id="spamfilterInsert" class="form" ruleset="insertSetting">
<input type="hidden" name="act" value="procSpamfilterAdminInsertSetting">
<input type="hidden" name="module" value="spamfilter">
<input type="hidden" name="ruleset" value="insertSetting">
@ -18,16 +27,16 @@
<p class="q">{$lang->cmd_interval}</p>
<p class="a">
<input type="radio" name="limits" id="spamCond1_yes" value="Y" <!--@if($config->limits=='Y' || $config->limits =='')-->checked="checked"<!--@end--> />
<label for="spamCond1_yes">{$lang->yes}</label>
<input type="radio" name="limits" id="spamCond1_no" value="N" <!--@if($config->limits!='Y' && $config->limits !='')--> checked="checked"<!--@end--> /> <label for="spamCond1_no">{$lang->no}</label>
<label for="spamCond1_yes">{$lang->cmd_yes}</label>
<input type="radio" name="limits" id="spamCond1_no" value="N" <!--@if($config->limits!='Y' && $config->limits !='')--> checked="checked"<!--@end--> /> <label for="spamCond1_no">{$lang->cmd_no}</label>
</p>
</li>
<li>
<p class="q">{$lang->cmd_check_trackback}</p>
<p class="a">
<input type="radio" name="check_trackback" id="spamCond2_yes" value="Y" <!--@if($config->check_trackback=='Y' || $config->check_trackback=='')--> checked="checked"<!--@end--> />
<label for="spamCond2_yes">{$lang->yes}</label>
<input type="radio" name="check_trackback" id="spamCond2_yes" value="N" <!--@if($config->check_trackback!='Y' && $config->check_trackback!='')--> checked="checked"<!--@end--> / > <label for="spamCond2_yes">{$lang->no}</label>
<label for="spamCond2_yes">{$lang->cmd_yes}</label>
<input type="radio" name="check_trackback" id="spamCond2_yes" value="N" <!--@if($config->check_trackback!='Y' && $config->check_trackback!='')--> checked="checked"<!--@end--> / > <label for="spamCond2_yes">{$lang->cmd_no}</label>
</p>
</li>
<li>
@ -36,14 +45,14 @@
<ul class="textList">
<!--@foreach($ip_list as $ipListKey)-->
<li>{$ipListKey->ipaddress} <!--@if($ipListKey->description)-->// {$ipListKey->description} <!--@end-->
<a href="#" onclick="doDeleteDeniedIP('{$ipListKey->ipaddress}')" class="side">{$lang->delete}</a>
<a href="#" onclick="doDeleteDeniedIP('{$ipListKey->ipaddress}')" class="side">{$lang->cmd_delete}</a>
</li>
<!--@endforeach-->
</ul>
</div>
<p class="a">
<textarea rows="4" cols="42" name="ipaddressList" title="스팸 IP 추가"></textarea>
<span class="btn small"><button type="button" onclick="doInsertDeniedSome('ipaddressList')">{$lang->add}</button></span>
<span class="btn small"><button type="button" onclick="doInsertDeniedSome('ip')">{$lang->cmd_insert}</button></span>
<span class="desc">{$lang->about_denied_ip}</span>
</p>
</li>
@ -52,13 +61,13 @@
<div class="a">
<ul class="textList">
<!--@foreach($word_list as $wordListKey)-->
<li>{$wordListKey->word} <a href="#" onclick="doDeleteDeniedWord('{$wordListKey->word}')" class="side">{$lang->delete}</a></li>
<li>{$wordListKey->word} <a href="#" onclick="doDeleteDeniedWord('{$wordListKey->word}')" class="side">{$lang->cmd_delete}</a></li>
<!--@end-->
</ul>
</div>
<p class="a">
<textarea rows="4" cols="42" name="wordList" title="스팸 키워드 추가"></textarea>
<span class="btn small"><button type="button" onclick="doInsertDeniedSome('wordList')">{$lang->add}</button></span>
<span class="btn small"><button type="button" onclick="doInsertDeniedSome('word')">{$lang->add}</button></span>
<span class="desc">{$lang->about_denied_word}</span>
</p>
</li>

33
modules/spamfilter/tpl/js/spamfilter_admin.js
View file

@ -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;
}