merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

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