From 954539c4c83f2c2a83ba12f82b16afe310e67764 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 15 May 2017 16:22:43 +0800
Subject: [PATCH]  * adjust for safe.

---
 module/admin/lang/en.php               | 2 +-
 module/admin/lang/zh-cn.php            | 4 ++--
 module/admin/model.php                 | 7 ++++++-
 module/common/model.php                | 2 +-
 module/my/view/changepassword.html.php | 1 +
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index 15ca63ef67..c390661999 100644
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -45,7 +45,7 @@ $lang->admin->bind->caption = 'Link an Account';
 $lang->admin->bind->success = "Account has been linked!";
 
 $lang->admin->safe = new stdclass();
-$lang->admin->safe->common     = 'Security';
+$lang->admin->safe->common     = 'Security Policy';
 $lang->admin->safe->set        = 'Password Security Settings';
 $lang->admin->safe->password   = 'Password Security';
 $lang->admin->safe->weak       = 'Weak Password';
diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index 990448f5a7..a7d0799cc1 100644
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -45,13 +45,13 @@ $lang->admin->bind->caption = '关联社区帐号';
 $lang->admin->bind->success = "关联账户成功";
 
 $lang->admin->safe = new stdclass();
-$lang->admin->safe->common     = '安全';
+$lang->admin->safe->common     = '安全策略';
 $lang->admin->safe->set        = '密码安全设置';
 $lang->admin->safe->password   = '密码安全';
 $lang->admin->safe->weak       = '常用弱口令';
 $lang->admin->safe->reason     = '类型';
 $lang->admin->safe->checkWeak  = '弱口令扫描';
-$lang->admin->safe->changeWeak = '修改弱口令秘密';
+$lang->admin->safe->changeWeak = '修改弱口令密码';
 $lang->admin->safe->modifyPasswordFirstLogin = '首次登陆修改密码';
 
 $lang->admin->safe->modeList[0] = '不检查';
diff --git a/module/admin/model.php b/module/admin/model.php
index bf162b923f..12033df39d 100644
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -276,6 +276,11 @@ class adminModel extends model
             $weaks[$weak] = $weak;
         }
 
-        return isset($weaks[$user->password]);
+        if(isset($weaks[$user->password])) return true;
+        if($user->password == md5($user->account)) return true;
+        if($user->phone and $user->password == md5($user->phone)) return true;
+        if($user->mobile and $user->password == md5($user->mobile)) return true;
+        if($user->birthday and $user->password == md5($user->birthday)) return true;
+        return false;
     }
 }
diff --git a/module/common/model.php b/module/common/model.php
index 1c00655ea0..46f9cf3295 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1112,7 +1112,7 @@ class commonModel extends model
     {
         $module = $this->app->getModuleName();
         $method = $this->app->getMethodName();
-        if(isset($this->app->user->modifyPassword) and $this->app->user->modifyPassword and $module != 'my' and $method != 'changepassword') die(js::locate(helper::createLink('my', 'changepassword')));
+        if(isset($this->app->user->modifyPassword) and $this->app->user->modifyPassword and ($module != 'my' or $method != 'changepassword')) die(js::locate(helper::createLink('my', 'changepassword')));
         if($this->isOpenMethod($module, $method)) return true;
         if(!$this->loadModel('user')->isLogon() and $this->server->php_auth_user) $this->user->identifyByPhpAuth();
         if(!$this->loadModel('user')->isLogon() and $this->cookie->za) $this->user->identifyByCookie();
diff --git a/module/my/view/changepassword.html.php b/module/my/view/changepassword.html.php
index 5994f3bc56..82b177d904 100755
--- a/module/my/view/changepassword.html.php
+++ b/module/my/view/changepassword.html.php
@@ -46,6 +46,7 @@
     <?php if(!empty($this->app->user->modifyPasswordReason)):?>
     <?php $this->app->loadLang('admin');?>
     <div class='alert alert-info'>
+      <?php echo $lang->admin->safe->common . ' : ';?>
       <?php echo $this->app->user->modifyPasswordReason == 'weak' ? $lang->admin->safe->changeWeak : $lang->admin->safe->modifyPasswordFirstLogin;?>
     </div>
     <?php endif;?>