Browse Source

修正大小写

tags/6.1.9
xushubieli 2 years ago
parent
commit
d040b10c33
41 changed files with 111 additions and 111 deletions
  1. +1
    -1
      src/admin/article_description_main.php
  2. +1
    -1
      src/admin/article_keywords_main.php
  3. +1
    -1
      src/admin/article_keywords_make.php
  4. +1
    -1
      src/admin/article_keywords_select.php
  5. +1
    -1
      src/admin/cards_manage.php
  6. +1
    -1
      src/admin/content_list.php
  7. +1
    -1
      src/admin/content_sg_list.php
  8. +1
    -1
      src/admin/diy_list.php
  9. +1
    -1
      src/admin/feedback_main.php
  10. +1
    -1
      src/admin/freelist_main.php
  11. +2
    -2
      src/admin/js/codemirror.js
  12. +1
    -1
      src/admin/log_list.php
  13. +1
    -1
      src/admin/makehtml_freelist_action.php
  14. +1
    -1
      src/admin/makehtml_list_action.php
  15. +1
    -1
      src/admin/makehtml_taglist_action.php
  16. +1
    -1
      src/admin/media_main.php
  17. +1
    -1
      src/admin/member_operations.php
  18. +1
    -1
      src/admin/member_pm.php
  19. +1
    -1
      src/admin/search_keywords_main.php
  20. +1
    -1
      src/admin/shops_delivery.php
  21. +1
    -1
      src/admin/shops_operations_cart.php
  22. +1
    -1
      src/admin/tags_main.php
  23. +1
    -1
      src/apps/advancedsearch.php
  24. +1
    -1
      src/apps/diy.php
  25. +12
    -12
      src/system/archive/freelist.class.php
  26. +10
    -10
      src/system/archive/listview.class.php
  27. +11
    -11
      src/system/archive/searchview.class.php
  28. +10
    -10
      src/system/archive/sglistview.class.php
  29. +12
    -12
      src/system/archive/specview.class.php
  30. +9
    -9
      src/system/archive/taglist.class.php
  31. +10
    -10
      src/system/datalistcp.class.php
  32. +1
    -1
      src/system/libraries/mobiledetect.class.php
  33. +3
    -3
      src/system/taglib/arcpagelist.lib.php
  34. +1
    -1
      src/user/content_list.php
  35. +1
    -1
      src/user/content_sg_list.php
  36. +1
    -1
      src/user/mypay.php
  37. +1
    -1
      src/user/mystow.php
  38. +1
    -1
      src/user/operation.php
  39. +1
    -1
      src/user/pm.php
  40. +1
    -1
      src/user/shops_orders.php
  41. +1
    -1
      src/user/shops_products.php

+ 1
- 1
src/admin/article_description_main.php View File

@@ -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;


+ 1
- 1
src/admin/article_keywords_main.php View File

@@ -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);


+ 1
- 1
src/admin/article_keywords_make.php View File

@@ -87,7 +87,7 @@ else if ($dopost == 'fetch') {
$startdd = 0;
}
if (empty($pagesize)) {
$pageSize = 30;
$pagesize = 30;
}
if (empty($totalnum)) {
$totalnum = 0;


+ 1
- 1
src/admin/article_keywords_select.php View File

@@ -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();


+ 1
- 1
src/admin/cards_manage.php View File

@@ -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');


+ 1
- 1
src/admin/content_list.php View File

@@ -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);


+ 1
- 1
src/admin/content_sg_list.php View File

@@ -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);


+ 1
- 1
src/admin/diy_list.php View File

@@ -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');


+ 1
- 1
src/admin/feedback_main.php View File

@@ -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);


+ 1
- 1
src/admin/freelist_main.php View File

@@ -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';


+ 2
- 2
src/admin/js/codemirror.js View File

@@ -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") {


+ 1
- 1
src/admin/log_list.php View File

@@ -34,7 +34,7 @@ while ($myrow = $dsql->GetObject('admin')) {
$adminlist .= "<option value='{$myrow->id}'>{$myrow->uname}</option>\r\n";
}
$dlist = new DataListCP();
$dlist->pageSize = 30;
$dlist->pagesize = 30;
$dlist->SetParameter("adminid", $adminid);
$dlist->SetParameter("cip", $cip);
$dlist->SetParameter("dtime", $dtime);


+ 1
- 1
src/admin/makehtml_freelist_action.php View File

@@ -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();


+ 1
- 1
src/admin/makehtml_list_action.php View File

@@ -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
//普通生成或一键更新时更新所有栏目


+ 1
- 1
src/admin/makehtml_taglist_action.php View File

@@ -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;


+ 1
- 1
src/admin/media_main.php View File

@@ -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);


