merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -0,0 +1,44 @@
<include target="./header.html" />
<section class="section">
<ul class="x_nav x_nav-tabs">
<li><a href="{getUrl('','module','admin','act','dispSpamfilterAdminDeniedIPList')}">{$lang->cmd_denied_ip}</a></li>
<li><a href="{getUrl('','module','admin','act','dispSpamfilterAdminDeniedWordList')}">{$lang->cmd_denied_word}</a></li>
<li class="x_active"><a href="{getUrl('','module','admin','act','dispSpamfilterAdminConfigBlock')}">{$lang->cmd_config_block}</a></li>
</ul>
<form action="./" id="spamfilterConfig" ruleset="@insertConfig">
<input type="hidden" name="act" value="procSpamfilterAdminInsertConfig" />
<input type="hidden" name="module" value="spamfilter" />
<input type="hidden" name="ruleset" value="insertConfig" />
<input type="hidden" name="xe_validator_id" value="modules/spamfilter/tpl/1" />
<div class="x_control-group">
<p><strong>{$lang->cmd_interval}</strong></p>
<label for="spamCond1_yes" class="x_inline">
<input type="radio" name="limits" id="spamCond1_yes" value="Y" checked="checked"|cond="$config->limits=='Y' || $config->limits ==''" />
{$lang->cmd_yes}
</label>
<label for="spamCond1_no" class="x_inline">
<input type="radio" name="limits" id="spamCond1_no" value="N" checked="checked"|cond="$config->limits!='Y' && $config->limits !=''" />
{$lang->cmd_no}
</label>
</div>
<div class="x_control-group">
<p><strong>{$lang->cmd_check_trackback}</strong></p>
<label for="spamCond2_yes" class="x_inline">
<input type="radio" name="check_trackback" id="spamCond2_yes" value="Y" checked="checked"|cond="$config->check_trackback=='Y' || $config->check_trackback==''" />
{$lang->cmd_yes}
</label>
<label for="spamCond2_no" class="x_inline">
<input type="radio" name="check_trackback" id="spamCond2_no" value="N" checked="checked"|cond="$config->check_trackback!='Y' && $config->check_trackback!=''" / >
{$lang->cmd_no}
</label>
</div>
<div class="x_clearfix btnArea">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>
</div>
</form>
</section>
<include target="./footer.html" />

View file

@ -0,0 +1,49 @@
<include target="./header.html" />
<section>
<ul class="x_nav x_nav-tabs">
<li class="x_active"><a href="{getUrl('','module','admin','act','dispSpamfilterAdminDeniedIPList')}">{$lang->cmd_denied_ip}</a></li>
<li><a href="{getUrl('','module','admin','act','dispSpamfilterAdminDeniedWordList')}">{$lang->cmd_denied_word}</a></li>
<li><a href="{getUrl('','module','admin','act','dispSpamfilterAdminConfigBlock')}">{$lang->cmd_config_block}</a></li>
</ul>
<form action="./" method="post">
<input type="hidden" name="act" value="procSpamfilterAdminDeleteDeniedIP" />
<input type="hidden" name="module" value="spamfilter" />
<input type="hidden" name="xe_validator_id" value="modules/spamfilter/tpl/1" />
<table class="x_table x_table-striped x_table-hover">
<caption>
<strong>{$lang->cmd_denied_ip}</strong>
<button type="submit" class="x_btn x_pull-right">{$lang->cmd_delete}</button>
</caption>
<thead>
<tr>
<th scope="col">IP</th>
<th scope="col">{$lang->description}</th>
<th scope="col">{$lang->regdate}</th>
<th scope="col"><input type="checkbox" name="ipaddress" title="Check All" /></th>
</tr>
</thead>
<tbody>
<tr loop="$ip_list => $ip_info">
<td>{$ip_info->ipaddress}</td>
<td>{$ip_info->description}</td>
<td>{zdate($ip_info->regdate,'Y-m-d')}</td>
<td><input type="checkbox" name="ipaddress[]" value="{$ip_info->ipaddress}" /></td>
</tr>
<tr cond="!$ip_list">
<td colspan="4" style="text-align:center">{$lang->no_data}</td>
</tr>
</tbody>
</table>
</form>
<form action="./" style="margin-right:14px" method="post">
<input type="hidden" name="act" value="procSpamfilterAdminInsertDeniedIP" />
<input type="hidden" name="module" value="spamfilter" />
<input type="hidden" name="xe_validator_id" value="modules/spamfilter/tpl/1" />
<input type="hidden" name="active" value="ip" />
<textarea name="ipaddress_list" title="{$lang->add_denied_ip}: {$lang->about_denied_ip}" rows="4" cols="42" style="width:100%" placeholder="{$lang->about_denied_ip}"></textarea>
<span class="x_pull-right" style="margin-right:-14px">
<button type="submit" class="x_btn x_btn-primary">{$lang->add_denied_ip}</button>
</span>
</form>
</section>
<include target="./footer.html" />

