From e7f22ba94c1bf977b5646585a3e3230a18e846a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <2449271624@qq.com> Date: Fri, 2 Feb 2024 15:05:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=98=E7=BD=91500?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=8D=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调整官网500后台卡问题，admin.update.移除文档加载完执行hasNewVersion(); --- src/admin/api.php | 17 ++++++++--------- src/admin/tpl.php | 3 +-- src/static/web/js/admin.update.js | 3 +-- src/system/libraries/dedehttpdown.class.php | 4 +--- src/system/taglib/cattree.lib.php | 4 ++++ src/system/taglib/demotag.lib.php | 4 ++++ src/system/taglib/feedback.lib.php | 4 ++++ src/system/taglib/infolink.lib.php | 4 ++++ src/system/taglib/likearticle.lib.php | 4 ++++ src/system/taglib/relation.lib.php | 5 ++++- 10 files changed, 35 insertions(+), 17 deletions(-) diff --git a/src/admin/api.php b/src/admin/api.php index 3b9e4e45..e95aa8c8 100644 --- a/src/admin/api.php +++ b/src/admin/api.php @@ -128,8 +128,8 @@ if ($action === 'is_need_check_code') { $data = $dhd->GetHtml(); if (empty($data)) { echo json_encode(array( - "code"=>-1, - "msg"=>'获取版本信息失败', + "code" => -1, + "msg" => '获取版本信息失败', )); } else { echo $data; @@ -144,8 +144,8 @@ if ($action === 'is_need_check_code') { $data = $dhd->GetJSON(); if (empty($data)) { echo json_encode(array( - "code"=>-1, - "msg"=>'获取版本信息失败', + "code" => -1, + "msg" => '获取版本信息失败', )); exit(); } @@ -175,8 +175,8 @@ if ($action === 'is_need_check_code') { $data = $dhd->GetJSON(); if (empty($data)) { echo json_encode(array( - "code"=>-1, - "msg"=>'获取版本信息失败', + "code" => -1, + "msg" => '获取版本信息失败', )); exit; } @@ -212,8 +212,8 @@ if ($action === 'is_need_check_code') { $data = $dhd->GetHtml(); if (empty($data)) { echo json_encode(array( - "code"=>-1, - "msg"=>'获取版本信息失败', + "code" => -1, + "msg" => '获取版本信息失败', )); exit; } @@ -426,6 +426,5 @@ if ($action === 'is_need_check_code') { "msg" => "上传成功", "data" => $activepath."/".$filename, )); - } ?> \ No newline at end of file diff --git a/src/admin/tpl.php b/src/admin/tpl.php index 732d060d..7c629a50 100644 --- a/src/admin/tpl.php +++ b/src/admin/tpl.php @@ -159,8 +159,7 @@ if (!defined('DEDEINC')) { function lib_demotag(\$ctag, \$refObj) { global \$dsql, \$envs; - //属性处理 - \$attlist = \"row|12,titlelen|30\"; + \$attlist = \"row|10,titlelen|30\"; FillAttsDefault(\$ctag->CAttribute->Items,\$attlist); extract(\$ctag->CAttribute->Items, EXTR_SKIP); \$revalue = ''; diff --git a/src/static/web/js/admin.update.js b/src/static/web/js/admin.update.js index 78638aa9..8c7bc548 100644 --- a/src/static/web/js/admin.update.js +++ b/src/static/web/js/admin.update.js @@ -19,7 +19,7 @@ function update() { if (rs.data.finish === false) { setTimeout(() => { update(); - }, 500); + }, 1000); } else { currentStep++ $("#_msgInfo").html(''); @@ -50,7 +50,6 @@ function hasNewVersion() { }); } $(document).ready(function() { - hasNewVersion(); $("#btnCancel").click(function() { currentStep = 1; $("#_fileList").html(``); diff --git a/src/system/libraries/dedehttpdown.class.php b/src/system/libraries/dedehttpdown.class.php index 588a1f2b..4c30ee0f 100755 --- a/src/system/libraries/dedehttpdown.class.php +++ b/src/system/libraries/dedehttpdown.class.php @@ -130,7 +130,6 @@ class DedeHttpDown $this->m_httphead = array(); $this->m_html = ''; $this->Close(); - //初始化系统 $this->PrivateInit($url); $this->PrivateStartSession('GET'); @@ -429,8 +428,7 @@ class DedeHttpDown fputs($this->m_fp, "Content-Type: application/x-www-form-urlencoded\r\n"); fputs($this->m_fp, "Content-Length: $plen\r\n"); } - //发送固定的结束请求头 - //HTTP1.1协议必须指定文档结束后关闭链接,否则读取文档时无法使用feof判断结束 + //发送固定的结束请求头HTTP1.1协议必须指定文档结束后关闭链接，否则读取文档时无法使用feof判断结束 if ($httpv == "HTTP/1.1") { fputs($this->m_fp, "Connection: Close\r\n\r\n"); } else { diff --git a/src/system/taglib/cattree.lib.php b/src/system/taglib/cattree.lib.php index 74a488a4..99b4b6c2 100755 --- a/src/system/taglib/cattree.lib.php +++ b/src/system/taglib/cattree.lib.php @@ -10,7 +10,11 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_cattree(&$ctag, &$refObj) { global $dsql; +<<<<<<< Updated upstream $attlist = "showall|,catid|0"; //处理showall在空或不存在时，强制用产品模型id。如果是yes刚显示整个语言区栏目树，为其它数字则是这个数字的模型的id；typeid指定顶级树id，指定后的前一个属性无效 +======= + $attlist = "showall|,catid|0"; //showall在空或不存在时，强制用产品模型id；如果是yes刚显示整个语言区栏目树，为其它数字则是这个数字的模型的id；typeid指定顶级树id，指定后，前一个属性无效 +>>>>>>> Stashed changes FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); $revalue = ''; diff --git a/src/system/taglib/demotag.lib.php b/src/system/taglib/demotag.lib.php index d7542d7d..30fd731e 100755 --- a/src/system/taglib/demotag.lib.php +++ b/src/system/taglib/demotag.lib.php @@ -12,7 +12,11 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_demotag(&$ctag, &$refObj) { global $dsql, $envs; +<<<<<<< Updated upstream $attlist = "row|10,titlelen|24"; +======= + $attlist = "row|10,titlelen|30"; +>>>>>>> Stashed changes FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); $revalue = ''; diff --git a/src/system/taglib/feedback.lib.php b/src/system/taglib/feedback.lib.php index f3afce73..532b8b85 100755 --- a/src/system/taglib/feedback.lib.php +++ b/src/system/taglib/feedback.lib.php @@ -12,7 +12,11 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_feedback(&$ctag, &$refObj) { global $dsql; +<<<<<<< Updated upstream $attlist = "row|10,titlelen|30,infolen|160,orderby|"; +======= + $attlist = "row|10,titlelen|30,infolen|150,orderby|"; +>>>>>>> Stashed changes FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); $innertext = trim($ctag->GetInnerText()); diff --git a/src/system/taglib/infolink.lib.php b/src/system/taglib/infolink.lib.php index ad7a8ee9..2607f70d 100755 --- a/src/system/taglib/infolink.lib.php +++ b/src/system/taglib/infolink.lib.php @@ -26,7 +26,11 @@ function is_str_float($value){ function lib_infolink(&$ctag, &$refObj) { global $dsql, $nativeplace, $infotype, $cfg_rewrite, $cfg_mainsite, $em_nativeplaces, $em_infotypes; +<<<<<<< Updated upstream //$attlist="row|10,titlelen|30"; +======= + //$attlist="row|12,titlelen|30"; +>>>>>>> Stashed changes //FillAttsDefault($ctag->CAttribute->Items,$attlist); //extract($ctag->CAttribute->Items, EXTR_SKIP); $baseurl = preg_replace("#\/$#", '', $cfg_mainsite); diff --git a/src/system/taglib/likearticle.lib.php b/src/system/taglib/likearticle.lib.php index 57e34800..fdf673e6 100755 --- a/src/system/taglib/likearticle.lib.php +++ b/src/system/taglib/likearticle.lib.php @@ -12,7 +12,11 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_likearticle(&$ctag, &$refObj) { global $dsql; +<<<<<<< Updated upstream $attlist = "row|10,titlelen|30,infolen|160,col|1,tablewidth|100,mytypeid|0,byabs|0,imgwidth|120,imgheight|90"; +======= + $attlist = "row|10,titlelen|30,infolen|150,col|1,tablewidth|100,mytypeid|0,byabs|0,imgwidth|120,imgheight|90"; +>>>>>>> Stashed changes FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); $revalue = ''; diff --git a/src/system/taglib/relation.lib.php b/src/system/taglib/relation.lib.php index aa6d132a..00ec1247 100644 --- a/src/system/taglib/relation.lib.php +++ b/src/system/taglib/relation.lib.php @@ -9,11 +9,14 @@ if (!defined('DEDEINC')) exit ('dedebiz'); * @license GNU GPL v2 (https://www.dedebiz.com/license) * @link https://www.dedebiz.com */ -//关联文档 function lib_relation(&$ctag, &$refObj) { global $dsql; +<<<<<<< Updated upstream $attlist = "row|10,titlelen|30,infolen|160,name|default,orderby|"; +======= + $attlist = "row|10,titlelen|30,infolen|150,name|default,orderby|"; +>>>>>>> Stashed changes FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); if (get_class($refObj) != "Archives") {