gitee/course-tencent-cloud
1
0
Fork 0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-27 21:10:24 +08:00
Code Issues Releases Wiki Activity

合并demo中的修改

Browse Source
This commit is contained in:
xiaochong0302 2020-09-08 20:11:51 +08:00
parent d21c0d72e5
commit 23af401082
5 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Desktop/Views/search/user.volt
View File

@ -26,7 +26,7 @@
<div class="about layui-elip">{{ item.about }}</div>
<div class="meta">
<span>性别：{{ gender_info(item.gender) }}</span>
<span>地区：{{ item.location }}</span>
<span>地区：{{ item.area }}</span>
</div>
</div>
</div>

27
app/Library/Paginator/Query.php
View File

@ -3,6 +3,7 @@
namespace App\Library\Paginator;
use Phalcon\Di;
use Phalcon\Filter;
use Phalcon\Http\Request;
class Query
@ -13,42 +14,52 @@ class Query
*/
protected $request;
/**
* @var Filter
*/
protected $filter;
public function __construct()
{
$this->request = Di::getDefault()->get('request');
$this->filter = Di::getDefault()->get('filter');
}
public function getPage()
{
$page = $this->request->get('page', 'int', 1);
$page = $this->request->getQuery('page', ['trim', 'int'], 1);
return $page > 1000 ? 1000 : $page;
return $page > 100 ? 100 : $page;
}
public function getLimit()
{
$limit = $this->request->get('limit', 'int', 12);
$limit = $this->request->getQuery('limit', ['trim', 'int'], 12);
return $limit > 100 ? 100 : $limit;
}
public function getSort()
{
return $this->request->get('sort', 'trim', '');
return $this->request->getQuery('sort', ['trim', 'string'], '');
}
public function getBaseUrl()
{
return $this->request->get('_url', 'trim', '');
return $this->request->getQuery('_url', ['trim', 'string'], '');
}
public function getParams()
public function getParams(array $whitelist = [])
{
$params = $this->request->get();
$params = $this->request->getQuery();
if ($params) {
foreach ($params as $key => $value) {
if (strlen($value) == 0) {
$value = $this->filter->sanitize($value, ['trim', 'string']);
if ($whitelist && !in_array($value, $whitelist)) {
unset($params[$key]);
} elseif (strlen($value) == 0) {
unset($params[$key]);
}
}

2
app/Validators/Category.php
View File

@ -72,7 +72,7 @@ class Category extends Validator
{
$list = CategoryModel::types();
if (!isset($list[$type])) {
if (!array_key_exists($type, $list)) {
throw new BadRequestException('category.invalid_type');
}

12
app/Validators/Nav.php
View File

@ -69,11 +69,11 @@ class Nav extends Validator
{
$value = $this->filter->sanitize($url, ['trim']);
$stageA = Text::startsWith($value, '/');
$stageB = Text::startsWith($value, '#');
$stageC = CommonValidator::url($value);
$case1 = Text::startsWith($value, '/');
$case2 = Text::startsWith($value, '#');
$case3 = CommonValidator::url($value);
if (!$stageA && !$stageB && !$stageC) {
if (!$case1 && !$case2 && !$case3) {
throw new BadRequestException('nav.invalid_url');
}
@ -84,7 +84,7 @@ class Nav extends Validator
{
$list = NavModel::targetTypes();
if (!isset($list[$target])) {
if (!array_key_exists($target, $list)) {
throw new BadRequestException('nav.invalid_target');
}
@ -95,7 +95,7 @@ class Nav extends Validator
{
$list = NavModel::posTypes();
if (!isset($list[$position])) {
if (!array_key_exists($position, $list)) {
throw new BadRequestException('nav.invalid_position');
}

2
app/Validators/Order.php
View File

@ -49,7 +49,7 @@ class Order extends Validator
{
$list = OrderModel::itemTypes();
if (!isset($list[$itemType])) {
if (!array_key_exists($itemType, $list)) {
throw new BadRequestException('order.invalid_item_type');
}