样式优化

src/admin/catalog_do.php

@@ -341,7 +341,6 @@ http.get(durl, (res) => {
         data += chunk;
     });
     res.on(\'end\', () => {
-        console.log(data);
         const result = JSON.parse(data);
         if (result.code === 0) {
             console.log(result);

src/admin/dialog/select_mimages.php

@@ -134,7 +134,6 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
     			file_i=0;
                 document.querySelector('#topbar .upall').innerText='全部上传';
                 //返回
-                console.log(axupimgs.res);
                 axupimgs.res.forEach((v,k)=>{
                     let addonHTML = `<img src='${v.url}'/>`;
                     window.opener.CKEDITOR.instances["<?php echo $f ?>"].insertHtml(addonHTML);

src/admin/mychannel_edit.php

@@ -408,9 +408,9 @@ if ($dopost == "show") {
         }
         $template = trim($template);
         $forms = '<form action="'.$cfg_cmspath.'/apps/advancedsearch.php" method="post">';
-        $forms .= "<input type=\"hidden\" name=\"mid\" value=\"$mid\">";
-        $forms .= "<input type=\"hidden\" name=\"dopost\" value=\"search\">";
-        $forms .= "关键词：<input type=\"text\" name=\"q\"><br>";
+        $forms .= "<input class=\"form-control\" type=\"hidden\" name=\"mid\" value=\"$mid\">";
+        $forms .= "<input class=\"form-control\" type=\"hidden\" name=\"dopost\" value=\"search\">";
+        $forms .= "关键词：<input class=\"form-control\" type=\"text\" name=\"q\"><br>";
         $mainstring = '';
         if (!empty($mainfields) && is_array($mainfields)) {
             $mainstring = implode(',', $mainfields);
@@ -419,20 +419,20 @@ if ($dopost == "show") {
                     require_once(DEDEINC."/typelink/typelink.class.php");
                     $tl = new TypeLink(0);
                     $typeOptions = $tl->GetOptionArray(0, 0, $mid);
-                    $forms .= "栏目：<select name='typeid' class='admin-input-lg'>\r\n";
+                    $forms .= "栏目：<select class=\"form-control\" name='typeid' class='admin-input-lg'>\r\n";
                     $forms .= "<option value='0' selected>不限栏目</option>\r\n";
                     $forms .= $typeOptions;
                     $forms .= "</select><br>";
                     $forms .= "<label><input type=\"checkbox\" name=\"includesons\" value=\"1\"> 包含子栏目</label><br>";
                 } else if ($mainfield == 'iscommend') {
-                    $forms .= "<label><input type=\"checkbox\" name=\"iscommend\" value=\"1\"> 推荐</label><br>";
+                    $forms .= "<label><input class=\"form-control\" type=\"checkbox\" name=\"iscommend\" value=\"1\"> 推荐</label><br>";
                 } else if ($mainfield == 'writer') {
-                    $forms .= "作者：<input type=\"text\" name=\"writer\" value=\"\"><br>";
+                    $forms .= "作者：<input class=\"form-control\" type=\"text\" name=\"writer\" value=\"\"><br>";
                 } else if ($mainfield == 'source') {
-                    $forms .= "来源：<input type=\"text\" name=\"source\" value=\"\"><br>";
+                    $forms .= "来源：<input class=\"form-control\" type=\"text\" name=\"source\" value=\"\"><br>";
                 } else if ($mainfield == 'senddate') {
-                    $forms .= "开始时间：<input type=\"text\" name=\"startdate\" value=\"\"><br>";
-                    $forms .= "结束时间：<input type=\"text\" name=\"enddate\" value=\"\"><br>";
+                    $forms .= "开始时间：<input class=\"form-control\" type=\"text\" name=\"startdate\" value=\"\"><br>";
+                    $forms .= "结束时间：<input class=\"form-control\" type=\"text\" name=\"enddate\" value=\"\"><br>";
                 }
             }
         }
@@ -445,15 +445,15 @@ if ($dopost == "show") {
                     require_once(DEDEINC."/typelink/typelink.class.php");
                     $tl = new TypeLink(0);
                     $typeOptions = $tl->GetOptionArray(0, 0, $mid);
-                    $forms .= "栏目：<select name='typeid' class='admin-input-lg'>\r\n";
+                    $forms .= "栏目：<select class=\"form-control\" name='typeid' class='admin-input-lg'>\r\n";
                     $forms .= "<option value='0' selected>不限栏目</option>\r\n";
                     $forms .= $typeOptions;
                     $forms .= "</select><br>";
                     $forms .= "<label><input type=\"checkbox\" name=\"includesons\" value=\"1\"> 包含子栏目</label><br>";
                     $addonstring .= 'typeid:int,';
                 } elseif ($addonfield == 'senddate') {
-                    $forms .= "开始时间：<input type=\"text\" name=\"startdate\" value=\"\"><br>";
-                    $forms .= "结束时间：<input type=\"text\" name=\"enddate\" value=\"\"><br>";
+                    $forms .= "开始时间：<input class=\"form-control\" type=\"text\" name=\"startdate\" value=\"\"><br>";
+                    $forms .= "结束时间：<input class=\"form-control\" type=\"text\" name=\"enddate\" value=\"\"><br>";
                     $addonstring .= 'senddate:datetime,';
                 }
             }
@@ -482,13 +482,13 @@ if ($dopost == "show") {
                 $type = $typearr[$k];
                 $tmp = $name.':'.$type;
                 if (in_array($type, $intarr)) {
-                    $forms .= "$itemname : <input type=\"text\" name=\"start".$name."\" value=\"\"> 到 <input type=\"text\" name=\"end".$name."\" value=\"\"><br>";
+                    $forms .= "$itemname : <input class=\"form-control\" type=\"text\" name=\"start".$name."\" value=\"\"> 到 <input type=\"text\" name=\"end".$name."\" value=\"\"><br>";
                 } else if (in_array($type, $textarr)) {
-                    $forms .= "$itemname : <input type=\"text\" name=\"$name\" value=\"\"><br>";
+                    $forms .= "$itemname : <input class=\"form-control\" type=\"text\" name=\"$name\" value=\"\"><br>";
                 } else if ($type == 'select') {
                     $values = explode(',', $valuearr[$k]);
                     if (is_array($values) && !empty($values)) {
-                        $forms .= "$itemname : <select name=\"$name\" ><option value=\"\">不限</option>";
+                        $forms .= "$itemname : <select class=\"form-control\" name=\"$name\" ><option value=\"\">不限</option>";
                         foreach ($values as $value) {
                             $forms .= "<option value=\"$value\">$value</option>";
                         }
@@ -497,9 +497,9 @@ if ($dopost == "show") {
                 } else if ($type == 'radio') {
                     $values = explode(',', $valuearr[$k]);
                     if (is_array($values) && !empty($values)) {
-                        $forms .= "$itemname : <label><input type=\"radio\" name=\"".$name."\" value=\"\" checked> 不限</label><br>";
+                        $forms .= "$itemname : <label><input class=\"form-control\" type=\"radio\" name=\"".$name."\" value=\"\" checked> 不限</label><br>";
                         foreach ($values as $value) {
-                            $forms .= "<label><input type=\"radio\" name=\"".$name."\" value=\"$value\"> $value</label>";
+                            $forms .= "<label><input class=\"form-control\" type=\"radio\" name=\"".$name."\" value=\"$value\"> $value</label>";
                         }
                     }
                 } else if ($type == 'checkbox') {
@@ -507,26 +507,39 @@ if ($dopost == "show") {
                     if (is_array($values) && !empty($values)) {
                         $forms .= "$itemname : ";
                         foreach ($values as $value) {
-                            $forms .= "<label><input type=\"checkbox\" name=\"".$name."[]\" value=\"$value\"> $value</label><br>";
+                            $forms .= "<label><input class=\"form-control\" type=\"checkbox\" name=\"".$name."[]\" value=\"$value\"> $value</label><br>";
                         }
                     }
                 } elseif ($type == 'datetime') {
-                    $forms .= "开始时间：<input type=\"text\" name=\"startdate\" value=\"\"><br>";
-                    $forms .= "结束时间：<input type=\"text\" name=\"enddate\" value=\"\"><br>";
+                    $forms .= "开始时间：<input class=\"form-control\" type=\"text\" name=\"startdate\" value=\"\"><br>";
+                    $forms .= "结束时间：<input class=\"form-control\" type=\"text\" name=\"enddate\" value=\"\"><br>";
                 } else {
                     $tmp = '';
                 }
                 $addonstring .= $tmp.',';
             }
         }
-        $forms .= '<input type="submit" name="submit" value="开始搜索"></form>';
+        $forms .= '<input class="btn btn-success btn-sm" type="submit" name="submit" value="开始搜索"></form>';
         $formssql = addslashes($forms);
         $query = "REPLACE INTO `#@__advancedsearch` (mid, maintable, mainfields, addontable, addonfields, forms, template) VALUES ('$mid','$maintable','$mainstring','$addontable','$addonstring','$formssql', '$template')";
         $dsql->ExecuteNoneQuery($query);
         $formshtml = dede_htmlspecialchars($forms);
+        echo '<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">';
+        echo '<link rel="stylesheet" href="../static/web/css/admin.css">';
+        echo '<link rel="stylesheet" href="css/codemirror.css">
+		<script src="js/codemirror.js"></script>
+		<script src="js/mode/xml/xml.js"></script>
+		<script src="js/mode/javascript/javascript.js"></script>
+		<script src="js/mode/css/css.js"></script>
+		<script src="js/mode/htmlmixed/htmlmixed.js"></script>';
         echo '<meta http-equiv="Content-Type" content="text/html; charset='.$cfg_soft_lang.'">';
-        echo "<p>下面生成的网页表单，请自行复制，根据自己需求修改样式后粘贴到对应的模板中</p><textarea cols=\"100\" rows=\"10\">".$forms."</textarea>";
+        echo "<p>下面生成的网页表单，请自行复制，根据自己需求修改样式后粘贴到对应的模板中</p><textarea id='content' cols=\"100\" rows=\"10\">".$forms."</textarea>";
         echo '<hr>';
+        echo '<script>var editor = CodeMirror.fromTextArea(document.getElementById(\'content\'), {
+            lineNumbers: true,
+            lineWrapping: true,
+            mode: \'text/html\'
+        });</script>';
         echo $forms;
     }
     exit;

src/admin/templets/sys_payment.htm

@@ -198,7 +198,6 @@
 							}
 							itemConfig.Sortrank = element.sortrank;
 							itemConfig.Enabled = parseInt(element.status) === 0? false : true;
