Merge branch 'nightly', beginning of 1.2.x
Conflicts: plugins/APC/locale/APC.pot plugins/APC/locale/ast/LC_MESSAGES/APC.po plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po plugins/APC/locale/br/LC_MESSAGES/APC.po plugins/APC/locale/de/LC_MESSAGES/APC.po plugins/APC/locale/es/LC_MESSAGES/APC.po plugins/APC/locale/eu/LC_MESSAGES/APC.po plugins/APC/locale/fr/LC_MESSAGES/APC.po plugins/APC/locale/gl/LC_MESSAGES/APC.po plugins/APC/locale/he/LC_MESSAGES/APC.po plugins/APC/locale/ia/LC_MESSAGES/APC.po plugins/APC/locale/id/LC_MESSAGES/APC.po plugins/APC/locale/it/LC_MESSAGES/APC.po plugins/APC/locale/mk/LC_MESSAGES/APC.po plugins/APC/locale/ms/LC_MESSAGES/APC.po plugins/APC/locale/nb/LC_MESSAGES/APC.po plugins/APC/locale/nl/LC_MESSAGES/APC.po plugins/APC/locale/pl/LC_MESSAGES/APC.po plugins/APC/locale/pt/LC_MESSAGES/APC.po plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po plugins/APC/locale/ru/LC_MESSAGES/APC.po plugins/APC/locale/tl/LC_MESSAGES/APC.po plugins/APC/locale/uk/LC_MESSAGES/APC.po plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po plugins/Adsense/locale/Adsense.pot plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po plugins/Adsense/locale/br/LC_MESSAGES/Adsense.po plugins/Adsense/locale/ca/LC_MESSAGES/Adsense.po plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po plugins/Adsense/locale/es/LC_MESSAGES/Adsense.po plugins/Adsense/locale/eu/LC_MESSAGES/Adsense.po plugins/Adsense/locale/fr/LC_MESSAGES/Adsense.po plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po plugins/Adsense/locale/he/LC_MESSAGES/Adsense.po plugins/Adsense/locale/ia/LC_MESSAGES/Adsense.po plugins/Adsense/locale/it/LC_MESSAGES/Adsense.po plugins/Adsense/locale/ja/LC_MESSAGES/Adsense.po plugins/Adsense/locale/ka/LC_MESSAGES/Adsense.po plugins/Adsense/locale/lb/LC_MESSAGES/Adsense.po plugins/Adsense/locale/lt/LC_MESSAGES/Adsense.po plugins/Adsense/locale/mk/LC_MESSAGES/Adsense.po plugins/Adsense/locale/ms/LC_MESSAGES/Adsense.po plugins/Adsense/locale/nb/LC_MESSAGES/Adsense.po plugins/Adsense/locale/nl/LC_MESSAGES/Adsense.po plugins/Adsense/locale/pl/LC_MESSAGES/Adsense.po plugins/Adsense/locale/pt/LC_MESSAGES/Adsense.po plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po plugins/Adsense/locale/ru/LC_MESSAGES/Adsense.po plugins/Adsense/locale/sv/LC_MESSAGES/Adsense.po plugins/Adsense/locale/tl/LC_MESSAGES/Adsense.po plugins/Adsense/locale/tr/LC_MESSAGES/Adsense.po plugins/Adsense/locale/uk/LC_MESSAGES/Adsense.po plugins/Adsense/locale/zh_CN/LC_MESSAGES/Adsense.po plugins/Aim/locale/Aim.pot plugins/Aim/locale/af/LC_MESSAGES/Aim.po plugins/Aim/locale/ca/LC_MESSAGES/Aim.po plugins/Aim/locale/de/LC_MESSAGES/Aim.po plugins/Aim/locale/es/LC_MESSAGES/Aim.po plugins/Aim/locale/eu/LC_MESSAGES/Aim.po plugins/Aim/locale/fi/LC_MESSAGES/Aim.po plugins/Aim/locale/fr/LC_MESSAGES/Aim.po plugins/Aim/locale/gl/LC_MESSAGES/Aim.po plugins/Aim/locale/ia/LC_MESSAGES/Aim.po plugins/Aim/locale/it/LC_MESSAGES/Aim.po plugins/Aim/locale/mk/LC_MESSAGES/Aim.po plugins/Aim/locale/ms/LC_MESSAGES/Aim.po plugins/Aim/locale/nl/LC_MESSAGES/Aim.po plugins/Aim/locale/pl/LC_MESSAGES/Aim.po plugins/Aim/locale/pt/LC_MESSAGES/Aim.po plugins/Aim/locale/sv/LC_MESSAGES/Aim.po plugins/Aim/locale/tl/LC_MESSAGES/Aim.po plugins/Aim/locale/uk/LC_MESSAGES/Aim.po plugins/Blog/locale/Blog.pot plugins/Blog/locale/ar/LC_MESSAGES/Blog.po plugins/Blog/locale/br/LC_MESSAGES/Blog.po plugins/Blog/locale/ca/LC_MESSAGES/Blog.po plugins/Blog/locale/de/LC_MESSAGES/Blog.po plugins/Blog/locale/es/LC_MESSAGES/Blog.po plugins/Blog/locale/eu/LC_MESSAGES/Blog.po plugins/Blog/locale/fr/LC_MESSAGES/Blog.po plugins/Blog/locale/gl/LC_MESSAGES/Blog.po plugins/Blog/locale/ia/LC_MESSAGES/Blog.po plugins/Blog/locale/it/LC_MESSAGES/Blog.po plugins/Blog/locale/lt/LC_MESSAGES/Blog.po plugins/Blog/locale/mk/LC_MESSAGES/Blog.po plugins/Blog/locale/nl/LC_MESSAGES/Blog.po plugins/Blog/locale/tl/LC_MESSAGES/Blog.po plugins/Blog/locale/tr/LC_MESSAGES/Blog.po plugins/Irc/locale/Irc.pot plugins/Irc/locale/ca/LC_MESSAGES/Irc.po plugins/Irc/locale/de/LC_MESSAGES/Irc.po plugins/Irc/locale/es/LC_MESSAGES/Irc.po plugins/Irc/locale/eu/LC_MESSAGES/Irc.po plugins/Irc/locale/fi/LC_MESSAGES/Irc.po plugins/Irc/locale/fr/LC_MESSAGES/Irc.po plugins/Irc/locale/gl/LC_MESSAGES/Irc.po plugins/Irc/locale/ia/LC_MESSAGES/Irc.po plugins/Irc/locale/it/LC_MESSAGES/Irc.po plugins/Irc/locale/ja/LC_MESSAGES/Irc.po plugins/Irc/locale/mk/LC_MESSAGES/Irc.po plugins/Irc/locale/nl/LC_MESSAGES/Irc.po plugins/Irc/locale/sv/LC_MESSAGES/Irc.po plugins/Irc/locale/tl/LC_MESSAGES/Irc.po plugins/Irc/locale/tr/LC_MESSAGES/Irc.po plugins/Irc/locale/uk/LC_MESSAGES/Irc.po plugins/Spotify/locale/Spotify.pot plugins/Spotify/locale/de/LC_MESSAGES/Spotify.po plugins/Spotify/locale/es/LC_MESSAGES/Spotify.po plugins/Spotify/locale/fr/LC_MESSAGES/Spotify.po plugins/Spotify/locale/gl/LC_MESSAGES/Spotify.po plugins/Spotify/locale/he/LC_MESSAGES/Spotify.po plugins/Spotify/locale/ia/LC_MESSAGES/Spotify.po plugins/Spotify/locale/mk/LC_MESSAGES/Spotify.po plugins/Spotify/locale/nl/LC_MESSAGES/Spotify.po plugins/Spotify/locale/sv/LC_MESSAGES/Spotify.po plugins/Spotify/locale/tl/LC_MESSAGES/Spotify.po plugins/TinyMCE/locale/TinyMCE.pot plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/de/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/gl/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/ja/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/ms/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po plugins/XCache/locale/XCache.pot plugins/XCache/locale/ast/LC_MESSAGES/XCache.po plugins/XCache/locale/br/LC_MESSAGES/XCache.po plugins/XCache/locale/de/LC_MESSAGES/XCache.po plugins/XCache/locale/es/LC_MESSAGES/XCache.po plugins/XCache/locale/eu/LC_MESSAGES/XCache.po plugins/XCache/locale/fi/LC_MESSAGES/XCache.po plugins/XCache/locale/fr/LC_MESSAGES/XCache.po plugins/XCache/locale/gl/LC_MESSAGES/XCache.po plugins/XCache/locale/he/LC_MESSAGES/XCache.po plugins/XCache/locale/ia/LC_MESSAGES/XCache.po plugins/XCache/locale/id/LC_MESSAGES/XCache.po plugins/XCache/locale/mk/LC_MESSAGES/XCache.po plugins/XCache/locale/ms/LC_MESSAGES/XCache.po plugins/XCache/locale/nb/LC_MESSAGES/XCache.po plugins/XCache/locale/nl/LC_MESSAGES/XCache.po plugins/XCache/locale/pl/LC_MESSAGES/XCache.po plugins/XCache/locale/pt/LC_MESSAGES/XCache.po plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po plugins/XCache/locale/ru/LC_MESSAGES/XCache.po plugins/XCache/locale/tl/LC_MESSAGES/XCache.po plugins/XCache/locale/tr/LC_MESSAGES/XCache.po plugins/XCache/locale/uk/LC_MESSAGES/XCache.po plugins/YammerImport/locale/YammerImport.pot plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po plugins/YammerImport/locale/de/LC_MESSAGES/YammerImport.po plugins/YammerImport/locale/es/LC_MESSAGES/YammerImport.po plugins/YammerImport/locale/eu/LC_MESSAGES/YammerImport.po plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po plugins/YammerImport/locale/ms/LC_MESSAGES/YammerImport.po plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po plugins/YammerImport/locale/pl/LC_MESSAGES/YammerImport.po plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po plugins/YammerImport/locale/tl/LC_MESSAGES/YammerImport.po plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po
This commit is contained in:
Mikael Nordfeldth
@@ -27,12 +27,7 @@
|
||||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
if (!defined('STATUSNET'))
|
||||
{
|
||||
exit(1);
|
||||
}
|
||||
|
||||
require_once INSTALLDIR . '/lib/publicgroupnav.php';
|
||||
if (!defined('GNUSOCIAL')) { exit(1); }
|
||||
|
||||
/**
|
||||
* Group directory
|
||||
@@ -40,10 +35,11 @@ require_once INSTALLDIR . '/lib/publicgroupnav.php';
|
||||
* @category Directory
|
||||
* @package StatusNet
|
||||
* @author Zach Copley <zach@status.net>
|
||||
* @author Mikael Nordfeldth <mmn@hethane.se>
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
*/
|
||||
class GroupdirectoryAction extends Action
|
||||
class GroupdirectoryAction extends ManagedAction
|
||||
{
|
||||
/**
|
||||
* The page we're on
|
||||
@@ -138,17 +134,8 @@ class GroupdirectoryAction extends Action
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Take arguments for running
|
||||
*
|
||||
* @param array $args $_REQUEST args
|
||||
*
|
||||
* @return boolean success flag
|
||||
*/
|
||||
function prepare($args)
|
||||
protected function doPreparation()
|
||||
{
|
||||
parent::prepare($args);
|
||||
|
||||
$this->page = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
|
||||
$this->filter = $this->arg('filter', 'all');
|
||||
$this->reverse = $this->boolean('reverse');
|
||||
@@ -156,23 +143,6 @@ class GroupdirectoryAction extends Action
|
||||
$this->sort = $this->arg('sort', 'nickname');
|
||||
|
||||
common_set_returnto($this->selfUrl());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle request
|
||||
*
|
||||
* Shows the page
|
||||
*
|
||||
* @param array $args $_REQUEST args; handled in prepare()
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
function handle($args)
|
||||
{
|
||||
parent::handle($args);
|
||||
$this->showPage();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -303,74 +273,61 @@ class GroupdirectoryAction extends Action
|
||||
{
|
||||
$group = new User_group();
|
||||
|
||||
$offset = ($this->page-1) * PROFILES_PER_PAGE;
|
||||
$limit = PROFILES_PER_PAGE + 1;
|
||||
// Disable this to get global group searches
|
||||
$group->joinAdd(array('id', 'local_group:group_id'));
|
||||
|
||||
if (isset($this->q)) {
|
||||
$order = false;
|
||||
|
||||
$order = 'user_group.created ASC';
|
||||
|
||||
if ($this->sort == 'nickname') {
|
||||
if ($this->reverse) {
|
||||
$order = 'user_group.nickname DESC';
|
||||
} else {
|
||||
$order = 'user_group.nickname ASC';
|
||||
}
|
||||
} else {
|
||||
if ($this->reverse) {
|
||||
$order = 'user_group.created DESC';
|
||||
}
|
||||
}
|
||||
|
||||
$sql = <<< GROUP_QUERY_END
|
||||
SELECT user_group.*
|
||||
FROM user_group
|
||||
JOIN local_group ON user_group.id = local_group.group_id
|
||||
ORDER BY %s
|
||||
LIMIT %d, %d
|
||||
GROUP_QUERY_END;
|
||||
|
||||
$cnt = 0;
|
||||
$group->query(sprintf($sql, $order, $limit, $offset));
|
||||
$group->find();
|
||||
if (!empty($this->q)) {
|
||||
$wheres = array('nickname', 'fullname', 'homepage', 'description', 'location');
|
||||
foreach ($wheres as $where) {
|
||||
// Double % because of sprintf
|
||||
$group->whereAdd(sprintf('LOWER(%1$s.%2$s) LIKE LOWER("%%%3$s%%")',
|
||||
$group->escapedTableName(), $where,
|
||||
$group->escape($this->q)),
|
||||
'OR');
|
||||
}
|
||||
|
||||
$order = sprintf('%1$s.%2$s %3$s',
|
||||
$group->escapedTableName(),
|
||||
$this->getSortKey('created'),
|
||||
$this->reverse ? 'DESC' : 'ASC');
|
||||
} else {
|
||||
// User is browsing via AlphaNav
|
||||
$sort = $this->getSortKey();
|
||||
|
||||
$sql = <<< GROUP_QUERY_END
|
||||
SELECT user_group.*
|
||||
FROM user_group
|
||||
JOIN local_group ON user_group.id = local_group.group_id
|
||||
GROUP_QUERY_END;
|
||||
|
||||
switch($this->filter)
|
||||
{
|
||||
switch($this->filter) {
|
||||
case 'all':
|
||||
// NOOP
|
||||
break;
|
||||
case '0-9':
|
||||
$sql .=
|
||||
' AND LEFT(user_group.nickname, 1) BETWEEN \'0\' AND \'9\'';
|
||||
$group->whereAdd(sprintf('LEFT(%1$s.%2$s, 1) BETWEEN %3$s AND %4$s',
|
||||
$group->escapedTableName(),
|
||||
'nickname',
|
||||
$group->_quote("0"),
|
||||
$group->_quote("9")));
|
||||
break;
|
||||
default:
|
||||
$sql .= sprintf(
|
||||
' AND LEFT(LOWER(user_group.nickname), 1) = \'%s\'',
|
||||
$this->filter
|
||||
);
|
||||
$group->whereAdd(sprintf('LEFT(LOWER(%1$s.%2$s), 1) = %3$s',
|
||||
$group->escapedTableName(),
|
||||
'nickname',
|
||||
$group->_quote($this->filter)));
|
||||
}
|
||||
|
||||
$sql .= sprintf(
|
||||
' ORDER BY user_group.%s %s, user_group.nickname ASC LIMIT %d, %d',
|
||||
$sort,
|
||||
$this->reverse ? 'DESC' : 'ASC',
|
||||
$offset,
|
||||
$limit
|
||||
);
|
||||
|
||||
$group->query($sql);
|
||||
$order = sprintf('%1$s.%2$s %3$s, %1$s.%4$s ASC',
|
||||
$group->escapedTableName(),
|
||||
$this->getSortKey('nickname'),
|
||||
$this->reverse ? 'DESC' : 'ASC',
|
||||
'nickname');
|
||||
}
|
||||
|
||||
$offset = ($this->page-1) * PROFILES_PER_PAGE;
|
||||
$limit = PROFILES_PER_PAGE + 1;
|
||||
|
||||
$group->orderBy($order);
|
||||
$group->limit($offset, $limit);
|
||||
|
||||
$group->find();
|
||||
|
||||
return $group;
|
||||
}
|
||||
|
||||
@@ -379,17 +336,14 @@ GROUP_QUERY_END;
|
||||
*
|
||||
* @return string a column name for sorting
|
||||
*/
|
||||
function getSortKey()
|
||||
function getSortKey($def='created')
|
||||
{
|
||||
switch ($this->sort) {
|
||||
case 'nickname':
|
||||
return $this->sort;
|
||||
break;
|
||||
case 'created':
|
||||
return $this->sort;
|
||||
break;
|
||||
default:
|
||||
return 'nickname';
|
||||
return $def;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -27,12 +27,7 @@
|
||||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
if (!defined('STATUSNET'))
|
||||
{
|
||||
exit(1);
|
||||
}
|
||||
|
||||
require_once INSTALLDIR . '/lib/publicgroupnav.php';
|
||||
if (!defined('GNUSOCIAL')) { exit(1); }
|
||||
|
||||
/**
|
||||
* User directory
|
||||
@@ -43,7 +38,7 @@ require_once INSTALLDIR . '/lib/publicgroupnav.php';
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
*/
|
||||
class UserdirectoryAction extends Action
|
||||
class UserdirectoryAction extends ManagedAction
|
||||
{
|
||||
/**
|
||||
* The page we're on
|
||||
@@ -137,17 +132,8 @@ class UserdirectoryAction extends Action
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Take arguments for running
|
||||
*
|
||||
* @param array $args $_REQUEST args
|
||||
*
|
||||
* @return boolean success flag
|
||||
*/
|
||||
function prepare($args)
|
||||
protected function doPreparation()
|
||||
{
|
||||
parent::prepare($args);
|
||||
|
||||
$this->page = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
|
||||
$this->filter = $this->arg('filter', 'all');
|
||||
$this->reverse = $this->boolean('reverse');
|
||||
@@ -155,23 +141,6 @@ class UserdirectoryAction extends Action
|
||||
$this->sort = $this->arg('sort', 'nickname');
|
||||
|
||||
common_set_returnto($this->selfUrl());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle request
|
||||
*
|
||||
* Shows the page
|
||||
*
|
||||
* @param array $args $_REQUEST args; handled in prepare()
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
function handle($args)
|
||||
{
|
||||
parent::handle($args);
|
||||
$this->showPage();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -291,10 +260,13 @@ class UserdirectoryAction extends Action
|
||||
{
|
||||
$profile = new Profile();
|
||||
|
||||
// Comment this out or disable to get global profile searches
|
||||
$profile->joinAdd(array('id', 'user:id'));
|
||||
|
||||
$offset = ($this->page - 1) * PROFILES_PER_PAGE;
|
||||
$limit = PROFILES_PER_PAGE + 1;
|
||||
|
||||
if (isset($this->q)) {
|
||||
if (!empty($this->q)) {
|
||||
// User is searching via query
|
||||
$search_engine = $profile->getSearchEngine('profile');
|
||||
|
||||
@@ -319,34 +291,34 @@ class UserdirectoryAction extends Action
|
||||
$profile->find();
|
||||
} else {
|
||||
// User is browsing via AlphaNav
|
||||
$sort = $this->getSortKey();
|
||||
$sql = 'SELECT profile.* FROM profile, user WHERE profile.id = user.id';
|
||||
|
||||
switch($this->filter)
|
||||
{
|
||||
switch ($this->filter) {
|
||||
case 'all':
|
||||
// NOOP
|
||||
break;
|
||||
case '0-9':
|
||||
$sql .=
|
||||
' AND LEFT(profile.nickname, 1) BETWEEN \'0\' AND \'9\'';
|
||||
$profile->whereAdd(sprintf('LEFT(%1$s.%2$s, 1) BETWEEN %3$s AND %4$s',
|
||||
$profile->escapedTableName(),
|
||||
'nickname',
|
||||
$profile->_quote("0"),
|
||||
$profile->_quote("9")));
|
||||
break;
|
||||
default:
|
||||
$sql .= sprintf(
|
||||
' AND LEFT(LOWER(profile.nickname), 1) = \'%s\'',
|
||||
$this->filter
|
||||
);
|
||||
$profile->whereAdd(sprintf('LEFT(LOWER(%1$s.%2$s), 1) = %3$s',
|
||||
$profile->escapedTableName(),
|
||||
'nickname',
|
||||
$profile->_quote($this->filter)));
|
||||
}
|
||||
|
||||
$sql .= sprintf(
|
||||
' ORDER BY profile.%s %s, profile.nickname ASC LIMIT %d, %d',
|
||||
$sort,
|
||||
$this->reverse ? 'DESC' : 'ASC',
|
||||
$offset,
|
||||
$limit
|
||||
);
|
||||
$order = sprintf('%1$s.%2$s %3$s, %1$s.%4$s ASC',
|
||||
$profile->escapedTableName(),
|
||||
$this->getSortKey('nickname'),
|
||||
$this->reverse ? 'DESC' : 'ASC',
|
||||
'nickname');
|
||||
$profile->orderBy($order);
|
||||
$profile->limit($offset, $limit);
|
||||
|
||||
$profile->query($sql);
|
||||
$profile->find();
|
||||
}
|
||||
|
||||
return $profile;
|
||||
@@ -357,15 +329,12 @@ class UserdirectoryAction extends Action
|
||||
*
|
||||
* @return string a column name for sorting
|
||||
*/
|
||||
function getSortKey()
|
||||
function getSortKey($def='nickname')
|
||||
{
|
||||
switch ($this->sort) {
|
||||
case 'nickname':
|
||||
return $this->sort;
|
||||
break;
|
||||
case 'created':
|
||||
return $this->sort;
|
||||
break;
|
||||
default:
|
||||
return 'nickname';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user