diff --git a/src/admin/catalog_do.php b/src/admin/catalog_do.php index ceebbeee..3996401e 100644 --- a/src/admin/catalog_do.php +++ b/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); diff --git a/src/admin/dialog/select_mimages.php b/src/admin/dialog/select_mimages.php index 715e1609..6eecb5e4 100644 --- a/src/admin/dialog/select_mimages.php +++ b/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 = ``; window.opener.CKEDITOR.instances[""].insertHtml(addonHTML); diff --git a/src/admin/mychannel_edit.php b/src/admin/mychannel_edit.php index 786b6454..0bda6588 100644 --- a/src/admin/mychannel_edit.php +++ b/src/admin/mychannel_edit.php @@ -408,9 +408,9 @@ if ($dopost == "show") { } $template = trim($template); $forms = '
'; - $forms .= ""; - $forms .= ""; - $forms .= "关键词:
"; + $forms .= ""; + $forms .= ""; + $forms .= "关键词:
"; $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 .= "栏目:\r\n"; $forms .= "\r\n"; $forms .= $typeOptions; $forms .= "
"; $forms .= "
"; } else if ($mainfield == 'iscommend') { - $forms .= "
"; + $forms .= "
"; } else if ($mainfield == 'writer') { - $forms .= "作者:
"; + $forms .= "作者:
"; } else if ($mainfield == 'source') { - $forms .= "来源:
"; + $forms .= "来源:
"; } else if ($mainfield == 'senddate') { - $forms .= "开始时间:
"; - $forms .= "结束时间:
"; + $forms .= "开始时间:
"; + $forms .= "结束时间:
"; } } } @@ -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 .= "栏目:\r\n"; $forms .= "\r\n"; $forms .= $typeOptions; $forms .= "
"; $forms .= "
"; $addonstring .= 'typeid:int,'; } elseif ($addonfield == 'senddate') { - $forms .= "开始时间:
"; - $forms .= "结束时间:
"; + $forms .= "开始时间:
"; + $forms .= "结束时间:
"; $addonstring .= 'senddate:datetime,'; } } @@ -482,13 +482,13 @@ if ($dopost == "show") { $type = $typearr[$k]; $tmp = $name.':'.$type; if (in_array($type, $intarr)) { - $forms .= "$itemname :
"; + $forms .= "$itemname :
"; } else if (in_array($type, $textarr)) { - $forms .= "$itemname :
"; + $forms .= "$itemname :
"; } else if ($type == 'select') { $values = explode(',', $valuearr[$k]); if (is_array($values) && !empty($values)) { - $forms .= "$itemname : "; foreach ($values as $value) { $forms .= ""; } @@ -497,9 +497,9 @@ if ($dopost == "show") { } else if ($type == 'radio') { $values = explode(',', $valuearr[$k]); if (is_array($values) && !empty($values)) { - $forms .= "$itemname :
"; + $forms .= "$itemname :
"; foreach ($values as $value) { - $forms .= ""; + $forms .= ""; } } } else if ($type == 'checkbox') { @@ -507,26 +507,39 @@ if ($dopost == "show") { if (is_array($values) && !empty($values)) { $forms .= "$itemname : "; foreach ($values as $value) { - $forms .= "
"; + $forms .= "
"; } } } elseif ($type == 'datetime') { - $forms .= "开始时间:
"; - $forms .= "结束时间:
"; + $forms .= "开始时间:
"; + $forms .= "结束时间:
"; } else { $tmp = ''; } $addonstring .= $tmp.','; } } - $forms .= '
'; + $forms .= ''; $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 ''; + echo ''; + echo ' + + + + + '; echo ''; - echo "

下面生成的网页表单,请自行复制,根据自己需求修改样式后粘贴到对应的模板中

"; + echo "

下面生成的网页表单,请自行复制,根据自己需求修改样式后粘贴到对应的模板中

"; echo '
'; + echo ''; echo $forms; } exit; diff --git a/src/admin/templets/sys_payment.htm b/src/admin/templets/sys_payment.htm index 63c1413a..4a31dc2b 100644 --- a/src/admin/templets/sys_payment.htm +++ b/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") { diff --git a/src/install/index.php b/src/install/index.php index 55279b61..8a72d16b 100644 --- a/src/install/index.php +++ b/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); diff --git a/src/install/install.html b/src/install/install.html index 5ac310f8..1eef4a8d 100644 --- a/src/install/install.html +++ b/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) diff --git a/src/system/common.inc.php b/src/system/common.inc.php index 5b8f1842..f59a1788 100755 --- a/src/system/common.inc.php +++ b/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 = '得德系统'; diff --git a/src/system/customfields.func.php b/src/system/customfields.func.php index 3be2e9c8..8b318372 100755 --- a/src/system/customfields.func.php +++ b/src/system/customfields.func.php @@ -415,10 +415,12 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '') $innertext = " "; } else if ($ftype == "media") { $fname = defined('DEDEADMIN')? 'form1' : 'addcontent'; - $innertext = " "; + $selectStr = defined('DEDEADMIN')? "" : ''; + $innertext = " $selectStr"; } else if ($ftype == "addon") { $fname = defined('DEDEADMIN')? 'form1' : 'addcontent'; - $innertext = " "; + $selectStr = defined('DEDEADMIN')? "" : ""; + $innertext = " $selectStr"; } else if ($ftype == "int" || $ftype == "float") { $innertext = ""; } else if ($ftype == "relation") { diff --git a/src/system/libraries/splitword.class.php b/src/system/libraries/splitword.class.php index 3ab7de84..12e5bf2a 100755 --- a/src/system/libraries/splitword.class.php +++ b/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; diff --git a/src/user/archives_edit.php b/src/user/archives_edit.php index 5df816ea..2996f5d9 100755 --- a/src/user/archives_edit.php +++ b/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("投稿失败,投稿限定次数{$cfg_ml->M_SendMax}次(剩余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."'; "; diff --git a/src/user/archives_sg_edit.php b/src/user/archives_sg_edit.php index b4c56fbf..1187cdc1 100755 --- a/src/user/archives_sg_edit.php +++ b/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("投稿失败,投稿限定次数{$cfg_ml->M_SendMax}次(剩余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' "; diff --git a/src/user/article_edit.php b/src/user/article_edit.php index 6cd70022..41f58011 100755 --- a/src/user/article_edit.php +++ b/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("投稿失败,投稿限定次数{$cfg_ml->M_SendMax}次(剩余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."'; "; diff --git a/src/user/soft_add.php b/src/user/soft_add.php index ca6d8640..723bbbfa 100755 --- a/src/user/soft_add.php +++ b/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("投稿失败,投稿限定次数{$cfg_ml->M_SendMax}次(剩余0次),需要增加次数,请联系网站管理员", "index.php", "0", 5000); + exit(); +} if (empty($dopost)) { $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid';"); if (!is_array($cInfos)) { diff --git a/src/user/templets/edit_baseinfo.htm b/src/user/templets/edit_baseinfo.htm index 454584e7..8331200a 100755 --- a/src/user/templets/edit_baseinfo.htm +++ b/src/user/templets/edit_baseinfo.htm @@ -129,7 +129,6 @@ } $.post("/user/api.php?action=get_old_email", { oldpwd: $("#iptOldpwd").val() }, function (result) { if (result.code === 0) { - console.log(result); $("#spEmail").hide(); $("#iptEmail").html(``); $("#iptEmail").show();