GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Move getConnectedApps() from Profile to User, where it belongs

Browse Source
This commit is contained in:
Zach Copley 2010-12-12 17:37:42 -08:00
parent af4ee1d490
commit bb55784e90
3 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/oauthconnectionssettings.php
View File

@ -97,7 +97,7 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
$offset = ($this->page - 1) * APPS_PER_PAGE;
$limit = APPS_PER_PAGE + 1;
$connection = $profile->getConnectedApps($offset, $limit);
$connection = $user->getConnectedApps($offset, $limit);
$cnt = 0;

25
classes/Profile.php
View File

@ -408,31 +408,6 @@ class Profile extends Memcached_DataObject
return new ArrayWrapper($profiles);
}
function getConnectedApps($offset = 0, $limit = null)
{
$qry =
'SELECT u.* ' .
'FROM oauth_application_user u, oauth_application a ' .
'WHERE u.profile_id = %d ' .
'AND a.id = u.application_id ' .
'AND u.access_type > 0 ' .
'ORDER BY u.created DESC ';
if ($offset > 0) {
if (common_config('db','type') == 'pgsql') {
$qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
} else {
$qry .= ' LIMIT ' . $offset . ', ' . $limit;
}
}
$apps = new Oauth_application_user();
$cnt = $apps->query(sprintf($qry, $this->id));
return $apps;
}
function subscriptionCount()
{
$c = common_memcache();

30
classes/User.php
View File

@ -978,4 +978,34 @@ class User extends Memcached_DataObject
{
return common_shorten_links($text, $always, $this);
}
/*
* Get a list of OAuth client application that have access to this
* user's account.
*/
function getConnectedApps($offset = 0, $limit = null)
{
$qry =
'SELECT u.* ' .
'FROM oauth_application_user u, oauth_application a ' .
'WHERE u.profile_id = %d ' .
'AND a.id = u.application_id ' .
'AND u.access_type > 0 ' .
'ORDER BY u.created DESC ';
if ($offset > 0) {
if (common_config('db','type') == 'pgsql') {
$qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
} else {
$qry .= ' LIMIT ' . $offset . ', ' . $limit;
}
}
$apps = new Oauth_application_user();
$cnt = $apps->query(sprintf($qry, $this->id));
return $apps;
}
}