posting from a form takes you back to the same page

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

diff --git a/actions/showstream.php b/actions/showstream.php
index 2fc5184c38ece9ae707d4899aa4af06be29e8b74..7ccdc894ff82c12e2ce9f09316e83971a89fa989 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -68,7 +68,7 @@ class ShowstreamAction extends StreamAction {
                $cur = common_current_user();
                
                if ($cur && $cur->id == $user->id) {
-                       common_notice_form();
+                       common_notice_form('showstream');
                }
                
                $this->views_menu();
@@ -113,27 +113,26 @@ class ShowstreamAction extends StreamAction {
        function show_personal($profile) {
 
                $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-               if ($avatar) {
-                       common_element_start('div', array('id' => 'profile_avatar'));
-                       common_element('img', array('src' => $avatar->url,
-                                                                               'class' => 'avatar profile',
-                                                                               'width' => AVATAR_PROFILE_SIZE,
-                                                                               'height' => AVATAR_PROFILE_SIZE,
-                                                                               'alt' => $profile->nickname));
-                       $cur = common_current_user();
-                       if ($cur) {
-                               if ($cur->id != $profile->id) {
-                                       if ($cur->isSubscribed($profile)) {
-                                               $this->show_unsubscribe_form($profile);
-                                       } else {
-                                               $this->show_subscribe_form($profile);
-                                       }
+               common_element_start('div', array('id' => 'profile_avatar'));
+               common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_PROFILE_SIZE),
+                                                                       'class' => 'avatar profile',
+                                                                       'width' => AVATAR_PROFILE_SIZE,
+                                                                       'height' => AVATAR_PROFILE_SIZE,
+                                                                       'alt' => $profile->nickname));
+               $cur = common_current_user();
+               if ($cur) {
+                       if ($cur->id != $profile->id) {
+                               if ($cur->isSubscribed($profile)) {
+                                       $this->show_unsubscribe_form($profile);
+                               } else {
+                                       $this->show_subscribe_form($profile);
                                }
-                       } else {
-                               $this->show_remote_subscribe_form($profile);
                        }
-                       common_element_end('div');
+               } else {
+                       $this->show_remote_subscribe_form($profile);
                }
+               common_element_end('div');
+
                common_element_start('div', array('id' => 'profile_information'));
                
                if ($profile->fullname) {
@@ -165,7 +164,7 @@ class ShowstreamAction extends StreamAction {
                                                                          'type' => 'hidden',
                                                                          'value' => $profile->nickname));
                common_element('input', array('type' => 'submit',
-                                                                         'class' => 'button',
+                                                                         'class' => 'submit',
                                                                          'value' => _t('Subscribe')));
                common_element_end('form');
        }
@@ -183,7 +182,7 @@ class ShowstreamAction extends StreamAction {
                                                                          'id' => 'submit',
                                                                          'name' => 'submit',
                                                                          'value' => _t('Subscribe'),
-                                                                         'class' => 'button'));
+                                                                         'class' => 'submit'));
                common_element_end('form');
        }
 
@@ -195,7 +194,7 @@ class ShowstreamAction extends StreamAction {
                                                                          'type' => 'hidden',
                                                                          'value' => $profile->nickname));
                common_element('input', array('type' => 'submit',
-                                                                         'class' => 'button',
+                                                                         'class' => 'submit',
                                                                          'value' => _t('Unsubscribe')));
                common_element_end('form');
        }
@@ -205,7 +204,8 @@ class ShowstreamAction extends StreamAction {
 
                $subs = DB_DataObject::factory('subscription');
                $subs->subscriber = $profile->id;
-
+               $subs->orderBy('created DESC');
+               
                # We ask for an extra one to know if we need to do another page
 
                $subs->limit(0, SUBSCRIPTIONS + 1);
@@ -290,7 +290,7 @@ class ShowstreamAction extends StreamAction {
                common_element_end('dt');
                common_element('dd', 'subscriptions', $subs_count);
                common_element_start('dt', 'subscribers');
-               common_element('a', array('href' => common_local_url('subscribed',
+               common_element('a', array('href' => common_local_url('subscribers',
                                                                                                                         array('nickname' => $profile->nickname))),
                                           _t('Subscribers'));
                common_element_end('dt');