* Finish task #7917.

This commit is contained in:
holan20180123
2020-09-17 16:16:25 +08:00
parent 04fe4a86c8
commit 0a438c628d
3 changed files with 5 additions and 4 deletions
+1
View File
@@ -240,6 +240,7 @@ $filter->user->login->get['password'] = 'reg::any';
$filter->user->edit->get['from'] = 'reg::word';
$filter->user->ajaxgetmore->get['search'] = 'reg::any';
$filter->user->ajaxgetmore->get['limit'] = 'int';
$filter->user->ajaxgetmore->get['params'] = 'reg::base64';
$filter->git->cat->get['repoUrl'] = 'reg::base64';
$filter->git->diff->get['repoUrl'] = 'reg::base64';
+2 -3
View File
@@ -1091,13 +1091,12 @@ class user extends control
/**
* Ajax get more user.
*
* @param string $params
* @access public
* @return void
*/
public function ajaxGetMore($params)
public function ajaxGetMore()
{
$params = base64_decode($params);
$params = base64_decode($this->get->params);
parse_str($params, $parsedParams);
$users = $this->user->getPairs($parsedParams['params'], $parsedParams['usersToAppended']);
+2 -1
View File
@@ -108,7 +108,8 @@ class userModel extends model
{
if(is_array($usersToAppended)) $usersToAppended = join(',', $usersToAppended);
$moreLinkParams = "params={$params}&usersToAppended={$usersToAppended}";
$this->config->user->moreLink = helper::createLink('user', 'ajaxGetMore', "params=" . base64_encode($moreLinkParams));
$connectString = $this->config->requestType == 'GET' ? '&' : '?';
$this->config->user->moreLink = helper::createLink('user', 'ajaxGetMore') . $connectString . "params=" . base64_encode($moreLinkParams);
}
if($usersToAppended) $users += $this->dao->select($fields)->from(TABLE_USER)->where('account')->in($usersToAppended)->fetchAll('account');