diff --git a/docs/changelog.md b/docs/changelog.md index 41cbdcf5..7f132bcf 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -3,6 +3,12 @@ # V6.5.0 - 增加AI助手,可自动化构建站点内容; +- 优化tag动态和静态生成; +- 优化搜索词和tag标签管理; +- 调整文档发布和修改时间; +- 调整支付配置布局; +- 优化后台提示文字; +- 优化php8.4部分兼容问题; # V6.3.2 - 重做后台管理,手机端更好访问后台; diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php index 2a1cdedd..94274cb8 100644 --- a/src/admin/album_edit.php +++ b/src/admin/album_edit.php @@ -83,6 +83,7 @@ if ($dopost != 'save') { } //对保存的文档进行处理 $pubdate = GetMkTime($pubdate); + $senddate = GetMkTime($senddate); $sortrank = AddDay($pubdate, $sortup); $ismake = $ishtml == 0 ? -1 : 0; $title = cn_substrR($title, $cfg_title_maxlen); @@ -117,7 +118,7 @@ if ($dopost != 'save') { if (preg_match("#j#", $flag)) $ismake = -1; //更新数据库的SQL语句 $query = " - UPDATE `#@__archives` SET typeid='$typeid',typeid2='$typeid2',sortrank='$sortrank',flag='$flag',click='$click',ismake='$ismake',arcrank='$arcrank',money='$money',title='$title',color='$color',source='$source',writer='$writer',litpic='$litpic',pubdate='$pubdate',notpost='$notpost',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename',dutyadmin='$adminid' WHERE id='$id'; "; + UPDATE `#@__archives` SET typeid='$typeid',typeid2='$typeid2',sortrank='$sortrank',flag='$flag',click='$click',ismake='$ismake',arcrank='$arcrank',money='$money',title='$title',color='$color',source='$source',writer='$writer',litpic='$litpic',pubdate='$pubdate',senddate='$senddate',notpost='$notpost',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename',dutyadmin='$adminid' WHERE id='$id'; "; if (!$dsql->ExecuteNoneQuery($query)) { ShowMsg("数据保存到数据库文档主表出错,请检查数据库字段".$dsql->GetError(), "javascript:;"); exit(); diff --git a/src/admin/archives_edit.php b/src/admin/archives_edit.php index aa40dbcf..5d5f007d 100644 --- a/src/admin/archives_edit.php +++ b/src/admin/archives_edit.php @@ -69,6 +69,7 @@ if ($dopost != 'save') { } //对保存的文档进行处理 $pubdate = GetMkTime($pubdate); + $senddate = GetMkTime($senddate); $sortrank = AddDay($pubdate, $sortup); $ismake = $ishtml == 0 ? -1 : 0; $title = cn_substrR($title, $cfg_title_maxlen); @@ -122,7 +123,7 @@ if ($dopost != 'save') { //跳转网址的文档强制为动态 if (preg_match("#j#", $flag)) $ismake = -1; //更新数据库的SQL语句 - $inQuery = "UPDATE `#@__archives` SET typeid='$typeid',typeid2='$typeid2',sortrank='$sortrank',flag='$flag',notpost='$notpost',click='$click',ismake='$ismake',arcrank='$arcrank',money='$money',title='$title',color='$color',writer='$writer',source='$source',litpic='$litpic',pubdate='$pubdate',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename',dutyadmin='$adminid',weight='$weight' WHERE id='$id'; "; + $inQuery = "UPDATE `#@__archives` SET typeid='$typeid',typeid2='$typeid2',sortrank='$sortrank',flag='$flag',notpost='$notpost',click='$click',ismake='$ismake',arcrank='$arcrank',money='$money',title='$title',color='$color',writer='$writer',source='$source',litpic='$litpic',pubdate='$pubdate',senddate='$senddate',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename',dutyadmin='$adminid',weight='$weight' WHERE id='$id'; "; if (!$dsql->ExecuteNoneQuery($inQuery)) { ShowMsg("数据保存到数据库文档主表出错,请检查数据库字段", "-1"); exit(); diff --git a/src/admin/article_edit.php b/src/admin/article_edit.php index 699b716d..1f2e7f35 100644 --- a/src/admin/article_edit.php +++ b/src/admin/article_edit.php @@ -72,6 +72,7 @@ if ($dopost != 'save') { } //对保存的文档进行处理 $pubdate = GetMkTime($pubdate); + $senddate = GetMkTime($senddate); $sortrank = AddDay($pubdate, $sortup); $ismake = $ishtml == 0 ? -1 : 0; $autokey = 1; @@ -132,7 +133,7 @@ if ($dopost != 'save') { //跳转网址的文档强制为动态 if (preg_match("#j#", $flag)) $ismake = -1; //更新数据库的SQL语句 - $query = "UPDATE `#@__archives` SET typeid='$typeid',typeid2='$typeid2',sortrank='$sortrank',flag='$flag',click='$click',ismake='$ismake',arcrank='$arcrank',money='$money',title='$title',color='$color',writer='$writer',source='$source',litpic='$litpic',pubdate='$pubdate',notpost='$notpost',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename',dutyadmin='$adminid',weight='$weight' WHERE id='$id'; "; + $query = "UPDATE `#@__archives` SET typeid='$typeid',typeid2='$typeid2',sortrank='$sortrank',flag='$flag',click='$click',ismake='$ismake',arcrank='$arcrank',money='$money',title='$title',color='$color',writer='$writer',source='$source',litpic='$litpic',pubdate='$pubdate',senddate='$senddate',notpost='$notpost',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename',dutyadmin='$adminid',weight='$weight' WHERE id='$id'; "; if (!$dsql->ExecuteNoneQuery($query)) { ShowMsg('数据保存到数据库文档主表出错,请检查数据库字段', -1); exit(); diff --git a/src/admin/catalog_add.php b/src/admin/catalog_add.php index 53518566..6b88ce34 100644 --- a/src/admin/catalog_add.php +++ b/src/admin/catalog_add.php @@ -184,7 +184,7 @@ if ($dopost == 'quick') { } ShowMsg("成功创建一个栏目", "catalog_main.php"); exit(); -}//End dopost==save +} //获取从父目录继承的默认参数 if ($dopost == '') { $channelid = 1; diff --git a/src/admin/catalog_edit.php b/src/admin/catalog_edit.php index f3824541..3dcb6492 100644 --- a/src/admin/catalog_edit.php +++ b/src/admin/catalog_edit.php @@ -30,7 +30,7 @@ if ($dopost == "save") { $uptopsql = " ,siteurl='$siteurl',sitepath='$sitepath',ishidden='$ishidden' "; } if ($ispart != 0) $cross = 0; - $upquery = "UPDATE `#@__arctype` SET issend='$issend',sortrank='$sortrank',typename='$typename',cnoverview='$cnoverview',enname='$enname',enoverview='$enoverview',bigpic='$bigpic',litimg='$litimg',typedir='$typedir',isdefault='$isdefault',defaultname='$defaultname',issend='$issend',ishidden='$ishidden',channeltype='$channeltype',tempindex='$tempindex',templist='$templist',temparticle='$temparticle',namerule='$namerule',namerule2='$namerule2',ispart='$ispart',corank='$corank',description='$description',keywords='$keywords',seotitle='$seotitle',moresite='$moresite',`cross`='$cross',`content`='$content',`crossid`='$crossid',`smalltypes`='$smalltypes',`apienabled`='$apienabled',`apikey`='$apikey'$uptopsql WHERE id='$id' "; + $upquery = "UPDATE `#@__arctype` SET issend='$issend',sortrank='$sortrank',typename='$typename',cnoverview='$cnoverview',enname='$enname',enoverview='$enoverview',bigpic='$bigpic',litimg='$litimg',typedir='$typedir',isdefault='$isdefault',defaultname='$defaultname',issend='$issend',ishidden='$ishidden',channeltype='$channeltype',tempindex='$tempindex',templist='$templist',temparticle='$temparticle',namerule='$namerule',namerule2='$namerule2',ispart='$ispart',corank='$corank',description='$description',keywords='$keywords',seotitle='$seotitle',moresite='$moresite',`cross`='$cross',`content`='$content',`crossid`='$crossid',`smalltypes`='$smalltypes',`apienabled`='$apienabled',`apikey`='$apikey' $uptopsql WHERE id='$id' "; if (!$dsql->ExecuteNoneQuery($upquery)) { ShowMsg("保存栏目失败,请您检查栏目字段是否存在问题", "-1"); exit(); @@ -56,8 +56,7 @@ if ($dopost == "save") { UpDateCatCache(); ShowMsg("成功修改一个栏目", "catalog_main.php"); exit(); -} //End Save Action -else if ($dopost == "savetime") { +} else if ($dopost == "savetime") { $uptopsql = ''; $slinks = " id IN (".GetSonIds($id).")"; //顶级栏目二级域名根目录处理 diff --git a/src/admin/inc/inc_archives_functions.php b/src/admin/inc/inc_archives_functions.php index 49f465ea..55aff498 100644 --- a/src/admin/inc/inc_archives_functions.php +++ b/src/admin/inc/inc_archives_functions.php @@ -525,7 +525,7 @@ function AnalyseHtmlBody($body, &$description, &$litpic, &$keywords, $dtype = '' $body = Replace_Links($body, $allow_urls); } //自动摘要 - if ($description == '' && $cfg_auot_description > 0) { + if ($cfg_auot_description > 0 && $description == '') { $description = cn_substr(html2text($body), $cfg_auot_description); $description = trim(preg_replace('/#p#|#e#/', '', $description)); $description = addslashes($description); @@ -535,7 +535,7 @@ function AnalyseHtmlBody($body, &$description, &$litpic, &$keywords, $dtype = '' $litpic = GetDDImgFromBody($body); } //自动获取关键词 - if ($autokey == 1 && $keywords == '') { + if ($autokey == 1) { $subject = $title; $message = $body; //采用DedeBIZ Core分词组件分词 diff --git a/src/admin/inc/inc_batchup.php b/src/admin/inc/inc_batchup.php index 3ab12731..158b5a13 100644 --- a/src/admin/inc/inc_batchup.php +++ b/src/admin/inc/inc_batchup.php @@ -57,7 +57,7 @@ function DelArc($aid, $type = 'ON', $onlyfile = FALSE, $recycle = 0) //$issystem==-1是自定义模型,不使用回收站 if ($issystem == -1) $type = 'OK'; if (!is_array($arcRow)) return FALSE; - /** 删除到回收站 **/ + //删除到回收站 if ($cfg_delete == 'Y' && $type == 'ON') { $dsql->ExecuteNoneQuery("UPDATE `$maintable` SET arcrank='-2' WHERE id='$aid' "); $dsql->ExecuteNoneQuery("UPDATE `#@__arctiny` SET `arcrank` = '-2' WHERE id = '$aid';"); diff --git a/src/admin/inc/inc_menu_func.php b/src/admin/inc/inc_menu_func.php index a828e777..dc0bb8e6 100644 --- a/src/admin/inc/inc_menu_func.php +++ b/src/admin/inc/inc_menu_func.php @@ -60,5 +60,5 @@ function GetMenus($userrank, $topos = 'main') echo $footTemplet; } } -}//End Function +} ?> \ No newline at end of file diff --git a/src/admin/media_add.php b/src/admin/media_add.php index 1c40309e..8db5e917 100644 --- a/src/admin/media_add.php +++ b/src/admin/media_add.php @@ -15,7 +15,7 @@ if (empty($dopost)) $dopost = ''; if ($dopost == "upload") { CheckCSRF(); require_once(DEDEINC."/image.func.php"); - $sparr_image = array("image/pjpeg", "image/jpeg", "image/gif", "image/png", "image/x-png", "image/wbmp"); + $sparr_image = array("image/pjpeg", "image/jpeg", "image/gif", "image/png", "image/xpng", "image/wbmp"); $sparr_flash = array("application/xshockwaveflash"); $okdd = 0; $uptime = time(); diff --git a/src/admin/member_operations.php b/src/admin/member_operations.php index 9f419d9c..7c99b52e 100644 --- a/src/admin/member_operations.php +++ b/src/admin/member_operations.php @@ -14,7 +14,8 @@ DedeSetCookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); require_once(DEDEINC.'/datalistcp.class.php'); if (empty($buyid)) $buyid = ''; $buyid = HtmlReplace($buyid , 1); -$sta = HtmlReplace($sta , 1); +$sta = ''; //初始化$sta变量,感谢:乖乖女 +$sta = HtmlReplace($sta, 1); $addsql = " WHERE buyid LIKE '%$buyid%' "; if (!empty($sta)) $addsql .= " AND sta='$sta' "; $sql = "SELECT * FROM `#@__member_operation` $addsql ORDER BY aid DESC"; diff --git a/src/admin/search_keywords_main.php b/src/admin/search_keywords_main.php index 1bc46c7a..7ae1249e 100644 --- a/src/admin/search_keywords_main.php +++ b/src/admin/search_keywords_main.php @@ -70,9 +70,10 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid')
{page} 栏目页码数
伪静态规则(Nginx)
rewrite ^/list-([0-9]+)$ /apps/list.php?tid=$1;
- rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2; +rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;
{cc} 日期加混编id后用转换为适合字母
伪静态规则(Nginx)
rewrite ^/article-([0-9]+).html$ /apps/view.php?arcID=$1;
- rewrite ^/article-([0-9]+)-([0-9]+).html$ /apps/view.php?aid=$1&pageno=$2; +rewrite ^/article-([0-9]+)-([0-9]+).html$ /apps/view.php?aid=$1&pageno=$2;
{page} 栏目页码数
伪静态规则(Nginx)
rewrite ^/list-([0-9]+)$ /apps/list.php?tid=$1;
- rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2; +rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;
{cc} 日期加混编id后用转换为适合字母
伪静态规则(Nginx)
rewrite ^/article-([0-9]+).html$ /apps/view.php?arcID=$1;
- rewrite ^/article-([0-9]+)-([0-9]+).html$ /apps/view.php?aid=$1&pageno=$2; +rewrite ^/article-([0-9]+)-([0-9]+).html$ /apps/view.php?aid=$1&pageno=$2;
{page} 栏目页码数
伪静态规则(Nginx)
rewrite ^/list-([0-9]+)$ /apps/list.php?tid=$1;
- rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2; +rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;
{cc} 日期加混编id后用转换为适合字母
伪静态规则(Nginx)
rewrite ^/article-([0-9]+).html$ /apps/view.php?arcID=$1;
- rewrite ^/article-([0-9]+)-([0-9]+).html$ /apps/view.php?aid=$1&pageno=$2; +rewrite ^/article-([0-9]+)-([0-9]+).html$ /apps/view.php?aid=$1&pageno=$2;