View file

@ -0,0 +1,51 @@
<include target="./header.html" />
<section>
<ul class="x_nav x_nav-tabs">
<li><a href="{getUrl('','module','admin','act','dispSpamfilterAdminDeniedIPList')}">{$lang->cmd_denied_ip}</a></li>
<li class="x_active"><a href="{getUrl('','module','admin','act','dispSpamfilterAdminDeniedWordList')}">{$lang->cmd_denied_word}</a></li>
<li><a href="{getUrl('','module','admin','act','dispSpamfilterAdminConfigBlock')}">{$lang->cmd_config_block}</a></li>
</ul>
<form action="./" method="post">
<input type="hidden" name="act" value="procSpamfilterAdminDeleteDeniedWord" />
<input type="hidden" name="module" value="spamfilter" />
<input type="hidden" name="xe_validator_id" value="modules/spamfilter/tpl/1" />
<table class="x_table x_table-striped x_table-hover">
<caption>
<strong>{$lang->cmd_denied_word}</strong>
<button type="submit" class="x_btn x_pull-right">{$lang->cmd_delete}</button>
</caption>
<thead>
<tr>
<th scope="col">{$lang->word}</th>
<th scope="col">{$lang->latest_hit}</th>
<th scope="col">{$lang->hit}</th>
<th scope="col">{$lang->regdate}</th>
<th scope="col"><input type="checkbox" name="word" title="Check All" /></th>
</tr>
</thead>
<tbody>
<tr loop="$word_list => $word_info">
<td>{$word_info->word}</td>
<td><!--@if($word_info->latest_hit)-->{zdate($word_info->latest_hit,'Y-m-d H:i')}<!--@else-->-<!--@end--></td>
<td>{$word_info->hit}</td>
<td>{zdate($word_info->regdate,'Y-m-d')}</td>
<td><input type="checkbox" name="word[]" value="{$word_info->word}" /></td>
</tr>
<tr cond="!$word_list">
<td colspan="5" style="text-align:center">{$lang->no_data}</td>
</tr>
</tbody>
</table>
</form>
<form action="./" style="margin-right:14px" method="post">
<input type="hidden" name="act" value="procSpamfilterAdminInsertDeniedWord" />
<input type="hidden" name="module" value="spamfilter" />
<input type="hidden" name="active" value="word" />
<input type="hidden" name="xe_validator_id" value="modules/spamfilter/tpl/1" />
<textarea name="word_list" title="{$lang->add_denied_word}: {$lang->about_denied_word}" placeholder="{$lang->about_denied_word}" rows="4" cols="42" style="width:100%"></textarea>
<span class="x_pull-right" style="margin-right:-14px">
<button type="submit" class="x_btn x_btn-primary">{$lang->add_denied_word}</button>
</span>
</form>
</section>
<include target="./footer.html" />

View file

View file

@ -0,0 +1,7 @@
<load target="js/spamfilter_admin.js" usecdn="true" />
<div class="x_page-header">
<h1>{$lang->spamfilter} <a class="x_icon-question-sign" href="./admin/help/index.html#UMAN_content_spamfilter" target="_blank">{$lang->help}</a></h1>
</div>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/spamfilter/tpl/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>

