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

2016-03-15 09:57:51 +08:00
parent 0e7c551027 c6d21eec38
commit 0b3ef6fba1
11 changed files with 66 additions and 77 deletions
@@ -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)