From 9a1871b6ec4d791d24a29a5ec53c91c86c0ff6a7 Mon Sep 17 00:00:00 2001
From: xushubieli <xushubieli@qq.com>
Date: Mon, 18 Apr 2022 10:15:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/templets/sys_info.htm | 35 +++++++++++++++++----------------
 src/install/index.php           |  2 +-
 src/system/common.inc.php       |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/admin/templets/sys_info.htm b/src/admin/templets/sys_info.htm
index fb71d713..66ee414b 100644
--- a/src/admin/templets/sys_info.htm
+++ b/src/admin/templets/sys_info.htm
@@ -65,7 +65,7 @@ function resetCookieEncode() {
         <td height="26" background="../static/web/img/tbg.gif" style="padding-left:10px">系统配置变量</td>
       </tr>
       <tr>
-        <td height="26" align="left">
+        <td height="26">
         <?php
         $ds = file(DEDEADMIN.'/inc/configgroup.txt');
         $totalGroup = count($ds);
@@ -88,18 +88,19 @@ function resetCookieEncode() {
       <tr id="addvar" style="display:none">
         <td height="26" align="center">
           <form name="fadd" action="sys_info.php" method="post">
-            <input type='hidden' name='dopost' value='add'>
+            <input type="hidden" name="dopost" value="add">
             <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token']; ?>">
             <table width="100%" cellspacing="0" cellpadding="0">
               <tr>
-                <td width="12%" height="26">变量名称</td>
-                <td width="38%" align="left"><input name="nvarname" type="text" id="nvarname" class="npvar" style="width:80%"></td>
-                <td width="12%" align="center">变量值</td>
-                <td width="38%" align="left"><input name="nvarvalue" type="text" id="nvarvalue" class="npvar" style="width:80%"></td>
+                <td width="90" height="26" style="border-top:0">变量说明</td>
+                <td width="270" style="border-top:0"><input type="text" name="varmsg" id="varmsg" class="npvar" style="width:260px"></td>
+                <td width="90" style="border-top:0">变量值</td>
+                <td width="270" style="border-top:0"><input name="nvarvalue" type="text" id="nvarvalue" class="npvar" style="width:260px"></td>
               </tr>
               <tr>
-                <td width="10%" height="26">变量类型</td>
-                <td colspan='3' align="left"><input name="vartype" type="radio" value="string" class='np' checked='checked'>
+                <td width="90" height="26">变量类型</td>
+                <td colspan="3">
+                  <input name="vartype" type="radio" value="string" class='np' checked='checked'>
                   文本
                   <input name="vartype" type="radio" value="number" class='np'>
                   数字
@@ -110,12 +111,12 @@ function resetCookieEncode() {
                 </td>
               </tr>
               <tr>
-                <td height="26">变量说明</td>
-                <td align="left"><input type="text" name="varmsg" id="varmsg" class="npvar" style="width:80%"></td>
-                <td align="center">所属组</td>
-                <td align="left">
+                <td width="90" height="26">变量名称</td>
+                <td width="270"><input name="nvarname" type="text" id="nvarname" class="npvar" style="width:260px"></td>
+                <td width="90">所属组</td>
+                <td>
                 <?php
-                echo "<select name='vargroup' class='npvar' style='width:160px'>";
+                echo "<select name='vargroup' class='npvar' style='margin-right:10px;width:160px'>";
                 foreach($ds as $dl){
                   $dl = trim($dl);
                   if(empty($dl)) continue;
@@ -162,7 +163,7 @@ function resetCookieEncode() {
               <tr align="center" bgcolor="#F8FCF1">
                 <td width="360" style="border-top:0">变量说明</td>
                 <td style="border-top:0">变量值</td>
-                <td width="260" style="border-top:0">变量名</td>
+                <td width="260" style="border-top:0">变量名称</td>
               </tr>
               <?php
               $dsql->SetQuery("Select * From `#@__sysconfig` where groupid='{$dls[0]}' order by aid asc");
@@ -179,7 +180,7 @@ function resetCookieEncode() {
                 $i++;
               ?>
               <tr align="center" bgcolor="<?php echo $bgcolor?>">
-                <td width="300"><?php echo $row['info']; ?></td>
+                <td><?php echo $row['info']; ?></td>
                 <td align="left">
                 <?php
                 if($row['type']=='bool')
@@ -190,7 +191,7 @@ function resetCookieEncode() {
                   echo "<label><input type='radio' name='edit___{$row['varname']}' class='np' value='Y'$c1> 是 </label> ";
                   echo "<label><input type='radio' name='edit___{$row['varname']}' class='np' value='N'$c2> 否 </label> ";
                 } else if($row['type']=='bstring') {
-                  echo "<textarea name='edit___{$row['varname']}' row='4' id='edit___{$row['varname']}' class='textarea_info' style='width:100%;height:40px'>".dede_htmlspecialchars($row['value'])."</textarea>";
+                  echo "<textarea name='edit___{$row['varname']}' row='4' id='edit___{$row['varname']}' class='textarea_info' style='width:98%;height:50px'>".dede_htmlspecialchars($row['value'])."</textarea>";
                 } else if($row['type']=='number') {
                   echo "<input type='text' name='edit___{$row['varname']}' id='edit___{$row['varname']}' value='{$row['value']}' style='width:30%'>";
                 } else {
@@ -212,7 +213,7 @@ function resetCookieEncode() {
             }
             ?>
             </div>
-            <table width="100%" cellspacing="1" cellpadding="1" bgcolor="#f8f8f8" class="table mb-0" style="border:none">
+            <table width="100%" cellspacing="1" cellpadding="1" bgcolor="#f8f8f8" class="table">
               <tr>
                 <td align="center" class="py-3">
                   <button type="submit" class="btn btn-success btn-sm">保存</button>
diff --git a/src/install/index.php b/src/install/index.php
index 21cfd3c2..f37248fa 100644
--- a/src/install/index.php
+++ b/src/install/index.php
@@ -15,7 +15,7 @@ if(file_exists(INSLOCKFILE))
 }
 $verMsg = 'V6';
 $dfDbname = 'DedeBIZ';
-$cfg_version_detail = '6.1.10'; //详细版本号
+$cfg_version_detail = '6.1.8'; //详细版本号
 $errmsg = '';
 if (version_compare(PHP_VERSION, '8.0.0', '>=') && function_exists("mysqli_report")) {
     mysqli_report(MYSQLI_REPORT_OFF);
diff --git a/src/system/common.inc.php b/src/system/common.inc.php
index 384515b2..5400f7fb 100755
--- a/src/system/common.inc.php
+++ b/src/system/common.inc.php
@@ -187,7 +187,7 @@ $cfg_soft_dir = $cfg_medias_dir.'/soft';
 $cfg_other_medias = $cfg_medias_dir.'/media';
 //软件摘要信息，****请不要删除本项**** 否则系统无法正确接收系统漏洞或升级信息
 $cfg_version = 'V6';
-$cfg_version_detail = '6.1.10'; //详细版本号
+$cfg_version_detail = '6.1.8'; //详细版本号
 $cfg_soft_lang = 'utf-8';
 $cfg_soft_public = 'base';
 $cfg_softname = '织梦内容管理系统';