diff options
| author | Craig Andrews <candrews@integralblue.com> | 2009-10-23 11:15:25 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2009-10-23 11:15:25 -0400 |
| commit | c93b9b9523d64f29e5d2d9885febd0ac4c167a20 (patch) | |
| tree | ef7535b99fd2ad2843186f3670bfac3ba1f7bd4a | |
| parent | e73631f614414d1aa724e926527862a955e55356 (diff) | |
| parent | 1241e651ae54adfc429aceb92a2bc873f1c82f8d (diff) | |
Merge commit 'refs/merge-requests/1815' of git://gitorious.org/statusnet/mainline into 0.9.x
| -rw-r--r-- | classes/Profile.php | 5 | ||||
| -rw-r--r-- | lib/api.php | 20 |
2 files changed, 18 insertions, 7 deletions
diff --git a/classes/Profile.php b/classes/Profile.php index 4a069ee84..a78a27f4a 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -46,6 +46,11 @@ class Profile extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE + function getUser() + { + return User::staticGet('id', $this->id); + } + function getAvatar($width, $height=null) { if (is_null($height)) { diff --git a/lib/api.php b/lib/api.php index 7a63a4a78..9bd2083de 100644 --- a/lib/api.php +++ b/lib/api.php @@ -134,11 +134,19 @@ class ApiAction extends Action $twitter_user['protected'] = false; # not supported by StatusNet yet $twitter_user['followers_count'] = $profile->subscriberCount(); - // To be supported soon... - $twitter_user['profile_background_color'] = ''; - $twitter_user['profile_text_color'] = ''; - $twitter_user['profile_link_color'] = ''; - $twitter_user['profile_sidebar_fill_color'] = ''; + // Need to pull up the user for some of this + $user = $profile->getUser(); + $design = $user->getDesign(); + $defaultDesign = Design::siteDesign(); + if (!$design) $design = $defaultDesign; + $color = Design::toWebColor(empty($design->backgroundcolor) ? $defaultDesign->backgroundcolor : $design->backgroundcolor); + $twitter_user['profile_background_color'] = ($color == null) ? '' : '#'.$color->hexValue(); + $color = Design::toWebColor(empty($design->textcolor) ? $defaultDesign->textcolor : $design->textcolor); + $twitter_user['profile_text_color'] = ($color == null) ? '' : '#'.$color->hexValue(); + $color = Design::toWebColor(empty($design->linkcolor) ? $defaultDesign->linkcolor : $design->linkcolor); + $twitter_user['profile_link_color'] = ($color == null) ? '' : '#'.$color->hexValue(); + $color = Design::toWebColor(empty($design->sidebarcolor) ? $defaultDesign->sidebarcolor : $design->sidebarcolor); + $twitter_user['profile_sidebar_fill_color'] = ($color == null) ? '' : '#'.$color->hexValue(); $twitter_user['profile_sidebar_border_color'] = ''; $twitter_user['friends_count'] = $profile->subscriptionCount(); @@ -147,8 +155,6 @@ class ApiAction extends Action $twitter_user['favourites_count'] = $profile->faveCount(); // British spelling! - // Need to pull up the user for some of this - $user = User::staticGet($profile->id); $timezone = 'UTC'; |