diff --git a/app/BaseController.php b/app/BaseController.php index 25850a0..5b9d541 100644 --- a/app/BaseController.php +++ b/app/BaseController.php @@ -96,11 +96,6 @@ abstract class BaseController return $v->failException(true)->check($data); } - protected function validateLimit(int $limit, int $default = 15): int - { - $validSizes = [10, 15, 20, 30, 50, 100, 200, 300, 500]; - return in_array($limit, $validSizes) ? $limit : $default; - } protected function alert($code, $msg = '', $url = null, $wait = 3) { diff --git a/app/controller/Cert.php b/app/controller/Cert.php index de59b65..de42a67 100644 --- a/app/controller/Cert.php +++ b/app/controller/Cert.php @@ -33,7 +33,6 @@ class Cert extends BaseController $kw = $this->request->post('kw', null, 'trim'); $offset = input('post.offset/d'); $limit = input('post.limit/d'); - $limit = $this->validateLimit($limit); $select = Db::name('cert_account')->where('deploy', $deploy); if (!empty($kw)) { @@ -217,7 +216,6 @@ class Cert extends BaseController $status = input('post.status', null, 'trim'); $offset = input('post.offset/d'); $limit = input('post.limit/d'); - $limit = $this->validateLimit($limit); $select = Db::name('cert_order')->alias('A')->leftJoin('cert_account B', 'A.aid = B.id'); if (!empty($id)) { @@ -652,7 +650,6 @@ class Cert extends BaseController $remark = input('post.remark', null, 'trim'); $offset = input('post.offset/d'); $limit = input('post.limit/d'); - $limit = $this->validateLimit($limit); $select = Db::name('cert_deploy')->alias('A')->leftJoin('cert_account B', 'A.aid = B.id')->leftJoin('cert_order C', 'A.oid = C.id')->leftJoin('cert_account D', 'C.aid = D.id'); if (!empty($oid)) { @@ -865,7 +862,6 @@ class Cert extends BaseController $kw = $this->request->post('kw', null, 'trim'); $offset = input('post.offset/d'); $limit = input('post.limit/d'); - $limit = $this->validateLimit($limit); $select = Db::name('cert_cname')->alias('A')->leftJoin('domain B', 'A.did = B.id'); if (!empty($kw)) { diff --git a/app/controller/Dmonitor.php b/app/controller/Dmonitor.php index 2aa299f..8b0b617 100644 --- a/app/controller/Dmonitor.php +++ b/app/controller/Dmonitor.php @@ -43,7 +43,6 @@ class Dmonitor extends BaseController $kw = input('post.kw', null, 'trim'); $offset = input('post.offset/d'); $limit = input('post.limit/d'); - $limit = $this->validateLimit($limit); $select = Db::name('dmtask')->alias('A')->join('domain B', 'A.did = B.id'); if (!empty($kw)) { @@ -234,7 +233,6 @@ class Dmonitor extends BaseController $taskid = input('param.id/d'); $offset = input('post.offset/d'); $limit = input('post.limit/d'); - $limit = $this->validateLimit($limit); $action = input('post.action/d', 0); $select = Db::name('dmlog')->where('taskid', $taskid); diff --git a/app/controller/Domain.php b/app/controller/Domain.php index 4874c15..905b711 100644 --- a/app/controller/Domain.php +++ b/app/controller/Domain.php @@ -26,7 +26,6 @@ class Domain extends BaseController $kw = $this->request->post('kw', null, 'trim'); $offset = input('post.offset/d'); $limit = input('post.limit/d'); - $limit = $this->validateLimit($limit); $select = Db::name('account'); if (!empty($kw)) { @@ -196,7 +195,6 @@ class Domain extends BaseController $order = input('post.order', null, 'trim'); $offset = input('post.offset/d', 0); $limit = input('post.limit/d', 10); - $limit = $this->validateLimit($limit); $id = input('post.id'); $aid = input('post.aid', null, 'trim'); @@ -383,7 +381,6 @@ class Domain extends BaseController $kw = input('post.kw', null, 'trim'); $page = input('?post.page') ? input('post.page/d') : 1; $pagesize = input('?post.pagesize') ? input('post.pagesize/d') : 10; - $pagesize = $this->validateLimit($pagesize); $dns = DnsHelper::getModel($aid); $result = $dns->getDomainList($kw, $page, $pagesize); if (!$result) return json(['code' => -1, 'msg' => '获取域名列表失败,' . $dns->getError()]); @@ -489,7 +486,6 @@ class Domain extends BaseController $status = input('post.status', null, 'trim'); $offset = input('post.offset/d', 0); $limit = input('post.limit/d', 10); - $limit = $this->validateLimit($limit); if ($limit == 0) { $page = 1; } else { @@ -1020,7 +1016,6 @@ class Domain extends BaseController if (request()->isPost()) { $offset = input('post.offset/d'); $limit = input('post.limit/d'); - $limit = $this->validateLimit($limit); $page = $offset / $limit + 1; $dns = DnsHelper::getModel($drow['aid'], $drow['name'], $drow['thirdid']); $domainRecords = $dns->getDomainRecordLog($page, $limit); @@ -1215,7 +1210,6 @@ class Domain extends BaseController $keyword = input('post.keyword', null, 'trim'); $offset = input('post.offset/d'); $limit = input('post.limit/d'); - $limit = $this->validateLimit($limit); if ($limit == 0) { $page = 1; } else { @@ -1398,7 +1392,6 @@ class Domain extends BaseController if (!checkPermission(2)) return json(['total' => 0, 'rows' => []]); $offset = input('post.offset/d', 0); $limit = input('post.limit/d', 10); - $limit = $this->validateLimit($limit); $select = Db::name('domain_category'); $total = $select->count(); diff --git a/app/controller/Optimizeip.php b/app/controller/Optimizeip.php index 51282a4..ac749f1 100644 --- a/app/controller/Optimizeip.php +++ b/app/controller/Optimizeip.php @@ -45,7 +45,6 @@ class Optimizeip extends BaseController $status = input('post.status', null); $offset = input('post.offset/d'); $limit = input('post.limit/d'); - $limit = $this->validateLimit($limit); $select = Db::name('optimizeip')->alias('A')->join('domain B', 'A.did = B.id'); if (!empty($kw)) { diff --git a/app/controller/Schedule.php b/app/controller/Schedule.php index b10c610..8350be4 100644 --- a/app/controller/Schedule.php +++ b/app/controller/Schedule.php @@ -24,7 +24,6 @@ class Schedule extends BaseController $stype = input('post.stype', null); $offset = input('post.offset/d'); $limit = input('post.limit/d'); - $limit = $this->validateLimit($limit); $select = Db::name('sctask')->alias('A')->join('domain B', 'A.did = B.id'); if (!empty($kw)) { diff --git a/app/controller/User.php b/app/controller/User.php index f7f04f3..91242ce 100644 --- a/app/controller/User.php +++ b/app/controller/User.php @@ -28,7 +28,6 @@ class User extends BaseController $kw = input('post.kw', null, 'trim'); $offset = input('post.offset/d'); $limit = input('post.limit/d'); - $limit = $this->validateLimit($limit); $select = Db::name('user'); if (!empty($kw)) { @@ -166,7 +165,6 @@ class User extends BaseController $domain = input('post.domain', null, 'trim'); $offset = input('post.offset/d'); $limit = input('post.limit/d'); - $limit = $this->validateLimit($limit); $select = Db::name('log'); if ($this->request->user['type'] == 'domain') { diff --git a/app/view/cert/certorder.html b/app/view/cert/certorder.html index 986f64b..01f64f7 100644 --- a/app/view/cert/certorder.html +++ b/app/view/cert/certorder.html @@ -61,7 +61,7 @@ $(document).ready(function(){ updateToolbar(); const pageSizeKey = 'certorder_pagesize'; const pageNumber = typeof window.$_GET['pageNumber'] != 'undefined' ? parseInt(window.$_GET['pageNumber']) : 1; - const pageSize = getStoredPageSize(pageSizeKey); + const pageSize = getStoredPageSize(pageSizeKey, 10); $("#listTable").bootstrapTable({ url: '/cert/order/data', diff --git a/app/view/cert/deploytask.html b/app/view/cert/deploytask.html index fc57ead..d3c2cf9 100644 --- a/app/view/cert/deploytask.html +++ b/app/view/cert/deploytask.html @@ -60,7 +60,7 @@ $(document).ready(function(){ updateToolbar(); const pageSizeKey = 'deploytask_pagesize'; const pageNumber = typeof window.$_GET['pageNumber'] != 'undefined' ? parseInt(window.$_GET['pageNumber']) : 1; - const pageSize = getStoredPageSize(pageSizeKey); + const pageSize = getStoredPageSize(pageSizeKey, 10); $("#listTable").bootstrapTable({ url: '/cert/deploy/data', diff --git a/app/view/common/layout.html b/app/view/common/layout.html index 0d7fe1b..2804f6c 100644 --- a/app/view/common/layout.html +++ b/app/view/common/layout.html @@ -254,32 +254,6 @@ } }, false); - - {block name="script"}{/block} diff --git a/app/view/domain/qingcloud.html b/app/view/domain/qingcloud.html index c822615..9bea0fa 100644 --- a/app/view/domain/qingcloud.html +++ b/app/view/domain/qingcloud.html @@ -229,7 +229,6 @@ td{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width:360px; -