Move/reorg Twitter broadcast code to lib/twitter.php in prep for

[quix0rs-gnu-social.git] / actions / twittersettings.php

diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index bb0bc5946a63eef61d4d6580618fd71eee4f17a9..a79859bbf0a9205c40c25022913477b0a4d5193c 100644 (file)
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -32,6 +32,7 @@ if (!defined('LACONICA')) {
 }
 
 require_once INSTALLDIR.'/lib/connectsettingsaction.php';
+require_once INSTALLDIR.'/lib/twitter.php';
 
 define('SUBSCRIPTIONS', 80);
 
@@ -57,7 +58,7 @@ class TwittersettingsAction extends ConnectSettingsAction
 
     function title()
     {
-        _('Twitter settings');
+        return _('Twitter settings');
     }
 
     /**
@@ -90,7 +91,7 @@ class TwittersettingsAction extends ConnectSettingsAction
 
         $fuser = null;
 
-        $flink = Foreign_link::getByUserID($user->id, 1); // 1 == Twitter
+        $flink = Foreign_link::getByUserID($user->id, TWITTER_SERVICE);
 
         if ($flink) {
             $fuser = $flink->getForeignUser();
@@ -109,7 +110,7 @@ class TwittersettingsAction extends ConnectSettingsAction
             $this->elementStart('li', array('id' => 'settings_twitter_remove'));
             $this->element('span', 'twitter_user', $fuser->nickname);
             $this->element('a', array('href' => $fuser->uri), $fuser->uri);
-            $this->element('p', 'form_guide',
+            $this->element('p', 'form_note',
                            _('Current verified Twitter account.'));
             $this->hidden('flink_foreign_id', $flink->foreign_id);
             $this->elementEnd('li');
@@ -250,8 +251,8 @@ class TwittersettingsAction extends ConnectSettingsAction
                 $avatar = $other->getAvatar(AVATAR_MINI_SIZE);
 
                 $avatar_url = ($avatar) ?
-                  common_avatar_display_url($avatar) :
-                  common_default_avatar(AVATAR_MINI_SIZE);
+                  $avatar->displayUrl() :
+                  Avatar::defaultImage(AVATAR_MINI_SIZE);
 
                 $this->element('img', array('src' => $avatar_url,
                                             'width' => AVATAR_MINI_SIZE,
@@ -358,7 +359,7 @@ class TwittersettingsAction extends ConnectSettingsAction
 
         $flink->user_id     = $user->id;
         $flink->foreign_id  = $twit_user->id;
-        $flink->service     = 1; // Twitter
+        $flink->service     = TWITTER_SERVICE;
         $flink->credentials = $password;
         $flink->created     = common_sql_now();