From 91ee1338021cce87da8b2b1ce02b64edc68c96d8 Mon Sep 17 00:00:00 2001
From: xushubieli <xushubieli@qq.com>
Date: Tue, 21 Dec 2021 15:11:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=99=BB=E5=BD=95=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BAdiv=E7=9B=92=E5=AD=90=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/dede/css/codemirror.css      |  2 +-
 src/dede/login.php               | 26 ++++++++------------------
 src/dede/templets/index_body.htm |  2 +-
 src/dede/templets/login.htm      |  6 +++---
 4 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/dede/css/codemirror.css b/src/dede/css/codemirror.css
index f48349ed..cefcc7a7 100644
--- a/src/dede/css/codemirror.css
+++ b/src/dede/css/codemirror.css
@@ -1,6 +1,6 @@
 .CodeMirror {
 	font-family:monospace;
-	height:460px;
+	height:450px;
 	color:black
 }
 .CodeMirror-lines {
diff --git a/src/dede/login.php b/src/dede/login.php
index d07c746b..9cbd3c2e 100755
--- a/src/dede/login.php
+++ b/src/dede/login.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * 后台登录
  *
@@ -13,9 +12,7 @@ require_once(dirname(__FILE__) . '/../include/common.inc.php');
 require_once(DEDEINC . '/userlogin.class.php');
 if (empty($dopost)) $dopost = '';
 if (empty($gotopage)) $gotopage = '';
-
 $gotopage = RemoveXSS($gotopage);
-
 //检测安装目录安全性
 if (is_dir(dirname(__FILE__) . '/../install')) {
     if (!file_exists(dirname(__FILE__) . '/../install/install_lock.txt')) {
@@ -37,18 +34,15 @@ if (is_dir(dirname(__FILE__) . '/../install')) {
         fclose($fp);
     }
 }
-
 //更新服务器
 require_once(DEDEDATA . '/admin/config_update.php');
-
 //检测后台目录是否更名
 $cururl = GetCurUrl();
 if (preg_match('/dede\/login/i', $cururl)) {
-    $redmsg = '<div class=\'safe-tips\'>您的管理目录的名称中包含默认名称dede，建议在FTP里把它修改为其它名称，那样会更安全！</div>';
+    $redmsg = '<div class="alert alert-warning" role="alert"><div class=\"safe-tips\">您的管理目录的名称中包含默认名称dede，建议在FTP里把它修改为其它名称，那样会更安全！</div></div>';
 } else {
     $redmsg = '';
 }
-
 //登录检测
 $admindirs = explode('/', str_replace("\\", '/', dirname(__FILE__)));
 $admindir = $admindirs[count($admindirs) - 1];
@@ -57,44 +51,40 @@ if ($dopost == 'login') {
     $svali = strtolower(GetCkVdValue());
     if (($validate == '' || $validate != $svali) && preg_match("/6/", $safe_gdopen)) {
         ResetVdValue();
-        ShowMsg('验证码不正确!', 'login.php', 0, 1000);
+        ShowMsg('验证码不正确', 'login.php', 0, 1000);
         exit;
     } else {
         $cuserLogin = new userLogin($admindir);
         if (!empty($userid) && !empty($pwd)) {
             $res = $cuserLogin->checkUser($userid, $pwd);
-
             //success
             if ($res == 1) {
                 $cuserLogin->keepUser();
                 if (!empty($gotopage)) {
-                    ShowMsg('成功登录，正在转向管理管理主页！', $gotopage);
+                    ShowMsg('成功登录，正在转向管理管理主页', $gotopage);
                     exit();
                 } else {
-                    ShowMsg('成功登录，正在转向管理管理主页！', "index.php");
+                    ShowMsg('成功登录，正在转向管理管理主页', "index.php");
                     exit();
                 }
             }
-
             //error
             else if ($res == -1) {
                 ResetVdValue();
-                ShowMsg('你的用户名不存在!', 'login.php', 0, 1000);
+                ShowMsg('你的用户名不存在', 'login.php', 0, 1000);
                 exit;
             } else {
                 ResetVdValue();
-                ShowMsg('你的密码错误!', 'login.php', 0, 1000);
+                ShowMsg('你的密码错误', 'login.php', 0, 1000);
                 exit;
             }
         }
-
         //password empty
         else {
             ResetVdValue();
-            ShowMsg('用户和密码没填写完整!', 'login.php', 0, 1000);
+            ShowMsg('用户和密码没填写完整', 'login.php', 0, 1000);
             exit;
         }
     }
 }
-
-include('templets/login.htm');
+include('templets/login.htm');
\ No newline at end of file
diff --git a/src/dede/templets/index_body.htm b/src/dede/templets/index_body.htm
index b031fffd..1d1e26fd 100755
--- a/src/dede/templets/index_body.htm
+++ b/src/dede/templets/index_body.htm
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
     <title>系统概况</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
     <base target="_self">
     <link rel="stylesheet" href="../static/css/bootstrap.min.css">
     <link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
diff --git a/src/dede/templets/login.htm b/src/dede/templets/login.htm
index 17ac693c..7182fb09 100755
--- a/src/dede/templets/login.htm
+++ b/src/dede/templets/login.htm
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="<?php echo $cfg_soft_lang; ?>">
 	<meta name="robots" content="noindex,nofollow">
-	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+	<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
 	<link rel="stylesheet" href="../static/css/bootstrap.min.css">
 	<link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
 	<link rel="stylesheet" href="../static/css/dede.css">
@@ -33,8 +33,8 @@ header .logo{width:260px;padding:1em 0}
 			</div>
 		</div>
 	</header>
-	<main class="container login-from mt-4">
-		<div class="alert alert-warning" role="alert"><?php echo $redmsg; ?></div>
+	<main class="container login-from mt-5">
+		<?php echo $redmsg; ?>
 		<div class="login-area">
 			<h3 class="text-center">后台登录</h3>
 			<form name="form1" method="post" action="login.php">