From a94c1b8b443823952facc5246d5a3a40a06b8897 Mon Sep 17 00:00:00 2001
From: tianya <tianya@benshar.com>
Date: Sun, 3 Apr 2022 09:47:28 +0800
Subject: [PATCH] bump 6.1.7

---
 docs/changelog.md                         | 10 ++++++++++
 src/admin/templets/catalog_add_quick.htm  |  6 +++---
 src/install/index.php                     |  2 +-
 src/system/common.inc.php                 |  2 +-
 src/system/libraries/agent.class.php      |  4 +---
 src/system/libraries/statistics.class.php |  4 +++-
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/docs/changelog.md b/docs/changelog.md
index 10e5f3ed..1b50afd3 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,6 +1,16 @@
 # 更新记录
 通过访问 https://www.dedebiz.com/git 获取完整更新记录
 
+# v6.1.7
+- 内置轻量级流量统计工具；
+- 增加对IPv6的支持；
+- 优化伪静态功能；
+- CKEditor升级到4.18.0；
+- 后台移除对IE浏览器的支持，增加浏览器升级提示；
+- 会员中心、系统后台、默认模板样式优化；
+- datalist增加为空的显示；
+- 常规问题修复；
+  
 # v6.1.6
 - 移除dedeajax相关请求函数，改成fetch获取数据；
 - 修正模块认证信息提示错误；
diff --git a/src/admin/templets/catalog_add_quick.htm b/src/admin/templets/catalog_add_quick.htm
index bf5a54dd..76029d9d 100644
--- a/src/admin/templets/catalog_add_quick.htm
+++ b/src/admin/templets/catalog_add_quick.htm
@@ -46,14 +46,14 @@
   <script language="javascript">
     function ShowHide(objname) {
       var obj = document.getElementById(objname);
-      if (obj.style.display == "block" || obj.style.display == "")
+      if (obj.style.display == "")
         obj.style.display = "none";
       else
-        obj.style.display = "block";
+        obj.style.display = "";
     }
     function ShowObj(objname) {
       var obj = document.getElementById(objname);
-      obj.style.display = "block";
+      obj.style.display = "";
     }
     function HideObj(objname) {
       var obj = document.getElementById(objname);
diff --git a/src/install/index.php b/src/install/index.php
index 70363054..b196fcbd 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.7beta'; //详细版本号
+$cfg_version_detail = '6.1.7'; //详细版本号
 $errmsg = '';
 if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
     mysqli_report(MYSQLI_REPORT_OFF);
diff --git a/src/system/common.inc.php b/src/system/common.inc.php
index d8d6f977..0e55f104 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.7beta'; //详细版本号
+$cfg_version_detail = '6.1.7'; //详细版本号
 $cfg_soft_lang = 'utf-8';
 $cfg_soft_public = 'base';
 $cfg_softname = '织梦内容管理系统';
diff --git a/src/system/libraries/agent.class.php b/src/system/libraries/agent.class.php
index 1e7b1ee4..df1e3cc2 100644
--- a/src/system/libraries/agent.class.php
+++ b/src/system/libraries/agent.class.php
@@ -5,8 +5,6 @@ require_once(DEDEINC."/libraries/mobiledetect.class.php");
 
 // copyright https://github.com/jenssegers/agent
 
-use BadMethodCallException;
-
 class Agent extends Mobile_Detect
 {
     /**
@@ -405,7 +403,7 @@ class Agent extends Mobile_Detect
     {
         // Make sure the name starts with 'is', otherwise
         if (strpos($name, 'is') !== 0) {
-            throw new BadMethodCallException("No such method exists: $name");
+            throw new Exception("No such method exists: $name");
         }
 
         $this->setDetectionType(self::DETECTION_TYPE_EXTENDED);
diff --git a/src/system/libraries/statistics.class.php b/src/system/libraries/statistics.class.php
index 378d0fc7..6c0a99d5 100644
--- a/src/system/libraries/statistics.class.php
+++ b/src/system/libraries/statistics.class.php
@@ -99,7 +99,9 @@ EOT;
         ksort($pmvalue);
         $sign = $pmvalue['sign'];
         unset($pmvalue['sign']);
-
+        if (time() - $pmvalue['t'] > 5) {
+            die("DedeBIZ:time out");
+        }
         $cs = sha1(http_build_query($pmvalue).md5($cfg_cookie_encode));
         if ($sign !== $cs) {
             die("DedeBIZ:check sign failed");