From 03bd2dccd1f74be5e4868933ca19e0f23347b88b 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: Wed, 15 Nov 2023 10:27:20 +0800 Subject: [PATCH] =?UTF-8?q?6.3.0=E7=89=B9=E5=BE=81=EF=BC=8C=E7=AE=80?= =?UTF-8?q?=E5=86=99=E4=B8=8A=E4=B8=8B=E7=AF=87=E5=92=8C=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/task_do.php | 6 ++-- src/static/web/css/style.css | 4 +-- src/system/archive/archives.class.php | 46 ++++++++++++------------- src/system/archive/freelist.class.php | 14 ++++---- src/system/archive/listview.class.php | 16 ++++----- src/system/archive/searchview.class.php | 6 ++-- src/system/archive/sglistview.class.php | 14 ++++---- src/system/archive/specview.class.php | 12 +++---- src/system/archive/taglist.class.php | 12 +++---- src/system/datalistcp.class.php | 2 +- src/system/taglib/arccontent.lib.php | 2 +- src/theme/dedebiz/article_image.htm | 2 +- 12 files changed, 67 insertions(+), 69 deletions(-) diff --git a/src/admin/task_do.php b/src/admin/task_do.php index c8461815..c8fc4282 100644 --- a/src/admin/task_do.php +++ b/src/admin/task_do.php @@ -40,7 +40,7 @@ function GetNextUrl($notallowArr = array('dopost', 'f', 'del')) } return $reurl; } -//更新上一篇和下一篇 +//更新上篇和下篇 if ($dopost == 'makeprenext') { require_once(DEDEINC.'/archive/archives.class.php'); $aid = intval($aid); @@ -75,12 +75,12 @@ if ($dopost == 'makeindex') { $templet = str_replace("{style}", $cfg_df_style, $row['templet']); $homeFile = dirname(__FILE__).'/'.$row['position']; $homeFile = str_replace("//", "/", str_replace("\\", "/", $homeFile)); - $fp = fopen($homeFile, 'w') or die("无法更新网站首页到：$homeFile 位置"); + $fp = fopen($homeFile, 'w') or die("无法更新网站首页到：".$homeFile."位置"); fclose($fp); $tpl = $cfg_basedir.$cfg_templets_dir.'/'.$templet; if (!file_exists($tpl)) { $tpl = $cfg_basedir.$cfg_templets_dir.'/dedebiz/index.htm'; - if (!file_exists($tpl)) exit("无法找到首页模板：$tpl "); + if (!file_exists($tpl)) exit("无法找到首页模板：$tpl"); } $GLOBALS['_arclistEnv'] = 'index'; $pv->SetTemplet($tpl); diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index af5e5717..597f7111 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -109,9 +109,7 @@ input[type=radio],input[type=checkbox],input[type=radio]:focus,input[type=checkb #validateimg,.btn-send{border-radius:0 0.5rem 0.5rem 0!important} #returntop{display:none;position:fixed;padding:10px 15px;right:1rem;bottom:1rem;color:var(--white);cursor:pointer;background:var(--orange);border-radius:0.5rem;border:0;z-index:9998} #returntop:hover{background:var(--orange)} -@media (max-width:768px){.m-pb-1{padding-bottom:1rem} -.m-pb-2{padding-bottom:2rem} -.login-from{width:100%} +@media (max-width:768px){.login-from{width:100%} .bannr-img,.item-theme-img img,.list-article-img img{height:250px} .item-news-img img{height:210px} .feedbacks .feedback-action{float:none} diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php index 8cc20bda..b53545e2 100755 --- a/src/system/archive/archives.class.php +++ b/src/system/archive/archives.class.php @@ -58,7 +58,7 @@ class Archives $this->TypeLink = new TypeLink($arr['typeid']); if ($this->ChannelUnit->ChannelInfos['issystem'] != -1) { //如果当前文档不是系统模型，为自定义模型 - $query = "SELECT arc.*,tp.reid,tp.typedir,ch.addtable,mb.uname,mb.face,mb.userid FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp on tp.id=arc.typeid LEFT JOIN `#@__channeltype` as ch on arc.channel = ch.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid WHERE arc.id='$aid' "; + $query = "SELECT arc.*,tp.reid,tp.typedir,ch.addtable,mb.uname,mb.face,mb.userid,mb.sex FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp on tp.id=arc.typeid LEFT JOIN `#@__channeltype` as ch on arc.channel = ch.id LEFT JOIN `#@__member` mb on arc.mid = mb.mid WHERE arc.id='$aid' "; $this->Fields = $this->dsql->GetOne($query); } else { $this->Fields['title'] = ''; @@ -98,7 +98,7 @@ class Archives //为了减少重复查询，这里直接把附加表查询记录放在$this->addTableRow中，在ParAddTable()不再查询 if ($this->ChannelUnit->ChannelInfos['addtable'] != '') { if ($this->ChannelUnit->ChannelID < -1) { - $query = "SELECT tb.*,mb.uname,mb.face,mb.userid FROM `{$this->ChannelUnit->ChannelInfos['addtable']}` tb LEFT JOIN `#@__member` mb on tb.mid = mb.mid WHERE tb.`aid` = '$aid'"; + $query = "SELECT tb.*,mb.uname,mb.face,mb.userid,mb.sex FROM `{$this->ChannelUnit->ChannelInfos['addtable']}` tb LEFT JOIN `#@__member` mb on tb.mid = mb.mid WHERE tb.`aid` = '$aid'"; } else { $query = "SELECT * FROM `{$this->ChannelUnit->ChannelInfos['addtable']}` WHERE `aid` = '$aid'"; } @@ -198,7 +198,7 @@ class Archives $this->Fields['imgurls'] = preg_replace("@ [\s]{0,}alt[\s]{0,}=[\"'\s]{0,}[\s\S]{0,}[\"'\s] @isU","",$this->Fields['imgurls']); $this->Fields['imgurls'] = str_ireplace("Fields['title']."\" title=\"".$this->Fields['title']."\"",$this->Fields['imgurls']); } - //移除文档模型正文图片宽度和高度，适配自适应/响应式网站 + //移除文档模型正文图片宽度和高度，适配响应式网站 $this->Fields['body'] = preg_replace("/style=\"width\:(.*)\"/","",$this->Fields['body']); } //完成附加表信息读取 @@ -586,7 +586,7 @@ class Archives } else if ($ctag->GetName() == 'prenext') { $this->dtp->Assign($i, $this->GetPreNext($ctag->GetAtt('get'))); } - //添加上一篇下一篇标签{dede:prenextdiy get='pre'}{/dede:prenextdiy}{dede:prenextdiy get='next'}{/dede:prenextdiy} + //添加上篇下篇标签{dede:prenextdiy get='pre'}{/dede:prenextdiy}{dede:prenextdiy get='next'}{/dede:prenextdiy} else if ($ctag->GetName()=='prenextdiy') { $innertext = trim($ctag->GetInnerText()); @@ -659,10 +659,10 @@ class Archives $this->Fields = ''; } /** - * 获取上一篇和下一篇链接 + * 获取上篇和下篇链接 * * @access public - * @param string $gtype pre为上一篇，preimg为上一篇图片，next为下一篇，nextimg为下一篇图片 + * @param string $gtype pre为上篇，preimg为上篇图片，next为下篇，nextimg为下篇图片 * @return string */ function GetPreNext($gtype = '') @@ -699,10 +699,10 @@ class Archives $this->PreNext['diy']['pre']['title'] = $preRow['title']; $this->PreNext['diy']['pre']['litpic'] = $preRow['litpic']; $this->PreNext['diy']['pre']['pubdate'] = $preRow['senddate']; - $this->PreNext['pre'] = "上一篇：{$preRow['title']}"; + $this->PreNext['pre'] = "上篇：{$preRow['title']}"; $this->PreNext['preimg'] = "\"{$preRow['title']}\" "; } else { - $this->PreNext['pre'] = "上一篇：暂无"; + $this->PreNext['pre'] = "上篇：暂无"; $this->PreNext['preimg'] = ''; } if (is_array($nextRow)) { @@ -727,10 +727,10 @@ class Archives $this->PreNext['diy']['next']['title'] = $nextRow['title']; $this->PreNext['diy']['next']['litpic'] = $nextRow['litpic']; $this->PreNext['diy']['next']['pubdate'] = $nextRow['senddate']; - $this->PreNext['next'] = "下一篇：{$nextRow['title']} "; + $this->PreNext['next'] = "下篇：{$nextRow['title']} "; $this->PreNext['nextimg'] = "\"{$nextRow['title']}\" "; } else { - $this->PreNext['next'] = "下一篇：暂无"; + $this->PreNext['next'] = "下篇：暂无"; $this->PreNext['nextimg'] = ''; } } @@ -816,12 +816,12 @@ class Archives $nPage = $nowPage - 1; $lPage = $nowPage + 1; if ($nowPage == 1) { - $PageList .= "
  • 上一页
    • "; + $PageList .= "
  • 上页
    • "; } else { if ($nPage == 1) { - $PageList .= "
  • 上一页
    • "; + $PageList .= "
  • 上页
    • "; } else { - $PageList .= "
  • 上一页
    • "; + $PageList .= "
  • 上页
    • "; } } for ($i = 1; $i <= $totalPage; $i++) { @@ -841,9 +841,9 @@ class Archives } } if ($lPage <= $totalPage) { - $PageList .= "
  • 下一页
    • "; + $PageList .= "
  • 下页
    • "; } else { - $PageList .= "
  • 下一页
    • "; + $PageList .= "
  • 下页
    • "; } return $PageList; } @@ -938,19 +938,19 @@ class Archives $nPage = $nowPage - 1; $lPage = $nowPage + 1; if ($nowPage == 1) { - $PageList .= "
  • 上一页
    • "; + $PageList .= "
  • 上页
    • "; } else { if ($nPage == 1) { if ($cfg_rewrite == 'Y') { - $PageList .= "
  • 上一页
    • "; + $PageList .= "
  • 上页
    • "; } else { - $PageList .= "
  • 上一页
    • "; + $PageList .= "
  • 上页
    • "; } } else { if ($cfg_rewrite == 'Y') { - $PageList .= "
  • 上一页
    • "; + $PageList .= "
  • 上页
    • "; } else { - $PageList .= "
  • 上一页
    • "; + $PageList .= "
  • 上页
    • "; } } } @@ -980,12 +980,12 @@ class Archives } if ($lPage <= $totalPage) { if ($cfg_rewrite == 'Y') { - $PageList .= "
  • 下一页
    • "; + $PageList .= "
  • 下页
    • "; } else { - $PageList .= "
  • 下一页
    • "; + $PageList .= "
  • 下页
    • "; } } else { - $PageList .= "
  • 下一页
    • "; + $PageList .= "
  • 下页
    • "; } return $PageList; } diff --git a/src/system/archive/freelist.class.php b/src/system/archive/freelist.class.php index 2bef2663..d0fad78a 100755 --- a/src/system/archive/freelist.class.php +++ b/src/system/archive/freelist.class.php @@ -644,16 +644,16 @@ class FreeList $purl = $this->GetCurUrl(); $tnamerule = $this->GetMakeFileRule(); $tnamerule = preg_replace("#^(.*)\/#", '', $tnamerule); - //获得上一页和首页的链接 + //获得上页和首页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上一页
    • \r\n"; + $prepage .= "
  • 上页
    • \r\n"; $indexpage = "
  • 首页
    • \r\n"; } else { $indexpage = "
  • 首页
    • \r\n"; } - //下一页和未页的链接 + //下页和未页的链接 if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下一页
    • \r\n"; + $nextpage .= "
  • 下页
    • \r\n"; $endpage = "
  • 末页
    • \r\n"; } else { $endpage = "
  • 末页
    • \r\n"; @@ -748,15 +748,15 @@ class FreeList $hidenform = "\r\n"; $hidenform .= "\r\n"; $purl .= "?".$geturl; - //获得上一页和下一页的链接 + //获得上页和下页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上一页
    • \r\n"; + $prepage .= "
  • 上页
    • \r\n"; $indexpage = "
  • 首页\r\n"; } else { $indexpage = "
  • 首页
    • \r\n"; } if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下一页
    • \r\n"; + $nextpage .= "
  • 下页
    • \r\n"; $endpage = "
  • 末页
    • \r\n"; } else { $endpage = "
  • 末页
    • \r\n"; diff --git a/src/system/archive/listview.class.php b/src/system/archive/listview.class.php index 83ff6222..4b46e6f8 100755 --- a/src/system/archive/listview.class.php +++ b/src/system/archive/listview.class.php @@ -40,7 +40,7 @@ class ListView * * @access public * @param int $typeid 栏目id - * @param int $uppage 上一页 + * @param int $uppage 上页 * @param int $mod 渲染类型 0:HTML 1:JSON * @return string */ @@ -1032,16 +1032,16 @@ class ListView $maininfo = "
  • {$totalpage}页".$this->TotalResult."条
    • \r\n"; $tnamerule = $this->GetMakeFileRule($this->Fields['id'], "list", $this->Fields['typedir'], $this->Fields['defaultname'], $this->Fields['namerule2']); $tnamerule = preg_replace("/^(.*)\//", '', $tnamerule); - //获得上一页和首页的链接 + //获得上页和首页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上一页
    • \r\n"; + $prepage .= "
  • 上页
    • \r\n"; $indexpage = "
  • 首页
    • \r\n"; } else { $indexpage = "
  • 首页
    • \r\n"; } - //下一页和未页的链接 + //下页和未页的链接 if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下一页
    • \r\n"; + $nextpage .= "
  • 下页
    • \r\n"; $endpage = "
  • 末页
    • \r\n"; } else { $endpage = "
  • 末页
    • \r\n"; @@ -1157,15 +1157,15 @@ class ListView foreach($_GET as $key => $value) { $pageaddurl .= ($key!="tid" && $key!="TotalResult" && $key!="PageNo" && $key!="PageSize" && $key!="mod") ? "&".string_filter($key)."=".string_filter($value) : ''; } - //获得上一页和下一页的链接 + //获得上页和下页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上一页
    • \r\n"; + $prepage .= "
  • 上页
    • \r\n"; $indexpage = "
  • 首页
    • \r\n"; } else { $indexpage = "
  • 首页
    • \r\n"; } if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下一页
    • \r\n"; + $nextpage .= "
  • 下页
    • \r\n"; $endpage = "
  • 末页
    • \r\n"; } else { $endpage = "
  • 末页
    • \r\n"; diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php index 13d07aed..163cc838 100755 --- a/src/system/archive/searchview.class.php +++ b/src/system/archive/searchview.class.php @@ -662,15 +662,15 @@ class SearchView $hidenform .= "\r\n"; $hidenform .= "\r\n"; $purl .= "?".$geturl; - //获得上一页和下一页的链接 + //获得上页和下页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上一页
    • \r\n"; + $prepage .= "
  • 上页
    • \r\n"; $indexpage = "
  • 首页
    • \r\n"; } else { $indexpage = "
  • 首页
    • \r\n"; } if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下一页
    • \r\n"; + $nextpage .= "
  • 下页
    • \r\n"; $endpage = "
  • 末页
    • \r\n"; } else { $endpage = "
  • 末页
    • \r\n"; diff --git a/src/system/archive/sglistview.class.php b/src/system/archive/sglistview.class.php index c430e98b..67e33916 100755 --- a/src/system/archive/sglistview.class.php +++ b/src/system/archive/sglistview.class.php @@ -861,16 +861,16 @@ class SgListView $maininfo = "
  • {$totalpage}页".$this->TotalResult."条
    • "; $tnamerule = $this->GetMakeFileRule($this->Fields['id'], "list", $this->Fields['typedir'], $this->Fields['defaultname'], $this->Fields['namerule2']); $tnamerule = preg_replace("/^(.*)\//", '', $tnamerule); - //获得上一页和首页的链接 + //获得上页和首页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上一页
    • \r\n"; + $prepage .= "
  • 上页
    • \r\n"; $indexpage = "
  • 首页
    • \r\n"; } else { $indexpage = "
  • 首页
    • \r\n"; } - //下一页和未页的链接 + //下页和未页的链接 if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下一页
    • \r\n"; + $nextpage .= "
  • 下页
    • \r\n"; $endpage = "
  • 末页
    • \r\n"; } else { $endpage = "
  • 末页
    • "; @@ -965,15 +965,15 @@ class SgListView $hidenform = "\r\n"; $hidenform .= "\r\n"; $purl .= "?tid=".$this->TypeID."&"; - //获得上一页和下一页的链接 + //获得上页和下页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上一页
    • \r\n"; + $prepage .= "
  • 上页
    • \r\n"; $indexpage = "
  • 首页
    • \r\n"; } else { $indexpage = "
  • 首页
    • \r\n"; } if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下一页
    • \r\n"; + $nextpage .= "
  • 下页
    • \r\n"; $endpage = "
  • 末页
    • \r\n"; } else { $endpage = "
  • 末页
    • "; diff --git a/src/system/archive/specview.class.php b/src/system/archive/specview.class.php index 67f715cb..57e8d537 100755 --- a/src/system/archive/specview.class.php +++ b/src/system/archive/specview.class.php @@ -446,15 +446,15 @@ class SpecView } $purl = $this->GetCurUrl(); $tnamerule = "spec_"; - //获得上一页和下一页的链接 + //获得上页和下页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上一页
    • \r\n"; + $prepage .= "
  • 上页
    • \r\n"; $indexpage = "
  • 首页
    • \r\n"; } else { $indexpage = "
  • 首页
    • \r\n"; } if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下一页
    • \r\n"; + $nextpage .= "
  • 下页
    • \r\n"; $endpage = "
  • 末页
    • \r\n"; } else { $endpage = "
  • 末页
    • \r\n"; @@ -513,15 +513,15 @@ class SpecView $hidenform = "\r\n"; $hidenform .= "\r\n"; $purl .= "?".$geturl; - //获得上一页和下一页的链接 + //获得上页和下页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上一页
    • \r\n"; + $prepage .= "
  • 上页
    • \r\n"; $indexpage = "
  • 首页
    • \r\n"; } else { $indexpage = "
  • 首页
    • \r\n"; } if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下一页
    • \r\n"; + $nextpage .= "
  • 下页
    • \r\n"; $endpage = "
  • 末页
    • \r\n"; } else { $endpage = "
  • 末页
    • "; diff --git a/src/system/archive/taglist.class.php b/src/system/archive/taglist.class.php index efbc243b..7880e8b1 100755 --- a/src/system/archive/taglist.class.php +++ b/src/system/archive/taglist.class.php @@ -416,15 +416,15 @@ class TagList $maininfo = "
  • {$totalpage}页".$this->TotalResult."条
    • \r\n"; $purl = $this->GetCurUrl(); $purl .= "?/".urlencode($this->Tag); - //获得上一页和下一页的链接 + //获得上页和下页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上一页
    • \r\n"; + $prepage .= "
  • 上页
    • \r\n"; $indexpage = "
  • 首页
    • \r\n"; } else { $indexpage = "
  • 首页
    • \r\n"; } if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下一页
    • \r\n"; + $nextpage .= "
  • 下页
    • \r\n"; $endpage = "
  • 末页
    • \r\n"; } else { $endpage = "
  • 末页
    • \r\n"; @@ -490,15 +490,15 @@ class TagList } $maininfo = "
  • {$totalpage}页".$this->TotalResult."条
    • \r\n"; $purl = $this->tagsDir.'/'.$this->TagInfos['id']; - //获得上一页和下一页的链接 + //获得上页和下页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上一页
    • \r\n"; + $prepage .= "
  • 上页
    • \r\n"; $indexpage = "
  • 首页
    • \r\n"; } else { $indexpage = "
  • 首页
    • \r\n"; } if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下一页
    • \r\n"; + $nextpage .= "
  • 下页
    • \r\n"; $endpage = "
  • 末页
    • \r\n"; } else { $endpage = "
  • 末页
    • \r\n"; diff --git a/src/system/datalistcp.class.php b/src/system/datalistcp.class.php index 1dc1c014..2bce14dd 100755 --- a/src/system/datalistcp.class.php +++ b/src/system/datalistcp.class.php @@ -253,7 +253,7 @@ class DataListCP } } $purl .= "?".$geturl; - //获得上一页和下一页的链接 + //获得上页和下页的链接 if ($this->pageNO != 1) { $prepage .= "
  • $lang_pre_page
    • \n"; $indexpage = "
  • $lang_index_page
    • \n"; diff --git a/src/system/taglib/arccontent.lib.php b/src/system/taglib/arccontent.lib.php index ff27aca6..a18196b9 100644 --- a/src/system/taglib/arccontent.lib.php +++ b/src/system/taglib/arccontent.lib.php @@ -18,7 +18,7 @@ function lib_arccontent(&$ctag, &$refObj) $type = $ctag->GetAtt('type'); $revalue = ''; if (in_array($type, array("pre", "next")) && get_class($refObj) === "Archives") { - //在文档页面获取上一篇下一篇文档 + //在文档页面获取上篇下篇文档 $asql = "WHERE id<{$refObj->Fields['id']}"; if ($type === "next") { $asql = "WHERE id>{$refObj->Fields['id']}"; diff --git a/src/theme/dedebiz/article_image.htm b/src/theme/dedebiz/article_image.htm index 6c608946..8e9fd995 100644 --- a/src/theme/dedebiz/article_image.htm +++ b/src/theme/dedebiz/article_image.htm @@ -99,7 +99,7 @@ @me = ''; } {/dede:field} - + {dede:field name='imgurls' alt='输出不同的图片信息'} [field:pagestyle runphp='yes'] @me= (@me==3 ? '
    ' : '');[/field:pagestyle]

    [field:alttext/]