View file

@ -1,77 +0,0 @@
<load target="js/spamfilter_admin.js" usecdn="true" />
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form id="spamfilterDelete" action="" method="post">
<input type="hidden" name="module" value="spamfilter" />
<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="spamfilterConfig" class="form" ruleset="@insertConfig">
<input type="hidden" name="act" value="procSpamfilterAdminInsertConfig" />
<input type="hidden" name="module" value="spamfilter" />
<input type="hidden" name="ruleset" value="insertConfig" />
<h1 class="h1">{$lang->spamfilter}</h1>
<ul>
<li>
<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->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->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>
</ul>
<div class="btnArea">
<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
</div>
</form>
<form action="" id="spamfilterInsert" class="form">
<input type="hidden" name="act" value="" />
<input type="hidden" name="module" value="spamfilter" />
<input type="hidden" name="ruleset" value="" />
<ul>
<li>
<p class="q">{$lang->cmd_denied_ip}</p>
<div class="a">
<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->cmd_delete}</a>
</li>
<!--@endforeach-->
</ul>
</div>
<p class="a">
<textarea rows="8" cols="42" name="ipaddress_list" title="스팸 IP 추가"></textarea>
<span class="btn small"><button type="button" onclick="doInsertDeniedIP('{$lang->msg_invalid_format}')">{$lang->cmd_insert}</button></span>
<span class="desc">{$lang->about_denied_ip}</span>
</p>
</li>
<li>
<p class="q"><label for="spamKeyword">{$lang->cmd_denied_word}</label></p>
<div class="a">
<ul class="textList">
<!--@foreach($word_list as $wordListKey)-->
<li>{$wordListKey->word} <a href="#" onclick="doDeleteDeniedWord('{$wordListKey->word}')" class="side">{$lang->cmd_delete}</a></li>
<!--@end-->
</ul>
</div>
<p class="a">
<textarea rows="8" cols="42" name="word_list" title="스팸 키워드 추가"></textarea>
<span class="btn small"><button type="button" onclick="doInsertDeniedWord('{$lang->msg_invalid_format}')">{$lang->add}</button></span>
<span class="desc">{$lang->about_denied_word}</span>
</p>
</li>
</ul>
</form>

View file

@ -5,7 +5,6 @@ function doDeleteDeniedIP(ipaddress) {
var fo_obj = get_by_id('spamfilterDelete');
fo_obj.ipaddress.value = ipaddress;
fo_obj.act.value = "procSpamfilterAdminDeleteDeniedIP";
fo_obj.ruleset.value = 'deleteDeniedIp';
fo_obj.submit();
}
@ -16,29 +15,5 @@ function doDeleteDeniedWord(word) {
var fo_obj = get_by_id('spamfilterDelete');
fo_obj.word.value = word;
fo_obj.act.value = "procSpamfilterAdminDeleteDeniedWord";
fo_obj.ruleset.value = 'deleteDeniedWord';
fo_obj.submit();
}
function doInsertDeniedIP(msg_invalid_format){
var fo_obj = get_by_id('spamfilterInsert');
var reg_ipaddress = /^((\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?)*\s*$/;
var matchStr_ipaddress = fo_obj.ipaddress_list.value;
if(!matchStr_ipaddress.match(reg_ipaddress)) {
alert(msg_invalid_format); return false;
}
fo_obj.act.value = "procSpamfilterAdminInsertDeniedIP";
fo_obj.ruleset.value = "insertDeniedIp";
fo_obj.submit();
}
function doInsertDeniedWord(msg_invalid_format){
var fo_obj = get_by_id('spamfilterInsert');
var reg_word = /^(.{2,40}\s*)*$/;
var matchStr_word = fo_obj.word_list.value;
if(!matchStr_word.match(reg_word)) {
alert(msg_invalid_format); return false;
}
fo_obj.act.value = "procSpamfilterAdminInsertDeniedWord";
fo_obj.ruleset.value = "insertDeniedWord";
fo_obj.submit();
}