Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Catouse
2016-03-14 17:15:50 +08:00
parent d0030e82d3 b2d49204b8
commit d9ea62d417
6 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.php
View File

@@ -82,8 +82,7 @@ $config->file->dangers = 'php,php3,php4,phtml,php5,jsp,py,rb,asp,asa,cer,cdx,asp
$config->file->maxSize = 1024 * 1024; // Max size.
/* IP white list settings.*/
$config->ip = new stdclass();
$config->ip->whiteList = '*';
$config->ipWhiteList = '*';
/* View type settings. */
$config->devicePrefix['mhtml'] = 'm.';

1
module/common/lang/en.php
View File

@@ -59,6 +59,7 @@ $lang->uploadImages = 'Upload images ';
$lang->timeout = 'Timed out, please check the network, or retry!';
$lang->repairTable = 'The table may be damaged, please repair by phpmyadmin or myisamchk!';
$lang->duplicate = '%s has the same title';
$lang->ipLimited = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /></head><body>Sorry, current IP is limited by Administrator. Please contact the Administrator to lift the restrictions.</body></html>";
$lang->unfold = '+';
$lang->fold = '-';

1
module/common/lang/zh-cn.php
View File

@@ -59,6 +59,7 @@ $lang->uploadImages = '多图上传 ';
$lang->timeout = '连接超时，请检查网络环境，或重试！';
$lang->repairTable = '数据库表可能损坏，请用phpmyadmin或myisamchk检查修复。';
$lang->duplicate = '已有相同标题的%s';
$lang->ipLimited = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /></head><body>抱歉，管理员限制当前IP登录，请联系管理员解除限制。</body></html>";
$lang->unfold = '+';
$lang->fold = '-';

42
module/common/model.php
View File

@@ -28,6 +28,7 @@ class commonModel extends model
$this->setUser();
$this->loadConfigFromDB();
$this->loadCustomFromDB();
if(!$this->checkIP()) die($this->lang->ipLimited);
if($this->app->getViewType() == 'mhtml') $this->setMobileMenu();
$this->app->loadLang('company');
define('FIRST_RUN', true);
@@ -1186,6 +1187,47 @@ class commonModel extends model
return false;
}
/**
* Check whether IP in white list.
*
* @access public
* @return bool
*/
public function checkIP()
{
$ip = $this->server->remote_addr;
$ipWhiteList = $this->config->ipWhiteList;
/* If the ip white list is '*'. */
if($ipWhiteList == '*') return true;
/* The ip is same as ip in white list. */
if($ip == $ipWhiteList) return true;
/* If the ip in white list is like 192.168.1.1-192.168.1.10. */
if(strpos($ipWhiteList, '-') !== false)
{
list($min, $max) = explode('-', $ipWhiteList);
$min = ip2long(trim($min));
$max = ip2long(trim($max));
$ip = ip2long(trim($ip));
return $ip >= $min and $ip <= $max;
}
/* If the ip in white list is in IP/CIDR format eg 127.0.0.1/24. Thanks to zcat. */
if(strpos($ipWhiteList, '/') == false) $ipWhiteList .= '/32';
list($ipWhiteList, $netmask) = explode('/', $ipWhiteList, 2);
$ip = ip2long($ip);
$ipWhiteList = ip2long($ipWhiteList);
$wildcard = pow(2, (32 - $netmask)) - 1;
$netmask = ~ $wildcard;
return (($ip & $netmask) == ($ipWhiteList & $netmask));
}
/**
* Replace the %s of one key of a menu by $params.
*

3
module/user/control.php
View File

@@ -659,9 +659,6 @@ class user extends control
die(js::error($failReason));
}
/* Check the login ip is in white list or not. */
if(!$this->user->checkIP($this->server->remote_addr)) die(js::error($this->lang->user->ipLimited));
$user = $this->user->identify($account, $password);
if($user)

40
module/user/model.php
View File

@@ -530,46 +530,6 @@ class userModel extends model
}
return !dao::isError();
}
/**
* Check if the ip is in white list.
*
* @access public
* @param string $ip
* @return bool
*/
public function checkIP($ip)
{
$allowIPs = $this->config->ip->whiteList;
/* If the ip white list is '*'. */
if($allowIPs == '*') return true;
/* The ip is same as ip in white list. */
if($ip == $allowIPs) return true;
/* If the ip in white list is like 192.168.1.1-192.168.1.10. */
if(strpos($allowIPs, '-') !== false)
{
list($min, $max) = explode('-', $allowIPs);
$min = ip2long(trim($min));
$max = ip2long(trim($max));
$ip = ip2long(trim($ip));
return $ip >= $min and $ip <= $max;
}
/* If the ip in white list is in IP/CIDR format eg 127.0.0.1/24. Thanks to zcat. */
if(strpos($allowIPs, '/') == false) $allowIPs .= '/32';
list($allowIPs, $netmask) = explode('/', $allowIPs, 2);
$allowIPs = ip2long($allowIPs);
$ip = ip2long($ip);
$wildcard = pow(2, (32 - $netmask)) - 1;
$netmask = ~ $wildcard;
return (($ip & $netmask) == ($allowIPs & $netmask));
}
/**
* Identify a user.