+ 1
- 1
src/admin/member_operations.php View File

@@ -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 ");


+ 1
- 1
src/admin/member_pm.php View File

@@ -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);


+ 1
- 1
src/admin/search_keywords_main.php View File

@@ -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';


+ 1
- 1
src/admin/shops_delivery.php View File

@@ -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

+ 1
- 1
src/admin/shops_operations_cart.php View File

@@ -17,7 +17,7 @@ if (empty($oid)) exit("<a href='javascript:window.close()'>无效订单号!</a>"
$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);


+ 1
- 1
src/admin/tags_main.php View File

@@ -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();


+ 1
- 1
src/apps/advancedsearch.php View File

@@ -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")) {


+ 1
- 1
src/apps/diy.php View File

@@ -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}");


+ 12
- 12
src/system/archive/freelist.class.php View File

@@ -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 .= "<tr>\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 "<li class='page-item d-none d-sm-block disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>";
}
@@ -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 "<li class='page-item d-none d-sm-block disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>";
}


+ 10
- 10
src/system/archive/listview.class.php View File

@@ -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 "<li class='page-item d-none d-sm-block disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>\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 "<li class='d-none d-sm-block page-item disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>\r\n";
}


+ 11
- 11
src/system/archive/searchview.class.php View File

@@ -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 "<ul class='pagination justify-content-center pt-3'><li class='page-item d-none d-sm-block disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li></ul>";
}
@@ -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 = "<li class='page-item d-none d-sm-block disabled'><span class='page-link'>{$totalpage}页".$this->TotalResult."条</span></li>\r\n";
$geturl = "keyword=".urlencode($oldkeyword)."&searchtype=".$this->SearchType;
@@ -670,9 +670,9 @@ class SearchView
$geturl .= "&channeltype=".$this->ChannelType."&orderby=".$this->OrderBy;
$hidenform .= "<input type='hidden' name='channeltype' value='".$this->ChannelType."'>\r\n";
$hidenform .= "<input type='hidden' name='orderby' value='".$this->OrderBy."'>\r\n";
$geturl .= "&kwtype=".$this->KType."&pagesize=".$this->PageSize;
$geturl .= "&kwtype=".$this->KType."&pagesize=".$this->pagesize;
$hidenform .= "<input type='hidden' name='kwtype' value='".$this->KType."'>\r\n";
$hidenform .= "<input type='hidden' name='pagesize' value='".$this->PageSize."'>\r\n";
$hidenform .= "<input type='hidden' name='pagesize' value='".$this->pagesize."'>\r\n";
$geturl .= "&typeid=".$this->TypeID."&TotalResult=".$this->TotalResult."&";
$hidenform .= "<input type='hidden' name='typeid' value='".$this->TypeID."'>\r\n";
$hidenform .= "<input type='hidden' name='TotalResult' value='".$this->TotalResult."'>\r\n";


+ 10
- 10
src/system/archive/sglistview.class.php View File

@@ -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 "<li class='page-item d-none d-sm-block disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>";
}
@@ -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 "<li class='page-item d-none d-sm-block disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>";
}


+ 12
- 12
src/system/archive/specview.class.php View File

@@ -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 "<span class='pageinfo'>1页".$this->TotalResult."条</span>";
}
@@ -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 "<span class='pageinfo'>1页".$this->TotalResult."条</span>";
}


+ 9
- 9
src/system/archive/taglist.class.php View File

@@ -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;
}


+ 10
- 10
src/system/datalistcp.class.php View File

@@ -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 "<ul class='pagination justify-content-center'><li class='page-item d-none d-sm-block disabled'><span class='page-link'>{$lang_total}1{$lang_page}".$this->totalResult.$lang_record_number."</span></li></ul>";


+ 1
- 1
src/system/libraries/mobiledetect.class.php View File

@@ -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&currentPage=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&currentPage=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.


+ 3
- 3
src/system/taglib/arcpagelist.lib.php View File

@@ -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."&lt;&lt;" : "<a href='javascript:multi(1,\"{$tagid}\")' title='第1页'>1&lt;&lt;</a>";
//最后一页显示


+ 1
- 1
src/user/content_list.php View File

@@ -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);


+ 1
- 1
src/user/content_sg_list.php View File

@@ -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);


+ 1
- 1
src/user/mypay.php View File

@@ -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();


+ 1
- 1
src/user/mystow.php View File

@@ -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();

+ 1
- 1
src/user/operation.php View File

@@ -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();


+ 1
- 1
src/user/pm.php View File

@@ -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);


+ 1
- 1
src/user/shops_orders.php View File

@@ -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


+ 1
- 1
src/user/shops_products.php View File

@@ -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"); //载入模板


Loading…
Cancel
Save