diff options
| -rw-r--r-- | actions/oauthconnectionssettings.php | 2 | ||||
| -rw-r--r-- | classes/Profile.php | 25 | ||||
| -rw-r--r-- | classes/User.php | 30 |
3 files changed, 31 insertions, 26 deletions
diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php index 9a7cda924..cdb73203f 100644 --- a/actions/oauthconnectionssettings.php +++ b/actions/oauthconnectionssettings.php @@ -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; diff --git a/classes/Profile.php b/classes/Profile.php index 239c368ca..332d51e20 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -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(); diff --git a/classes/User.php b/classes/User.php index 8a3190cbf..1b1b971ec 100644 --- a/classes/User.php +++ b/classes/User.php @@ -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; + } + } |