From 09ae1056ea559b5246f21144c04c73f1c7c38b78 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Wed, 26 Jun 2019 17:24:41 +0800
Subject: [PATCH] * Fix code for user module.

---
 module/admin/model.php       | 6 ++++++
 module/common/lang/en.php    | 2 +-
 module/common/lang/zh-cn.php | 2 +-
 module/editor/control.php    | 5 +++++
 module/user/js/login.js      | 4 +++-
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/module/admin/model.php b/module/admin/model.php
index 430cb24b62..79d9068d0b 100644
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -235,6 +235,12 @@ class adminModel extends model
     public function checkWeak($user)
     {
         $weaks = array();
+
+        if($this->app->moduleName == 'user' and $this->app->methodName == 'login')
+        {
+            if(isset($this->config->safe->mode) and $this->post->passwordStrength < $this->config->safe->mode) return true;
+        }
+
         foreach(explode(',', $this->config->safe->weak) as $weak)
         {
             $weak = md5(trim($weak));
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 939fb4b44a..bfab2e7a33 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -393,7 +393,7 @@ $lang->admin->subMenu->sso->ranzhi = 'Zdoo|admin|sso';
 $lang->admin->subMenu->dev = new stdclass();
 $lang->admin->subMenu->dev->api    = array('link' => 'API|dev|api');
 $lang->admin->subMenu->dev->db     = array('link' => 'Database|dev|db');
-$lang->admin->subMenu->dev->editor = array('link' => 'Editor|editor|index', 'subModule' => 'editor');
+//$lang->admin->subMenu->dev->editor = array('link' => 'Editor|editor|index', 'subModule' => 'editor');
 $lang->admin->subMenu->dev->entry  = array('link' => 'Entry|entry|browse', 'subModule' => 'entry');
 
 $lang->admin->subMenu->data = new stdclass();
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 44e9dd616e..67ecbdb997 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -393,7 +393,7 @@ $lang->admin->subMenu->sso->ranzhi = '然之协同|admin|sso';
 $lang->admin->subMenu->dev = new stdclass();
 $lang->admin->subMenu->dev->api    = array('link' => 'API|dev|api');
 $lang->admin->subMenu->dev->db     = array('link' => '数据库|dev|db');
-$lang->admin->subMenu->dev->editor = array('link' => '编辑器|editor|index', 'subModule' => 'editor');
+//$lang->admin->subMenu->dev->editor = array('link' => '编辑器|editor|index', 'subModule' => 'editor');
 $lang->admin->subMenu->dev->entry  = array('link' => '应用|entry|browse', 'subModule' => 'entry');
 
 $lang->admin->subMenu->data = new stdclass();
diff --git a/module/editor/control.php b/module/editor/control.php
index 639ab89409..672b728312 100644
--- a/module/editor/control.php
+++ b/module/editor/control.php
@@ -11,6 +11,11 @@
  */
 class editor extends control
 {
+    public function __construct()
+    {
+        die();
+    }
+
     /**
      * Show module files and edit them. 
      * 
diff --git a/module/user/js/login.js b/module/user/js/login.js
index 241307566c..c3eb257456 100644
--- a/module/user/js/login.js
+++ b/module/user/js/login.js
@@ -24,7 +24,9 @@ $(document).ready(function()
 
     $('#loginPanel #submit').click(function()
     {
-        var password = $('input:password').val().trim();
+        var password         = $('input:password').val().trim();
+        var passwordStrength = computePasswordStrength(password);
+        $('#submit').after("<input type='hidden' name='passwordStrength' value='" + passwordStrength + "'>");
         var rand = $('input#verifyRand').val();
         if(password.length != 32 && typeof(md5) == 'function') $('input:password').val(md5(md5(password) + rand));
     });