* Finish task #7917.
This commit is contained in:
@@ -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';
|
||||
|
||||
@@ -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']);
|
||||
|
||||
|
||||
@@ -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');
|
||||
|
||||
Reference in New Issue
Block a user