diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/facebookhome.php | 3 | ||||
| -rw-r--r-- | actions/favoritesrss.php | 42 | ||||
| -rw-r--r-- | actions/profilesettings.php | 2 | ||||
| -rw-r--r-- | actions/register.php | 2 | ||||
| -rw-r--r-- | actions/showgroup.php | 2 | ||||
| -rw-r--r-- | actions/subscribers.php | 4 | ||||
| -rw-r--r-- | actions/twittersettings.php | 4 |
7 files changed, 33 insertions, 26 deletions
diff --git a/actions/facebookhome.php b/actions/facebookhome.php index e17c0f813..4eaf0b4f7 100644 --- a/actions/facebookhome.php +++ b/actions/facebookhome.php @@ -122,7 +122,6 @@ class FacebookhomeAction extends FacebookAction // XXX: Do some error handling here $this->setDefaults(); - //$this->showHome($flink, _('You can now use Identi.ca from Facebook!')); $this->getUpdatePermission(); return; @@ -154,6 +153,8 @@ class FacebookhomeAction extends FacebookAction $notice_form = new FacebookNoticeForm($this, $post_action, null, $post_action, $this->user); $notice_form->show(); + + } function title() diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php index ad72dce9e..f85bf1b19 100644 --- a/actions/favoritesrss.php +++ b/actions/favoritesrss.php @@ -44,22 +44,32 @@ require_once INSTALLDIR.'/lib/rssaction.php'; * @package Laconica * @author Evan Prodromou <evan@controlyourself.ca> * @author Robin Millette <millette@controlyourself.ca> + * @author Zach Copley <zach@controlyourself.ca> * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://laconi.ca/ */ class FavoritesrssAction extends Rss10Action { - var $user = null; + /** The user whose favorites to display */ + + var $user = null; + /** - * Initialization. - * - * @return boolean false if user doesn't exist + * Find the user to display by supplied nickname + * + * @param array $args Arguments from $_REQUEST + * + * @return boolean success */ - function init() + + function prepare($args) { + parent::prepare($args); + $nickname = $this->trimmed('nickname'); $this->user = User::staticGet('nickname', $nickname); + if (!$this->user) { $this->clientError(_('No such user.')); return false; @@ -67,7 +77,7 @@ class FavoritesrssAction extends Rss10Action return true; } } - + /** * Get notices * @@ -94,30 +104,26 @@ class FavoritesrssAction extends Rss10Action function getChannel() { $user = $this->user; - $c = array('url' => common_local_url('favoritesrss', - array('nickname' => - $user->nickname)), + $c = array('url' => common_local_url('favoritesrss', + array('nickname' => + $user->nickname)), 'title' => sprintf(_("%s favorite notices"), $user->nickname), 'link' => common_local_url('showfavorites', - array('nickname' => - $user->nickname)), - 'description' => sprintf(_('Feed of favorite notices of %s'), $user->nickname)); + array('nickname' => + $user->nickname)), + 'description' => sprintf(_('Feed of favorite notices of %s'), + $user->nickname)); return $c; } /** * Get image. * - * @return voir + * @return void */ function getImage() { return null; } - function isReadOnly() - { - return true; - } } - diff --git a/actions/profilesettings.php b/actions/profilesettings.php index 6dd4775e5..82e6c3c82 100644 --- a/actions/profilesettings.php +++ b/actions/profilesettings.php @@ -83,7 +83,7 @@ class ProfilesettingsAction extends AccountSettingsAction $user = common_current_user(); $profile = $user->getProfile(); - $this->elementStart('form', array('method' => 'POST', + $this->elementStart('form', array('method' => 'post', 'id' => 'form_settings_profile', 'class' => 'form_settings', 'action' => common_local_url('profilesettings'))); diff --git a/actions/register.php b/actions/register.php index 433c6c291..df64196da 100644 --- a/actions/register.php +++ b/actions/register.php @@ -428,7 +428,7 @@ class RegisterAction extends Action $this->element('input', $attrs); $this->text(_('My text and files are available under ')); $this->element('a', array('href' => common_config('license', 'url')), - common_config('license', 'title')); + common_config('license', 'title'), _("Creative Commons Attribution 3.0")); $this->text(_(' except this private data: password, '. 'email address, IM address, phone number.')); $this->elementEnd('li'); diff --git a/actions/showgroup.php b/actions/showgroup.php index 99367a97c..c29b7d426 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -269,7 +269,7 @@ class ShowgroupAction extends Action $this->elementStart('div', 'entity_actions'); $this->element('h2', null, _('Group actions')); $this->elementStart('ul'); - $this->elementStart('li', array('id' => 'entity_subscribe')); + $this->elementStart('li', 'entity_subscribe'); $cur = common_current_user(); if ($cur) { if ($cur->isMember($this->group)) { diff --git a/actions/subscribers.php b/actions/subscribers.php index fb8733c77..25200079c 100644 --- a/actions/subscribers.php +++ b/actions/subscribers.php @@ -96,9 +96,9 @@ class SubscribersAction extends GalleryAction class SubscribersList extends ProfileList { - function showOwnerControls($profile) + function showBlockForm() { - $bf = new BlockForm($this->out, $profile, + $bf = new BlockForm($this->out, $this->profile, array('action' => 'subscribers', 'nickname' => $this->owner->nickname)); $bf->show(); diff --git a/actions/twittersettings.php b/actions/twittersettings.php index bb0bc5946..b3bf67dc3 100644 --- a/actions/twittersettings.php +++ b/actions/twittersettings.php @@ -57,7 +57,7 @@ class TwittersettingsAction extends ConnectSettingsAction function title() { - _('Twitter settings'); + return _('Twitter settings'); } /** @@ -109,7 +109,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'); |