From d040b10c333c22e4d713eef0dd891397fa935dd2 Mon Sep 17 00:00:00 2001 From: xushubieli Date: Sun, 24 Apr 2022 16:40:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/article_description_main.php | 2 +- src/admin/article_keywords_main.php | 2 +- src/admin/article_keywords_make.php | 2 +- src/admin/article_keywords_select.php | 2 +- src/admin/cards_manage.php | 2 +- src/admin/content_list.php | 2 +- src/admin/content_sg_list.php | 2 +- src/admin/diy_list.php | 2 +- src/admin/feedback_main.php | 2 +- src/admin/freelist_main.php | 2 +- src/admin/js/codemirror.js | 4 ++-- src/admin/log_list.php | 2 +- src/admin/makehtml_freelist_action.php | 2 +- src/admin/makehtml_list_action.php | 2 +- src/admin/makehtml_taglist_action.php | 2 +- src/admin/media_main.php | 2 +- src/admin/member_operations.php | 2 +- src/admin/member_pm.php | 2 +- src/admin/search_keywords_main.php | 2 +- src/admin/shops_delivery.php | 2 +- src/admin/shops_operations_cart.php | 2 +- src/admin/tags_main.php | 2 +- src/apps/advancedsearch.php | 2 +- src/apps/diy.php | 2 +- src/system/archive/freelist.class.php | 24 ++++++++++----------- src/system/archive/listview.class.php | 20 ++++++++--------- src/system/archive/searchview.class.php | 22 +++++++++---------- src/system/archive/sglistview.class.php | 20 ++++++++--------- src/system/archive/specview.class.php | 24 ++++++++++----------- src/system/archive/taglist.class.php | 18 ++++++++-------- src/system/datalistcp.class.php | 20 ++++++++--------- src/system/libraries/mobiledetect.class.php | 2 +- src/system/taglib/arcpagelist.lib.php | 6 +++--- src/user/content_list.php | 2 +- src/user/content_sg_list.php | 2 +- src/user/mypay.php | 2 +- src/user/mystow.php | 2 +- src/user/operation.php | 2 +- src/user/pm.php | 2 +- src/user/shops_orders.php | 2 +- src/user/shops_products.php | 2 +- 41 files changed, 111 insertions(+), 111 deletions(-) diff --git a/src/admin/article_description_main.php b/src/admin/article_description_main.php index 8528464a..6945c3e3 100644 --- a/src/admin/article_description_main.php +++ b/src/admin/article_description_main.php @@ -18,7 +18,7 @@ if ($dojob == '') { exit(); } else { if (empty($startdd)) $startdd = 0; - if (empty($pagesize)) $pageSize = 30; + if (empty($pagesize)) $pagesize = 30; if (empty($totalnum)) $totalnum = 0; if (empty($sid)) $sid = 0; if (empty($eid)) $eid = 0; diff --git a/src/admin/article_keywords_main.php b/src/admin/article_keywords_main.php index 63f7a404..2dce857f 100644 --- a/src/admin/article_keywords_main.php +++ b/src/admin/article_keywords_main.php @@ -73,7 +73,7 @@ if (empty($keyword)) { } $sql = "SELECT * FROM `#@__keywords` $addquery ORDER BY `rank` DESC"; $dlist = new DataListCP(); -$dlist->pageSize = 30; +$dlist->pagesize = 30; $dlist->SetParameter("keyword", $keyword); $dlist->SetTemplate(DEDEADMIN."/templets/article_keywords_main.htm"); $dlist->SetSource($sql); diff --git a/src/admin/article_keywords_make.php b/src/admin/article_keywords_make.php index a0a5ddef..8d46ca1c 100644 --- a/src/admin/article_keywords_make.php +++ b/src/admin/article_keywords_make.php @@ -87,7 +87,7 @@ else if ($dopost == 'fetch') { $startdd = 0; } if (empty($pagesize)) { - $pageSize = 30; + $pagesize = 30; } if (empty($totalnum)) { $totalnum = 0; diff --git a/src/admin/article_keywords_select.php b/src/admin/article_keywords_select.php index 2b343284..8e58edab 100644 --- a/src/admin/article_keywords_select.php +++ b/src/admin/article_keywords_select.php @@ -16,7 +16,7 @@ if (empty($keywords)) $keywords = ""; $sql = "SELECT * FROM `#@__keywords` ORDER BY `rank` DESC"; $dlist = new DataListCP(); $dlist->SetTemplate(DEDEADMIN."/templets/article_keywords_select.htm"); -$dlist->pageSize = 30; +$dlist->pagesize = 30; $dlist->SetParameter("f", $f); $dlist->SetSource($sql); $dlist->Display(); diff --git a/src/admin/cards_manage.php b/src/admin/cards_manage.php index ffd31382..646d938a 100644 --- a/src/admin/cards_manage.php +++ b/src/admin/cards_manage.php @@ -27,7 +27,7 @@ if ($dopost == "delete") { if (isset($isexp)) $addsql = " WHERE isexp='$isexp' "; $sql = "SELECT * FROM #@__moneycard_record $addsql ORDER BY aid DESC"; $dlist = new DataListCP(); - $dlist->pageSize = 30;//设定每页显示记录数 + $dlist->pagesize = 30;//设定每页显示记录数 if (isset($isexp)) $dlist->SetParameter("isexp", $isexp); $dlist->dsql->SetQuery("SELECT * FROM #@__moneycard_type "); $dlist->dsql->Execute('ts'); diff --git a/src/admin/content_list.php b/src/admin/content_list.php index aa84d585..425fa52a 100644 --- a/src/admin/content_list.php +++ b/src/admin/content_list.php @@ -149,7 +149,7 @@ ORDER BY $orderbyField DESC"; if (empty($f) || !preg_match("#form#", $f)) $f = 'form1.arcid1'; //初始化 $dlist = new DataListCP(); -$dlist->pageSize = 30; +$dlist->pagesize = 30; //GET参数 $dlist->SetParameter('dopost', 'listArchives'); $dlist->SetParameter('keyword', $keyword); diff --git a/src/admin/content_sg_list.php b/src/admin/content_sg_list.php index 4e343eb1..de6cbae6 100644 --- a/src/admin/content_sg_list.php +++ b/src/admin/content_sg_list.php @@ -66,7 +66,7 @@ LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel $whereSql ORDER BY arc.aid DESC"; $dlist = new DataListCP(); -$dlist->pageSize = 30; +$dlist->pagesize = 30; $dlist->SetParameter("dopost", "listArchives"); $dlist->SetParameter("keyword", $keyword); $dlist->SetParameter("cid", $cid); diff --git a/src/admin/diy_list.php b/src/admin/diy_list.php index 03cee817..91b66807 100644 --- a/src/admin/diy_list.php +++ b/src/admin/diy_list.php @@ -69,7 +69,7 @@ if ($action == 'post') { include_once DEDEINC.'/datalistcp.class.php'; $query = "SELECT * FROM {$diy->table} ORDER BY id DESC"; $datalist = new DataListCP(); - $datalist->pageSize = 30; + $datalist->pagesize = 30; $datalist->SetParameter('action', 'list'); $datalist->SetParameter('diyid', $diyid); $datalist->SetTemplate(DEDEADMIN.'/templets/diy_list.htm'); diff --git a/src/admin/feedback_main.php b/src/admin/feedback_main.php index eaffe9f5..e5a808a0 100644 --- a/src/admin/feedback_main.php +++ b/src/admin/feedback_main.php @@ -100,7 +100,7 @@ else { $querystring = "SELECT * FROM `#@__feedback` WHERE msg LIKE '%$keyword%' $addsql ORDER BY dtime DESC"; $dlist = new DataListCP(); - $dlist->pageSize = 30; + $dlist->pagesize = 30; $dlist->SetParameter('aid', $aid); $dlist->SetParameter('ip', $ip); $dlist->SetParameter('typeid', $typeid); diff --git a/src/admin/freelist_main.php b/src/admin/freelist_main.php index 6ffeb421..60007f27 100644 --- a/src/admin/freelist_main.php +++ b/src/admin/freelist_main.php @@ -12,7 +12,7 @@ require_once(dirname(__FILE__)."/config.php"); CheckPurview('c_FreeList'); require_once DEDEINC.'/channelunit.func.php'; setcookie("ENV_GOBACK_URL",$dedeNowurl,time()+3600,"/"); -if(empty($pagesize)) $pageSize = 30; +if(empty($pagesize)) $pagesize = 30; if(empty($pageno)) $pageno = 1; if(empty($dopost)) $dopost = ''; if(empty($orderby)) $orderby = 'aid'; diff --git a/src/admin/js/codemirror.js b/src/admin/js/codemirror.js index 6b312bde..ff1b1b6c 100644 --- a/src/admin/js/codemirror.js +++ b/src/admin/js/codemirror.js @@ -8243,8 +8243,8 @@ function findPosH(doc, pos, dir, unit, visually) { function findPosV(cm, pos, dir, unit) { var doc = cm.doc, x = pos.left, y if (unit == "page") { - var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight) - var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3) + var pagesize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight) + var moveAmount = Math.max(pagesize - .5 * textHeight(cm.display), 3) y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount } else if (unit == "line") { diff --git a/src/admin/log_list.php b/src/admin/log_list.php index f19a9241..78f3c496 100644 --- a/src/admin/log_list.php +++ b/src/admin/log_list.php @@ -34,7 +34,7 @@ while ($myrow = $dsql->GetObject('admin')) { $adminlist .= "\r\n"; } $dlist = new DataListCP(); -$dlist->pageSize = 30; +$dlist->pagesize = 30; $dlist->SetParameter("adminid", $adminid); $dlist->SetParameter("cip", $cip); $dlist->SetParameter("dtime", $dtime); diff --git a/src/admin/makehtml_freelist_action.php b/src/admin/makehtml_freelist_action.php index 4a104f9c..67ab45e2 100644 --- a/src/admin/makehtml_freelist_action.php +++ b/src/admin/makehtml_freelist_action.php @@ -34,7 +34,7 @@ if (isset($idArray[$pageno])) { $lv = new FreeList($lid); $ntotalpage = $lv->TotalPage; if (empty($mkpage)) $mkpage = 1; -if (empty($maxpagesize)) $maxpageSize = 30; +if (empty($maxpagesize)) $maxpagesize = 30; //如果栏目的文档太多，分多批次更新 if ($ntotalpage <= $maxpagesize) { $lv->MakeHtml(); diff --git a/src/admin/makehtml_list_action.php b/src/admin/makehtml_list_action.php index 9f4f064a..9cc3750b 100644 --- a/src/admin/makehtml_list_action.php +++ b/src/admin/makehtml_list_action.php @@ -18,7 +18,7 @@ if (empty($pageno)) $pageno = 0; if (empty($mkpage)) $mkpage = 1; if (empty($typeid)) $typeid = 0; if (!isset($uppage)) $uppage = 0; -if (empty($maxpagesize)) $maxpageSize = 30; +if (empty($maxpagesize)) $maxpagesize = 30; $adminID = $cuserLogin->getUserID(); //检测获取所有栏目ID //普通生成或一键更新时更新所有栏目 diff --git a/src/admin/makehtml_taglist_action.php b/src/admin/makehtml_taglist_action.php index ba824b86..2c7cf5ac 100644 --- a/src/admin/makehtml_taglist_action.php +++ b/src/admin/makehtml_taglist_action.php @@ -16,7 +16,7 @@ if (empty($mktime)) $mktime = time(); if (empty($mkpage)) $mkpage = 1; if (empty($upall)) $upall = 0; //是否更新全部 0为更新单个 1为更新全部 if (empty($ctagid)) $ctagid = 0; //当前处理的tagid -if (empty($maxpagesize)) $maxpageSize = 30; +if (empty($maxpagesize)) $maxpagesize = 30; $startid = isset($startid) ? intval($startid) : 0; $endid = isset($endid) ? intval($endid) : 0; $tagid = isset($tagid) ? intval($tagid) : 0; diff --git a/src/admin/media_main.php b/src/admin/media_main.php index 52dbf003..0824c3c3 100644 --- a/src/admin/media_main.php +++ b/src/admin/media_main.php @@ -46,7 +46,7 @@ LEFT JOIN `#@__admin` a ON a.id = u.mid LEFT JOIN `#@__member` m ON m.mid = u.mid $addsql ORDER BY u.aid DESC"; $dlist = new DataListCP(); -$dlist->pageSize = 30; +$dlist->pagesize = 30; $dlist->SetParameter("mediatype", $mediatype); $dlist->SetParameter("keyword", $keyword); $dlist->SetParameter("membertype", $membertype); diff --git a/src/admin/member_operations.php b/src/admin/member_operations.php index 13656b42..aaa5bafd 100644 --- a/src/admin/member_operations.php +++ b/src/admin/member_operations.php @@ -18,7 +18,7 @@ if (isset($sta)) $addsql .= " AND sta='$sta' "; $sql = "SELECT * FROM `#@__member_operation` $addsql ORDER BY aid DESC"; $dlist = new DataListCP(); //设定每页显示记录数 -$dlist->pageSize = 30; +$dlist->pagesize = 30; $dlist->SetParameter("buyid", $buyid); if (isset($sta)) $dlist->SetParameter("sta", $sta); $dlist->dsql->SetQuery("SELECT * FROM #@__moneycard_type "); diff --git a/src/admin/member_pm.php b/src/admin/member_pm.php index a383e84b..99aa0dc5 100644 --- a/src/admin/member_pm.php +++ b/src/admin/member_pm.php @@ -33,7 +33,7 @@ if (!empty($username)) { } $sql = "SELECT * FROM #@__member_pms $whereSql ORDER BY sendtime desc"; $dlist = new DataListCP(); -$dlist->pageSize = 30; +$dlist->pagesize = 30; $dlist->SetParameter("folder", $folder); $dlist->SetParameter("username", $username); $dlist->SetParameter("keyword", $keyword); diff --git a/src/admin/search_keywords_main.php b/src/admin/search_keywords_main.php index 5cd9510d..0bc21993 100644 --- a/src/admin/search_keywords_main.php +++ b/src/admin/search_keywords_main.php @@ -10,7 +10,7 @@ */ require_once(dirname(__FILE__)."/config.php"); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); -if (empty($pagesize)) $pageSize = 30; +if (empty($pagesize)) $pagesize = 30; if (empty($pageno)) $pageno = 1; if (empty($dopost)) $dopost = ''; if (empty($orderby)) $orderby = 'aid'; diff --git a/src/admin/shops_delivery.php b/src/admin/shops_delivery.php index e92d2cca..c13c8fad 100644 --- a/src/admin/shops_delivery.php +++ b/src/admin/shops_delivery.php @@ -69,7 +69,7 @@ while ($row = $dsql->GetArray()) { $deliveryarr[] = $row; } $dlist = new DataListCP(); -$dlist->pageSize = 30;//设定每页显示记录数 +$dlist->pagesize = 30;//设定每页显示记录数 //这两句的顺序不能更换 $dlist->SetTemplate(DEDEADMIN."/templets/shops_delivery.htm");//载入模板 $dlist->SetSource("SELECT `pid`,`dname`,`price`,`des` FROM `#@__shops_delivery` ORDER BY `orders` ASC");//设定查询SQL diff --git a/src/admin/shops_operations_cart.php b/src/admin/shops_operations_cart.php index b2797f4c..7e7e0416 100644 --- a/src/admin/shops_operations_cart.php +++ b/src/admin/shops_operations_cart.php @@ -17,7 +17,7 @@ if (empty($oid)) exit("无效订单号!" $row = $dsql->GetOne("SELECT * FROM `#@__shops_userinfo` WHERE oid='$oid'"); $sql = "SELECT o.*,p.title,p.price as uprice,d.dname FROM `#@__shops_orders` as o left join `#@__shops_products` as p on o.oid=p.oid left join `#@__shops_delivery` as d on d.pid=o.pid WHERE o.oid='$oid'"; $dlist = new DataListCP(); -$dlist->pageSize = 30; +$dlist->pagesize = 30; $dlist->SetParameter("oid", $oid); $dlist->SetTemplate(DEDEADMIN."/templets/shops_operations_cart.htm"); $dlist->SetSource($sql); diff --git a/src/admin/tags_main.php b/src/admin/tags_main.php index f63eef90..cfd64579 100644 --- a/src/admin/tags_main.php +++ b/src/admin/tags_main.php @@ -25,7 +25,7 @@ if (empty($action)) { $dlist->SetParameter("tag", $tag); $dlist->SetParameter("orderway", $orderway); $dlist->SetParameter("orderby", $orderby); - $dlist->pageSize = 30; + $dlist->pagesize = 30; $dlist->SetTemplet(DEDEADMIN."/templets/tags_main.htm"); $dlist->SetSource($query); $dlist->Display(); diff --git a/src/apps/advancedsearch.php b/src/apps/advancedsearch.php index e2ab5bf0..918cf7b9 100755 --- a/src/apps/advancedsearch.php +++ b/src/apps/advancedsearch.php @@ -182,7 +182,7 @@ $sql = urlencode($sql); $sqlhash = md5($sql); $_SESSION[$sqlhash] = $sql; $dlist = new DataListCP(); -$dlist->pageSize = 20; +$dlist->pagesize = 30; $dlist->SetParameter("hash", $sqlhash); $dlist->SetParameter("mid", $mid); if (file_exists(DEDEROOT."/theme/templets/$template")) { diff --git a/src/apps/diy.php b/src/apps/diy.php index 1ef29032..3ca09e1b 100755 --- a/src/apps/diy.php +++ b/src/apps/diy.php @@ -99,7 +99,7 @@ else if ($action == 'list') { else $query = "SELECT * FROM `{$diy->table}` WHERE ifcheck=1 ORDER BY id DESC"; $datalist = new DataListCP(); - $datalist->pageSize = 10; + $datalist->pagesize = 10; $datalist->SetParameter('action', 'list'); $datalist->SetParameter('diyid', $diyid); $datalist->SetTemplate(DEDEINC."/../theme/plus/{$diy->listTemplate}"); diff --git a/src/system/archive/freelist.class.php b/src/system/archive/freelist.class.php index 493dd1e9..12a02af5 100755 --- a/src/system/archive/freelist.class.php +++ b/src/system/archive/freelist.class.php @@ -27,7 +27,7 @@ class FreeList var $PageNo; var $TotalPage; var $TotalResult; - var $PageSize; + var $pagesize; var $ChannelUnit; var $Fields; var $PartView; @@ -52,9 +52,9 @@ class FreeList $ndtp->SetNameSpace("dede", "{", "}"); $ndtp->LoadString($liststr); $this->ListObj = $ndtp->GetTag('list'); - $this->PageSize = $this->ListObj->GetAtt('pagesize'); - if (empty($this->PageSize)) { - $this->PageSize = 30; + $this->pagesize = $this->ListObj->GetAtt('pagesize'); + if (empty($this->pagesize)) { + $this->pagesize = 30; } $channelid = $this->ListObj->GetAtt('channel'); /* @@ -174,10 +174,10 @@ class FreeList $this->TotalResult = 0; } } - $this->TotalPage = ceil($this->TotalResult / $this->PageSize); + $this->TotalPage = ceil($this->TotalResult / $this->pagesize); if ($this->TotalPage > $this->FLInfos['maxpage']) { $this->TotalPage = $this->FLInfos['maxpage']; - $this->TotalResult = $this->TotalPage * $this->PageSize; + $this->TotalResult = $this->TotalPage * $this->pagesize; } } /** @@ -213,7 +213,7 @@ class FreeList $startpage = 1; } $this->ParseTempletsFirst(); - $totalpage = ceil($this->TotalResult / $this->PageSize); + $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage == 0) { $totalpage = 1; } @@ -331,7 +331,7 @@ class FreeList { foreach ($this->dtp->CTags as $tagid => $ctag) { if ($ctag->GetName() == "freelist") { - $limitstart = ($this->PageNo - 1) * $this->PageSize; + $limitstart = ($this->PageNo - 1) * $this->pagesize; if ($this->PageNo > $this->FLInfos['maxpage']) $this->dtp->Assign($tagid, '已经超过了最大允许列出的页面'); else $this->dtp->Assign($tagid, $this->GetList($limitstart, $ismake)); } else if ($ctag->GetName() == "pagelist") { @@ -495,7 +495,7 @@ class FreeList FROM {$this->maintable} arc LEFT JOIN #@__arctype tp ON arc.typeid=tp.id $addJoin - WHERE $orwhere $ordersql LIMIT $limitstart,".$this->PageSize; + WHERE $orwhere $ordersql LIMIT $limitstart,".$this->pagesize; $this->dsql->SetQuery($query); $this->dsql->Execute("al"); $artlist = ""; @@ -506,7 +506,7 @@ class FreeList $indtp->SetNameSpace("field", "[", "]"); $indtp->LoadSource($innertext); $GLOBALS['autoindex'] = 0; - for ($i = 0; $i < $this->PageSize; $i++) { + for ($i = 0; $i < $this->pagesize; $i++) { if ($col > 1) { $artlist .= "\r\n"; } @@ -641,7 +641,7 @@ class FreeList if ($list_len == "" || preg_match("#[^0-9]#", $list_len)) { $list_len = 3; } - $totalpage = ceil($this->TotalResult / $this->PageSize); + $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage <= 1 && $this->TotalResult > 0) { return "
  • 1页".$this->TotalResult."条
    • "; } @@ -743,7 +743,7 @@ class FreeList if ($list_len == "" || preg_match("/[^0-9]/", $list_len)) { $list_len = 3; } - $totalpage = ceil($this->TotalResult / $this->PageSize); + $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage <= 1 && $this->TotalResult > 0) { return "
  • 1页".$this->TotalResult."条
    • "; } diff --git a/src/system/archive/listview.class.php b/src/system/archive/listview.class.php index 3f76e524..3018314a 100755 --- a/src/system/archive/listview.class.php +++ b/src/system/archive/listview.class.php @@ -29,7 +29,7 @@ class ListView var $PageNo; var $TotalPage; var $TotalResult; - var $PageSize; + var $pagesize; var $ChannelUnit; var $ListType; var $Fields; @@ -245,15 +245,15 @@ class ListView $ctag = $this->dtp->GetTag("list"); } if (!is_object($ctag)) { - $this->PageSize = 20; + $this->pagesize = 20; } else { if ($ctag->GetAtt("pagesize") != "") { - $this->PageSize = $ctag->GetAtt("pagesize"); + $this->pagesize = $ctag->GetAtt("pagesize"); } else { - $this->PageSize = 20; + $this->pagesize = 20; } } - $this->TotalPage = ceil($this->TotalResult / $this->PageSize); + $this->TotalPage = ceil($this->TotalResult / $this->pagesize); } /** * 列表创建HTML @@ -282,7 +282,7 @@ class ListView if (empty($this->TotalResult)) $this->CountRecord(); //初步给固定值的标记赋值 $this->ParseTempletsFirst(); - $totalpage = ceil($this->TotalResult / $this->PageSize); + $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage == 0) { $totalpage = 1; } @@ -499,8 +499,8 @@ class ListView } foreach ($this->dtp->CTags as $tagid => $ctag) { if ($ctag->GetName() == "list") { - $limitstart = ($this->PageNo - 1) * $this->PageSize; - $row = $this->PageSize; + $limitstart = ($this->PageNo - 1) * $this->pagesize; + $row = $this->pagesize; if (trim($ctag->GetInnerText()) == "") { $InnerText = GetSysTemplets("list_fulllist.htm"); } else { @@ -830,7 +830,7 @@ class ListView if ($list_len == '' || preg_match("/[^0-9]/", $list_len)) { $list_len = 3; } - $totalpage = ceil($this->TotalResult / $this->PageSize); + $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage <= 1 && $this->TotalResult > 0) { return "
  • 1页".$this->TotalResult."条
    • \r\n"; } @@ -918,7 +918,7 @@ class ListView if ($list_len == '' || preg_match("/[^0-9]/", $list_len)) { $list_len = 3; } - $totalpage = ceil($this->TotalResult / $this->PageSize); + $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage <= 1 && $this->TotalResult > 0) { return "
  • 1页".$this->TotalResult."条
    • \r\n"; } diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php index c61c7e41..908a4814 100755 --- a/src/system/archive/searchview.class.php +++ b/src/system/archive/searchview.class.php @@ -33,7 +33,7 @@ class SearchView var $PageNo; var $TotalPage; var $TotalResult; - var $PageSize; + var $pagesize; var $ChannelType; var $TempInfos; var $Fields; @@ -84,7 +84,7 @@ class SearchView $this->Keyword = $keyword; $this->OrderBy = $orderby; $this->KType = $kwtype; - $this->PageSize = (int)$upagesize; + $this->pagesize = (int)$upagesize; $this->StartTime = $starttime; $this->ChannelType = $achanneltype; $this->SearchMax = $cfg_search_max; @@ -121,10 +121,10 @@ class SearchView $this->dtp->LoadTemplate($tempfile); $this->TempInfos['tags'] = $this->dtp->CTags; $this->TempInfos['source'] = $this->dtp->SourceString; - if ($this->PageSize == "") { - $this->PageSize = 20; + if ($this->pagesize == "") { + $this->pagesize = 30; } - $this->TotalPage = ceil($this->TotalResult / $this->PageSize); + $this->TotalPage = ceil($this->TotalResult / $this->pagesize); if ($this->PageNo == 1) { $this->dsql->ExecuteNoneQuery("UPDATE `#@__search_keywords` SET result='".$this->TotalResult."' WHERE keyword='".addslashes($keyword)."'; "); } @@ -408,8 +408,8 @@ class SearchView foreach ($this->dtp->CTags as $tagid => $ctag) { $tagname = $ctag->GetName(); if ($tagname == "list") { - $limitstart = ($this->PageNo - 1) * $this->PageSize; - $row = $this->PageSize; + $limitstart = ($this->PageNo - 1) * $this->pagesize; + $row = $this->pagesize; if (trim($ctag->GetInnerText()) == "") { $InnerText = GetSysTemplets("list_fulllist.htm"); } else { @@ -651,7 +651,7 @@ class SearchView if ($list_len == "" || preg_match("/[^0-9]/", $list_len)) { $list_len = 3; } - $totalpage = ceil($this->TotalResult / $this->PageSize); + $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage <= 1 && $this->TotalResult > 0) { return ""; } @@ -662,7 +662,7 @@ class SearchView $oldkeyword = (empty($oldkeyword) ? $this->Keyword : $oldkeyword); //当结果超过限制时，重设结果页数 if ($this->TotalResult > $this->SearchMaxRc) { - $totalpage = ceil($this->SearchMaxRc / $this->PageSize); + $totalpage = ceil($this->SearchMaxRc / $this->pagesize); } $infos = "
  • {$totalpage}页".$this->TotalResult."条
    • \r\n"; $geturl = "keyword=".urlencode($oldkeyword)."&searchtype=".$this->SearchType; @@ -670,9 +670,9 @@ class SearchView $geturl .= "&channeltype=".$this->ChannelType."&orderby=".$this->OrderBy; $hidenform .= "\r\n"; $hidenform .= "\r\n"; - $geturl .= "&kwtype=".$this->KType."&pagesize=".$this->PageSize; + $geturl .= "&kwtype=".$this->KType."&pagesize=".$this->pagesize; $hidenform .= "\r\n"; - $hidenform .= "\r\n"; + $hidenform .= "\r\n"; $geturl .= "&typeid=".$this->TypeID."&TotalResult=".$this->TotalResult."&"; $hidenform .= "\r\n"; $hidenform .= "\r\n"; diff --git a/src/system/archive/sglistview.class.php b/src/system/archive/sglistview.class.php index 7e44e349..1fd3a721 100755 --- a/src/system/archive/sglistview.class.php +++ b/src/system/archive/sglistview.class.php @@ -28,7 +28,7 @@ class SgListView var $PageNo; var $TotalPage; var $TotalResult; - var $PageSize; + var $pagesize; var $ChannelUnit; var $ListType; var $Fields; @@ -195,15 +195,15 @@ class SgListView $ctag = $this->dtp->GetTag("list"); } if (!is_object($ctag)) { - $this->PageSize = 20; + $this->pagesize = 20; } else { if ($ctag->GetAtt('pagesize') != '') { - $this->PageSize = $ctag->GetAtt('pagesize'); + $this->pagesize = $ctag->GetAtt('pagesize'); } else { - $this->PageSize = 20; + $this->pagesize = 20; } } - $this->TotalPage = ceil($this->TotalResult / $this->PageSize); + $this->TotalPage = ceil($this->TotalResult / $this->pagesize); } /** * 列表创建HTML @@ -231,7 +231,7 @@ class SgListView if (empty($this->TotalResult)) $this->CountRecord(); //初步给固定值的标记赋值 $this->ParseTempletsFirst(); - $totalpage = ceil($this->TotalResult / $this->PageSize); + $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage == 0) { $totalpage = 1; } @@ -450,8 +450,8 @@ class SgListView } foreach ($this->dtp->CTags as $tagid => $ctag) { if ($ctag->GetName() == "list") { - $limitstart = ($this->PageNo - 1) * $this->PageSize; - $row = $this->PageSize; + $limitstart = ($this->PageNo - 1) * $this->pagesize; + $row = $this->pagesize; if (trim($ctag->GetInnerText()) == "") { $InnerText = GetSysTemplets("list_fulllist.htm"); } else { @@ -706,7 +706,7 @@ class SgListView if ($list_len == "" || preg_match("/[^0-9]/", $list_len)) { $list_len = 3; } - $totalpage = ceil($this->TotalResult / $this->PageSize); + $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage <= 1 && $this->TotalResult > 0) { return "
  • 1页".$this->TotalResult."条
    • "; } @@ -814,7 +814,7 @@ class SgListView if ($list_len == "" || preg_match("/[^0-9]/", $list_len)) { $list_len = 3; } - $totalpage = ceil($this->TotalResult / $this->PageSize); + $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage <= 1 && $this->TotalResult > 0) { return "
  • 1页".$this->TotalResult."条
    • "; } diff --git a/src/system/archive/specview.class.php b/src/system/archive/specview.class.php index e153c163..624e9202 100755 --- a/src/system/archive/specview.class.php +++ b/src/system/archive/specview.class.php @@ -29,7 +29,7 @@ class SpecView var $PageNo; var $TotalPage; var $TotalResult; - var $PageSize; + var $pagesize; var $ChannelUnit; var $ListType; var $TempInfos; @@ -75,15 +75,15 @@ class SpecView $this->TempInfos['source'] = $this->dtp->SourceString; $ctag = $this->dtp->GetTag("page"); if (!is_object($ctag)) { - $this->PageSize = 20; + $this->pagesize = 20; } else { if ($ctag->GetAtt("pagesize") != "") { - $this->PageSize = $ctag->GetAtt("pagesize"); + $this->pagesize = $ctag->GetAtt("pagesize"); } else { - $this->PageSize = 20; + $this->pagesize = 20; } } - $this->TotalPage = ceil($this->TotalResult / $this->PageSize); + $this->TotalPage = ceil($this->TotalResult / $this->pagesize); } //php4构造函数 function SpecView($starttime = 0) @@ -140,8 +140,8 @@ class SpecView $this->ParseTempletsFirst(); foreach ($this->dtp->CTags as $tagid => $ctag) { if ($ctag->GetName() == "list") { - $limitstart = ($this->PageNo - 1) * $this->PageSize; - $row = $this->PageSize; + $limitstart = ($this->PageNo - 1) * $this->pagesize; + $row = $this->pagesize; if (trim($ctag->GetInnerText()) == "") { $InnerText = GetSysTemplets("list_fulllist.htm"); } else { @@ -184,7 +184,7 @@ class SpecView { //初步给固定值的标记赋值 $this->ParseTempletsFirst(); - $totalpage = ceil($this->TotalResult / $this->PageSize); + $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage == 0) { $totalpage = 1; } @@ -193,8 +193,8 @@ class SpecView for ($this->PageNo = 1; $this->PageNo <= $totalpage; $this->PageNo++) { foreach ($this->dtp->CTags as $tagid => $ctag) { if ($ctag->GetName() == "list") { - $limitstart = ($this->PageNo - 1) * $this->PageSize; - $row = $this->PageSize; + $limitstart = ($this->PageNo - 1) * $this->pagesize; + $row = $this->pagesize; if (trim($ctag->GetInnerText()) == "") { $InnerText = GetSysTemplets("spec_list.htm"); } else { @@ -442,7 +442,7 @@ class SpecView if ($list_len == "" || preg_match("/[^0-9]/", $list_len)) { $list_len = 3; } - $totalpage = ceil($this->TotalResult / $this->PageSize); + $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage <= 1 && $this->TotalResult > 0) { return "1页".$this->TotalResult."条"; } @@ -506,7 +506,7 @@ class SpecView if ($list_len == "" || preg_match("/[^0-9]/", $list_len)) { $list_len = 3; } - $totalpage = ceil($this->TotalResult / $this->PageSize); + $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage <= 1 && $this->TotalResult > 0) { return "1页".$this->TotalResult."条"; } diff --git a/src/system/archive/taglist.class.php b/src/system/archive/taglist.class.php index d2b451a9..89343fbf 100755 --- a/src/system/archive/taglist.class.php +++ b/src/system/archive/taglist.class.php @@ -28,7 +28,7 @@ class TagList var $PageNo; var $TotalPage; var $TotalResult; - var $PageSize; + var $pagesize; var $ListType; var $Fields; var $Tag; @@ -139,15 +139,15 @@ class TagList $ctag = $this->dtp->GetTag("list"); } if (!is_object($ctag)) { - $this->PageSize = 25; + $this->pagesize = 30; } else { if ($ctag->GetAtt("pagesize") != '') { - $this->PageSize = $ctag->GetAtt("pagesize"); + $this->pagesize = $ctag->GetAtt("pagesize"); } else { - $this->PageSize = 25; + $this->pagesize = 30; } } - $this->TotalPage = ceil($this->TotalResult / $this->PageSize); + $this->TotalPage = ceil($this->TotalResult / $this->pagesize); } /** * 显示列表 @@ -201,11 +201,11 @@ class TagList { foreach ($this->dtp->CTags as $tagid => $ctag) { if ($ctag->GetName() == "list") { - $limitstart = (intval($this->PageNo) - 1) * $this->PageSize; + $limitstart = (intval($this->PageNo) - 1) * $this->pagesize; if ($limitstart < 0) { $limitstart = 0; } - $row = $this->PageSize; + $row = $this->pagesize; if (trim($ctag->GetInnerText()) == "") { $InnerText = GetSysTemplets("list_fulllist.htm"); } else { @@ -314,7 +314,7 @@ class TagList FROM `#@__archives` se LEFT JOIN `#@__arctype` tp ON se.typeid=tp.id WHERE $orwhere $ordersql "; $this->dsql->SetQuery($query); $this->dsql->Execute('al'); - $row = $this->PageSize / $col; + $row = $this->pagesize / $col; $artlist = ''; $this->dtp2->LoadSource($innertext); $GLOBALS['autoindex'] = 0; @@ -587,7 +587,7 @@ class TagList MkdirAll($this->GetTruePath().$this->tagsDir, $cfg_dir_purview); $this->dtp->SaveTo($this->GetTruePath().$this->tagsDir."/index.html"); } else { - $totalpage = ceil($this->TotalResult / $this->PageSize); + $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage == 0) { $totalpage = 1; } diff --git a/src/system/datalistcp.class.php b/src/system/datalistcp.class.php index db25b111..beb75896 100755 --- a/src/system/datalistcp.class.php +++ b/src/system/datalistcp.class.php @@ -5,7 +5,7 @@ if (!defined('DEDEINC')) exit('dedebiz'); * 说明:数据量不大的数据分页,使得数据分页处理变得更加简单化 * 使用方法: * $dl = new DataListCP(); //初始化动态列表类 - * $dl->pageSize = 25; //设定每页显示记录数（默认25条） + * $dl->pagesize = 30; //设定每页显示记录数（默认25条） * $dl->SetParameter($key,$value); //设定get字符串的变量 * //这两句的顺序不能更换 * $dl->SetTemplate($tplfile); //载入模板 @@ -44,7 +44,7 @@ class DataListCP var $pageNO; var $totalPage; var $totalResult; - var $pageSize; + var $pagesize; var $getValues; var $sourceSql; var $isQuery; @@ -60,7 +60,7 @@ class DataListCP { global $dsql; $this->sourceSql = ''; - $this->pageSize = 25; + $this->pagesize = 30; $this->queryTime = 0; $this->getValues = array(); $this->isQuery = false; @@ -121,9 +121,9 @@ class DataListCP $this->pageNO = $pageno; $this->totalResult = $totalresult; if (isset($this->tpl->tpCfgs['pagesize'])) { - $this->pageSize = $this->tpl->tpCfgs['pagesize']; + $this->pagesize = $this->tpl->tpCfgs['pagesize']; } - $this->totalPage = ceil($this->totalResult / $this->pageSize); + $this->totalPage = ceil($this->totalResult / $this->pagesize); if ($this->totalResult == 0) { $countQuery = preg_replace("#SELECT[ \r\n\t](.*)[ \r\n\t]FROM#is", 'SELECT COUNT(*) AS dd FROM', $this->sourceSql); $countQuery = preg_replace("#ORDER[ \r\n\t]{1,}BY(.*)#is", '', $countQuery); @@ -131,9 +131,9 @@ class DataListCP $row = $this->dsql->GetOne($countQuery); if (!is_array($row)) $row['dd'] = 0; $this->totalResult = isset($row['dd']) ? $row['dd'] : 0; - $this->sourceSql .= " LIMIT 0,".$this->pageSize; + $this->sourceSql .= " LIMIT 0,".$this->pagesize; } else { - $this->sourceSql .= " LIMIT ".(($this->pageNO - 1) * $this->pageSize).",".$this->pageSize; + $this->sourceSql .= " LIMIT ".(($this->pageNO - 1) * $this->pagesize).",".$this->pagesize; } } //设置网址的Get参数键值 @@ -225,7 +225,7 @@ class DataListCP while ($arr = $this->dsql->GetArray('dlist')) { $i++; $rsArray[$i] = $this->XSSClean($arr); - if ($i >= $this->pageSize) { + if ($i >= $this->pagesize) { break; } } @@ -247,8 +247,8 @@ class DataListCP if (!isset($atts['listitem'])) { $atts['listitem'] = "info,index,end,pre,next,pageno"; } - $totalpage = ceil($this->totalResult / $this->pageSize); - //echo " {$totalpage}=={$this->totalResult}=={$this->pageSize}"; + $totalpage = ceil($this->totalResult / $this->pagesize); + //echo " {$totalpage}=={$this->totalResult}=={$this->pagesize}"; //无结果或只有一页的情况 if ($totalpage <= 1 && $this->totalResult > 0) { return ""; diff --git a/src/system/libraries/mobiledetect.class.php b/src/system/libraries/mobiledetect.class.php index 188fe654..247b2086 100644 --- a/src/system/libraries/mobiledetect.class.php +++ b/src/system/libraries/mobiledetect.class.php @@ -595,7 +595,7 @@ class Mobile_Detect // http://www.tolino.de/de/vergleichen/ 'TolinoTablet' => 'tolino tab [0-9.]+|tolino shine', // AudioSonic - a Kmart brand - // http://www.kmart.com.au/webapp/wcs/stores/servlet/Search?langId=-1&storeId=10701&catalogId=10001&categoryId=193001&pageSize=72¤tPage=1&searchCategory=193001%2b4294965664&sortBy=p_MaxPrice%7c1 + // http://www.kmart.com.au/webapp/wcs/stores/servlet/Search?langId=-1&storeId=10701&catalogId=10001&categoryId=193001&pagesize=72¤tPage=1&searchCategory=193001%2b4294965664&sortBy=p_MaxPrice%7c1 'AudioSonicTablet' => '\bC-22Q|T7-QC|T-17B|T-17P\b', // AMPE Tablets - http://www.ampe.com.my/product-category/tablets/ // @todo: add them gradually to avoid conflicts. diff --git a/src/system/taglib/arcpagelist.lib.php b/src/system/taglib/arcpagelist.lib.php index d38b1e94..8e2ae0b2 100755 --- a/src/system/taglib/arcpagelist.lib.php +++ b/src/system/taglib/arcpagelist.lib.php @@ -40,15 +40,15 @@ function lib_arcpagelist(&$ctag, &$refObj) * @access public * @param string $allItemTotal 所有记录 * @param string $currPageNum 当前页面数 - * @param string $pageSize 显示条数 + * @param string $pagesize 显示条数 * @param string $tagid 标签ID * @return string */ -function multipage($allItemTotal, $currPageNum, $pageSize, $tagid = '') +function multipage($allItemTotal, $currPageNum, $pagesize, $tagid = '') { if ($allItemTotal == 0) return ""; //计算总页数 - $pagesNum = ceil($allItemTotal / $pageSize); + $pagesNum = ceil($allItemTotal / $pagesize); //第一页显示 $firstPage = ($currPageNum <= 1) ? $currPageNum."<<" : "1<<"; //最后一页显示 diff --git a/src/user/content_list.php b/src/user/content_list.php index 6a87e7d9..6d572e50 100755 --- a/src/user/content_list.php +++ b/src/user/content_list.php @@ -74,7 +74,7 @@ $query = "SELECT arc.id,arc.typeid,arc.senddate,arc.flag,arc.ismake,arc.channel, left join `#@__channeltype` ch on ch.id=arc.channel $whereSql order by arc.senddate desc "; $dlist = new DataListCP(); -$dlist->pageSize = 20; +$dlist->pagesize = 30; $dlist->SetParameter("dopost", "listArchives"); $dlist->SetParameter("keyword", $keyword); $dlist->SetParameter("cid", $cid); diff --git a/src/user/content_sg_list.php b/src/user/content_sg_list.php index 6f3025c6..4294a8e1 100755 --- a/src/user/content_sg_list.php +++ b/src/user/content_sg_list.php @@ -61,7 +61,7 @@ $query = "SELECT arc.aid,arc.aid as id,arc.typeid,arc.senddate,arc.channel,arc.c $whereSql ORDER BY arc.aid desc "; $dlist = new DataListCP(); -$dlist->pageSize = 20; +$dlist->pagesize = 30; $dlist->SetParameter("dopost", "listArchives"); $dlist->SetParameter("keyword", $keyword); $dlist->SetParameter("cid", $cid); diff --git a/src/user/mypay.php b/src/user/mypay.php index f5e3f3b1..0afdd986 100755 --- a/src/user/mypay.php +++ b/src/user/mypay.php @@ -18,7 +18,7 @@ if (!isset($dopost)) $dopost = ''; if ($dopost == '') { $query = "SELECT * FROM `#@__member_operation` WHERE mid='".$cfg_ml->M_ID."' And product='archive' order by aid desc"; $dlist = new DataListCP(); - $dlist->pageSize = 20; + $dlist->pagesize = 30; $dlist->SetTemplate(DEDEMEMBER.'/templets/mypay.htm'); $dlist->SetSource($query); $dlist->Display(); diff --git a/src/user/mystow.php b/src/user/mystow.php index d8009f84..d38241aa 100755 --- a/src/user/mystow.php +++ b/src/user/mystow.php @@ -28,7 +28,7 @@ while ($row = $dsql->GetArray('nn')) { $rows[] = $row; } $dlist = new DataListCP(); -$dlist->pageSize = 20; +$dlist->pagesize = 30; $dlist->SetTemplate(DEDEMEMBER."/templets/mystow.htm"); $dlist->SetSource($sql); $dlist->Display(); \ No newline at end of file diff --git a/src/user/operation.php b/src/user/operation.php index 3661ee55..fb6c5cc6 100755 --- a/src/user/operation.php +++ b/src/user/operation.php @@ -31,7 +31,7 @@ function GetSta($sta) if ($dopost == '') { $sql = "SELECT * FROM `#@__member_operation` WHERE mid='".$cfg_ml->M_ID."' AND product<>'archive' ORDER BY aid DESC"; $dlist = new DataListCP(); - $dlist->pageSize = 20; + $dlist->pagesize = 30; $dlist->SetTemplate(DEDEMEMBER."/templets/operation.htm"); $dlist->SetSource($sql); $dlist->Display(); diff --git a/src/user/pm.php b/src/user/pm.php index 06b3a98f..6f2069af 100755 --- a/src/user/pm.php +++ b/src/user/pm.php @@ -90,7 +90,7 @@ else { } $query = "SELECT * FROM `#@__member_pms` WHERE $wsql ORDER BY sendtime DESC"; $dlist = new DataListCP(); - $dlist->pageSize = 20; + $dlist->pagesize = 30; $dlist->SetParameter("dopost", $dopost); $dlist->SetTemplate(DEDEMEMBER.'/templets/pm-main.htm'); $dlist->SetSource($query); diff --git a/src/user/shops_orders.php b/src/user/shops_orders.php index 8abd966f..e4b84170 100755 --- a/src/user/shops_orders.php +++ b/src/user/shops_orders.php @@ -38,7 +38,7 @@ function GetSta($sta, $oid) if ($dopost == '') { $sql = "SELECT * FROM `#@__shops_orders` WHERE userid='".$cfg_ml->M_ID."' ORDER BY stime DESC"; $dl = new DataListCP(); - $dl->pageSize = 20; + $dl->pagesize = 30; //这两句的顺序不能更换 $dl->SetTemplate(dirname(__FILE__)."/templets/shops_orders.htm"); //载入模板 $dl->SetSource($sql); //设定查询SQL diff --git a/src/user/shops_products.php b/src/user/shops_products.php index d5d8ab00..e9b65cfd 100755 --- a/src/user/shops_products.php +++ b/src/user/shops_products.php @@ -44,7 +44,7 @@ if ($dopost == '') { } $sql = "SELECT * FROM `#@__shops_products` WHERE userid='".$cfg_ml->M_ID."' $addsql ORDER BY aid ASC"; $dl = new DataListCP(); - $dl->pageSize = 20; + $dl->pagesize = 30; if (!empty($oid)) $dl->SetParameter('oid', $oid); //这两句的顺序不能更换 $dl->SetTemplate(dirname(__FILE__)."/templets/shops_products.htm"); //载入模板