From 3b13939b744ba1412dd00a631723ff8a058ca439 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?=
<93301500+xushubieli@users.noreply.github.com>
Date: Thu, 24 Apr 2025 00:18:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E7=AB=A0=E6=A0=87?=
=?UTF-8?q?=E9=A2=98=E6=A0=87=E9=A2=98=EF=BC=8C=E5=A4=A7=E5=B0=8F=E5=86=99?=
=?UTF-8?q?=E6=AD=A3=E7=A1=AEPageNo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/system/archive/archives.class.php | 38 +++++++++++++--------------
src/theme/dedebiz/article_image.htm | 3 ---
2 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php
index 21d11c27..7a92d4d1 100755
--- a/src/system/archive/archives.class.php
+++ b/src/system/archive/archives.class.php
@@ -84,10 +84,10 @@ class Archives
$this->FixedValues = '';
$this->TempSource = '';
$this->remoteDir = '';
- if (empty($GLOBALS['pageno'])) {
+ if (empty($GLOBALS['PageNo'])) {
$this->NowPage = 1;
} else {
- $this->NowPage = $GLOBALS['pageno'];
+ $this->NowPage = $GLOBALS['PageNo'];
}
//特殊的字段数据处理
$this->Fields['aid'] = $aid;
@@ -340,7 +340,7 @@ class Archives
for ($i = 1; $i <= $this->TotalPage; $i++) {
if ($this->TotalPage > 1) {
$this->Fields['tmptitle'] = (empty($this->Fields['tmptitle']) ? $this->Fields['title'] : $this->Fields['tmptitle']);
- if ($i > 1) $this->Fields['title'] = $this->Fields['tmptitle']."($i)";
+ if ($i > 1) $this->Fields['title'] = $this->Fields['tmptitle']."-第"."$i"."页";
}
if ($i > 1) {
$TRUEfilename = $this->GetTruePath().$fileFirst."-".$i.".".$this->ShortName;
@@ -469,7 +469,7 @@ class Archives
return '';
}
$this->Fields["displaytype"] = "dm";
- if ($this->NowPage > 1) $this->Fields["title"] = $this->Fields["title"]."({$this->NowPage})";
+ if ($this->NowPage > 1) $this->Fields["title"] = $this->Fields["title"]."-第"."{$this->NowPage}"."页";
//预编译
$this->LoadTemplet();
$this->ParAddTable();
@@ -545,17 +545,17 @@ class Archives
* 解析模板，对文档里的变动进行赋值
*
* @access public
- * @param string $pageNo 页码数
+ * @param string $PageNo 页码数
* @param string $ismake 是否生成
* @return string
*/
- function ParseDMFields($pageNo, $ismake = 1)
+ function ParseDMFields($PageNo, $ismake = 1)
{
- $this->NowPage = $pageNo;
+ $this->NowPage = $PageNo;
$this->Fields['nowpage'] = $this->NowPage;
if ($this->SplitPageField != '' && isset($this->Fields[$this->SplitPageField])) {
- $this->Fields[$this->SplitPageField] = $this->SplitFields[$pageNo - 1];
- if ($pageNo > 1) $this->Fields['description'] = trim(preg_replace("/[\r\n\t]/", ' ', cn_substr(html2text($this->Fields[$this->SplitPageField]), 200)));
+ $this->Fields[$this->SplitPageField] = $this->SplitFields[$PageNo - 1];
+ if ($PageNo > 1) $this->Fields['description'] = trim(preg_replace("/[\r\n\t]/", ' ', cn_substr(html2text($this->Fields[$this->SplitPageField]), 200)));
}
//解析模板
if (is_array($this->dtp->CTags)) {
@@ -570,9 +570,9 @@ class Archives
}
} else if ($ctag->GetName() == 'pagetitle') {
if ($ismake == 0) {
- $this->dtp->Assign($i, $this->GetPageTitlesDM($ctag->GetAtt("style"), $pageNo));
+ $this->dtp->Assign($i, $this->GetPageTitlesDM($ctag->GetAtt("style"), $PageNo));
} else {
- $this->dtp->Assign($i, $this->GetPageTitlesST($ctag->GetAtt("style"), $pageNo));
+ $this->dtp->Assign($i, $this->GetPageTitlesST($ctag->GetAtt("style"), $PageNo));
}
} else if ($ctag->GetName() == 'prenext') {
$this->dtp->Assign($i, $this->GetPreNext($ctag->GetAtt('get')));
@@ -745,10 +745,10 @@ class Archives
*
* @access public
* @param string $styleName 类型名称
- * @param string $pageNo 页码数
+ * @param string $PageNo 页码数
* @return string
*/
- function GetPageTitlesST($styleName, $pageNo)
+ function GetPageTitlesST($styleName, $PageNo)
{
if ($this->TotalPage == 1) {
return "";
@@ -763,7 +763,7 @@ class Archives
if ($i == 1) {
$revalue .= "$v";
} else {
- if ($pageNo == $i) {
+ if ($PageNo == $i) {
$revalue .= "$v";
} else {
$revalue .= "$v";
@@ -777,7 +777,7 @@ class Archives
if ($i == 1) {
$revalue .= "";
} else {
- if ($pageNo == $i) {
+ if ($PageNo == $i) {
$revalue .= "";
} else {
$revalue .= "";
@@ -843,10 +843,10 @@ class Archives
*
* @access public
* @param string $styleName 类型名称
- * @param string $pageNo 页码数
+ * @param string $PageNo 页码数
* @return string
*/
- function GetPageTitlesDM($styleName, $pageNo)
+ function GetPageTitlesDM($styleName, $PageNo)
{
global $cfg_rewrite;
if ($this->TotalPage == 1) {
@@ -867,7 +867,7 @@ class Archives
$revalue .= "$v";
}
} else {
- if ($pageNo == $i) {
+ if ($PageNo == $i) {
$revalue .= " $v ";
} else {
if ($cfg_rewrite == 'Y') {
@@ -890,7 +890,7 @@ class Archives
$revalue .= "";
}
} else {
- if ($pageNo == $i) {
+ if ($PageNo == $i) {
if ($cfg_rewrite == 'Y') {
$revalue .= "";
} else {
diff --git a/src/theme/dedebiz/article_image.htm b/src/theme/dedebiz/article_image.htm
index 62f2c3e7..e7177aad 100644
--- a/src/theme/dedebiz/article_image.htm
+++ b/src/theme/dedebiz/article_image.htm
@@ -81,9 +81,6 @@
{dede:field.writer/}
次
-
{dede:field name='pagestyle' alt='输出不同的图片头信息' runphp='yes'}
if (@me==3) {