-							console.log("itemConfig=", itemConfig);
 							for (const k1 in config[key]) {
 								if (Object.hasOwnProperty.call(config[key], k1)) {
 									const ee = config[key][k1];
@@ -231,7 +230,6 @@
 					for (const kk in element) {
 						if (Object.hasOwnProperty.call(element, kk)) {
 							const itemConfig = element[kk];
-							console.log(`#ipt${key}${kk}`, itemConfig);
 							if ($(`#ipt${key}${kk}`).attr('type') === 'text') {
 								let val = $(`#ipt${key}${kk}`).val();
 								if (kk === "Sortrank") {

src/install/index.php

@@ -11,7 +11,7 @@ error_reporting(E_ALL || ~E_NOTICE);
 define('INSLOCKFILE', dirname(__FILE__).'/install_lock.txt');
 $verMsg = 'V6';
 $dfDbname = 'DedeBIZ';
-$cfg_version_detail = '6.2.6'; //详细版本号
+$cfg_version_detail = '6.2.7'; //详细版本号
 $errmsg = '';
 if (version_compare(PHP_VERSION, '8.0.0', '>=') && function_exists("mysqli_report")) {
     mysqli_report(MYSQLI_REPORT_OFF);

src/install/install.html

@@ -118,7 +118,6 @@
 			    if (!dbuser) dbuser = "root";
 			    $.get('index.php?step=10&dbhost=' + dbhost + '&dbuser=' + dbuser + '&dbpwd=' + dbpwd,
 			    function(rs) {
-			        console.log(rs);
 			        let result = JSON.parse(rs);
 			        if (result.code === 200) {
 			            ShowAlert("#alertConnect", result.data, "success", 5000)

src/system/common.inc.php

@@ -189,7 +189,7 @@ $cfg_soft_dir = $cfg_medias_dir.'/soft';
 $cfg_other_medias = $cfg_medias_dir.'/media';
 //软件摘要信息，请不要删除，否则系统无法正确接收系统漏洞或升级信息
 $cfg_version = 'V6';
-$cfg_version_detail = '6.2.6';//详细版本号
+$cfg_version_detail = '6.2.7';//详细版本号
 $cfg_soft_lang = 'utf-8';
 $cfg_soft_public = 'base';
 $cfg_softname = '得德系统';

src/system/customfields.func.php

@@ -415,10 +415,12 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '')
         $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-lg'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onClick=\"SelectImage('$fname.$fieldname','big')\">";
     } else if ($ftype == "media") {
         $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
-        $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-lg'> <input type='button'  name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onClick=\"SelectMedia('$fname.$fieldname')\">";
+        $selectStr = defined('DEDEADMIN')? "<input type='button'  name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onClick=\"SelectMedia('$fname.$fieldname')\">" : '';
+        $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-lg'> $selectStr";
     } else if ($ftype == "addon") {
         $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
-        $innertext = "<input type='text' name='$fieldname' id='$fieldname' value='$fvalue' class='form-control admin-input-lg'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onClick=\"SelectSoft('$fname.$fieldname')\">";
+        $selectStr = defined('DEDEADMIN')? "<input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onClick=\"SelectSoft('$fname.$fieldname')\">" : "";
+        $innertext = "<input type='text' name='$fieldname' id='$fieldname' value='$fvalue' class='form-control admin-input-lg'> $selectStr";
     } else if ($ftype == "int" || $ftype == "float") {
         $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-xs' value='$fvalue'>";
     } else if ($ftype == "relation") {

src/system/libraries/splitword.class.php

@@ -201,9 +201,9 @@ class SplitWord
      */
     function LoadDict( $maindic='' )
     {
-		$this->addonDicFile = DEDEINC.'/'.$this->addonDicFile;
-		$this->mainDicFile = DEDEINC.'/'.$this->mainDicFile;
-		$this->mainDicFileZip = DEDEINC.'/'.$this->mainDicFileZip;
+		$this->addonDicFile = DEDEINC.'/libraries/'.$this->addonDicFile;
+		$this->mainDicFile = DEDEINC.'/libraries/'.$this->mainDicFile;
+		$this->mainDicFileZip = DEDEINC.'/libraries/'.$this->mainDicFileZip;
         $startt = microtime(TRUE);
         //正常读取文件
         $dicAddon = $this->addonDicFile;

src/user/archives_edit.php

@@ -18,10 +18,6 @@ $channelid = isset($channelid) && is_numeric($channelid) ? $channelid : 1;
 $aid = isset($aid) && is_numeric($aid) ? $aid : 0;
 $mtypesid = isset($mtypesid) && is_numeric($mtypesid) ? $mtypesid : 0;
 $menutype = 'content';
-if ($cfg_ml->IsSendLimited()) {
-    ShowMsg("投稿失败，投稿限定次数<span class='text-primary'>{$cfg_ml->M_SendMax}次</span>（剩余0次），需要增加次数，请联系网站管理员", "index.php", "0", 5000);
-    exit();
-}
 if (empty($dopost)) {
     //读取归档信息
     $arcQuery = "SELECT arc.*,ch.addtable,ch.fieldset,arc.mtype as mtypeid,ch.arcsta FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' And arc.mid='".$cfg_ml->M_ID."'; ";

src/user/archives_sg_edit.php

@@ -18,10 +18,6 @@ $channelid = isset($channelid) && is_numeric($channelid) ? $channelid : 1;
 $aid = isset($aid) && is_numeric($aid) ? $aid : 0;
 $mtypesid = isset($mtypesid) && is_numeric($mtypesid) ? $mtypesid : 0;
 $menutype = 'content';
-if ($cfg_ml->IsSendLimited()) {
-    ShowMsg("投稿失败，投稿限定次数<span class='text-primary'>{$cfg_ml->M_SendMax}次</span>（剩余0次），需要增加次数，请联系网站管理员", "index.php", "0", 5000);
-    exit();
-}
 if (empty($dopost)) {
     //读取归档信息
     $arcQuery = "SELECT ch.*,arc.* FROM `#@__arctiny` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' ";

src/user/article_edit.php

@@ -18,10 +18,6 @@ $channelid = isset($channelid) && is_numeric($channelid) ? $channelid : 1;
 $aid = isset($aid) && is_numeric($aid) ? $aid : 0;
 $mtypesid = isset($mtypesid) && is_numeric($mtypesid) ? $mtypesid : 0;
 $menutype = 'content';
-if ($cfg_ml->IsSendLimited()) {
-    ShowMsg("投稿失败，投稿限定次数<span class='text-primary'>{$cfg_ml->M_SendMax}次</span>（剩余0次），需要增加次数，请联系网站管理员", "index.php", "0", 5000);
-    exit();
-}
 if (empty($dopost)) {
     //读取归档信息
     $arcQuery = "SELECT arc.*,ch.addtable,ch.fieldset,arc.mtype as mtypeid,ch.arcsta FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' And arc.mid='".$cfg_ml->M_ID."'; ";

src/user/soft_add.php

@@ -23,6 +23,10 @@ require_once(DEDEMEMBER."/inc/inc_archives_functions.php");
 $channelid = isset($channelid) && is_numeric($channelid) ? $channelid : 3;
 $typeid = isset($typeid) && is_numeric($typeid) ? $typeid : 0;
 $menutype = 'content';
+if ($cfg_ml->IsSendLimited()) {
+    ShowMsg("投稿失败，投稿限定次数<span class='text-primary'>{$cfg_ml->M_SendMax}次</span>（剩余0次），需要增加次数，请联系网站管理员", "index.php", "0", 5000);
+    exit();
+}
 if (empty($dopost)) {
     $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid';");
     if (!is_array($cInfos)) {

src/user/templets/edit_baseinfo.htm

@@ -129,7 +129,6 @@
 					}
 					$.post("<?php echo $cfg_cmsurl;?>/user/api.php?action=get_old_email", { oldpwd: $("#iptOldpwd").val() }, function (result) {
 						if (result.code === 0) {
-							console.log(result);
 							$("#spEmail").hide();
 							$("#iptEmail").html(`<input value="${result.data.email}" type="email" name="email" id="iptEmail" class="form-control">`);
 							$("#iptEmail").show();