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

merge from 1.5.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/spamfilter/spamfilter.model.php
View file

@ -44,15 +44,10 @@
if(!count($ip_list)) return new Object();
$count = count($ip_list);
$patterns = array();
for($i=0;$i<$count;$i++) {
$ip = str_replace('*','',$ip_list[$i]->ipaddress);
$patterns[] = preg_quote($ip);
$ip = str_replace('.', '\.', str_replace('*','(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)',$ip_list[$i]->ipaddress));
if(preg_match('/^'.$ip.'$/', $ipaddress, $matches)) return new Object(-1,'msg_alert_registered_denied_ip');
}
$pattern = '/^('.implode($patterns,'|').')/';
if(preg_match($pattern, $ipaddress, $matches)) return new Object(-1,'msg_alert_registered_denied_ip');
return new Object();
}

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

@ -55,7 +55,7 @@
</ul>
</div>
<p class="a">
<textarea rows="4" cols="42" name="ipaddressList" title="스팸 IP 추가"></textarea>
<textarea rows="8" cols="42" name="ipaddressList" 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>
@ -70,7 +70,7 @@
</ul>
</div>
<p class="a">
<textarea rows="4" cols="42" name="wordList" title="스팸 키워드 추가"></textarea>
<textarea rows="8" cols="42" name="wordList" 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>