Merge branch '0.9-release'

* 0.9-release: (874 commits)
  Removed call to NewDirectMessage() until IE return is fixed i.e.,
  Don't show flag user button your own profile
  Fixed HXR response for flag user
  Using the right form class name
  Using common_redirect
  Left a form_data class of a <ul> in the user admin panel
  Added validation to fields in user admin panel
  Added a user admin panel
  Added mobile logos for default and identica themes
  Changed gif to png
  Changed this to action. THANKS zach!
  Doing content negotiation only once
  Add execute bit to pingqueuehandler
  Localisation updates for !StatusNet from !translatewiki.net
  Use the browser's geolocation API to set the location on the notice form
  Add geometa library, and include it.
  Add location form elements to the noticeform, and save their values on submission
  Use the $user object nickname, as login name doesnt have to == nickname anymore with plugins such as ldap/etc
  Revert "Re added NICKNAME_FMT constant to router.php."
  Moved most path and server settings to a new paths admin panel
  ...

Conflicts:
	js/util.js
	locale/it_IT/LC_MESSAGES/statusnet.mo
	locale/mk_MK/LC_MESSAGES/statusnet.mo
	locale/mk_MK/LC_MESSAGES/statusnet.po
	locale/pt_BR/LC_MESSAGES/statusnet.mo
	locale/vi_VN/LC_MESSAGES/statusnet.mo
	plugins/InfiniteScroll/infinitescroll.js
	plugins/Realtime/realtimeupdate.js

1 files changed, 24 insertions, 187 deletions

diff --git a/actions/showstream.php b/actions/showstream.php
index 89285b13c..663638c18 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -33,6 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 }
 
 require_once INSTALLDIR.'/lib/personalgroupnav.php';
+require_once INSTALLDIR.'/lib/userprofile.php';
 require_once INSTALLDIR.'/lib/noticelist.php';
 require_once INSTALLDIR.'/lib/profileminilist.php';
 require_once INSTALLDIR.'/lib/groupminilist.php';
@@ -115,11 +116,11 @@ class ShowstreamAction extends ProfileAction
     {
         if (!empty($this->tag)) {
             return array(new Feed(Feed::RSS1,
-                common_local_url('userrss',
-                    array('nickname' => $this->user->nickname,
-                        'tag' => $this->tag)),
-                sprintf(_('Notice feed for %s tagged %s (RSS 1.0)'),
-                    $this->user->nickname, $this->tag)));
+                                  common_local_url('userrss',
+                                                   array('nickname' => $this->user->nickname,
+                                                         'tag' => $this->tag)),
+                                  sprintf(_('Notice feed for %s tagged %s (RSS 1.0)'),
+                                          $this->user->nickname, $this->tag)));
         }
 
         return array(new Feed(Feed::RSS1,
@@ -128,17 +129,17 @@ class ShowstreamAction extends ProfileAction
                               sprintf(_('Notice feed for %s (RSS 1.0)'),
                                       $this->user->nickname)),
                      new Feed(Feed::RSS2,
-                              common_local_url('api',
-                                               array('apiaction' => 'statuses',
-                                                     'method' => 'user_timeline',
-                                                     'argument' => $this->user->nickname.'.rss')),
+                              common_local_url('ApiTimelineUser',
+                                               array(
+                                                    'id' => $this->user->nickname,
+                                                    'format' => 'rss')),
                               sprintf(_('Notice feed for %s (RSS 2.0)'),
                                       $this->user->nickname)),
                      new Feed(Feed::ATOM,
-                              common_local_url('api',
-                                               array('apiaction' => 'statuses',
-                                                     'method' => 'user_timeline',
-                                                     'argument' => $this->user->nickname.'.atom')),
+                              common_local_url('ApiTimelineUser',
+                                               array(
+                                                    'id' => $this->user->nickname,
+                                                    'format' => 'atom')),
                               sprintf(_('Notice feed for %s (Atom)'),
                                       $this->user->nickname)),
                      new Feed(Feed::FOAF,
@@ -181,168 +182,8 @@ class ShowstreamAction extends ProfileAction
 
     function showProfile()
     {
-        $this->elementStart('div', 'entity_profile vcard author');
-        $this->element('h2', null, _('User profile'));
-
-        $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
-        $this->elementStart('dl', 'entity_depiction');
-        $this->element('dt', null, _('Photo'));
-        $this->elementStart('dd');
-        $this->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
-                                    'class' => 'photo avatar',
-                                    'width' => AVATAR_PROFILE_SIZE,
-                                    'height' => AVATAR_PROFILE_SIZE,
-                                    'alt' => $this->profile->nickname));
-        $this->elementEnd('dd');
-
-        $user = User::staticGet('id', $this->profile->id);
-        $cur = common_current_user();
-        if ($cur && $cur->id == $user->id) {
-            $this->elementStart('dd');
-            $this->element('a', array('href' => common_local_url('avatarsettings')), _('Edit Avatar'));
-            $this->elementEnd('dd');
-        }
-
-        $this->elementEnd('dl');
-
-        $this->elementStart('dl', 'entity_nickname');
-        $this->element('dt', null, _('Nickname'));
-        $this->elementStart('dd');
-        $hasFN = ($this->profile->fullname) ? 'nickname url uid' : 'fn nickname url uid';
-        $this->element('a', array('href' => $this->profile->profileurl,
-                                  'rel' => 'me', 'class' => $hasFN),
-                       $this->profile->nickname);
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
-
-        if ($this->profile->fullname) {
-            $this->elementStart('dl', 'entity_fn');
-            $this->element('dt', null, _('Full name'));
-            $this->elementStart('dd');
-            $this->element('span', 'fn', $this->profile->fullname);
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
-        }
-
-        if ($this->profile->location) {
-            $this->elementStart('dl', 'entity_location');
-            $this->element('dt', null, _('Location'));
-            $this->element('dd', 'label', $this->profile->location);
-            $this->elementEnd('dl');
-        }
-
-        if ($this->profile->homepage) {
-            $this->elementStart('dl', 'entity_url');
-            $this->element('dt', null, _('URL'));
-            $this->elementStart('dd');
-            $this->element('a', array('href' => $this->profile->homepage,
-                                      'rel' => 'me', 'class' => 'url'),
-                           $this->profile->homepage);
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
-        }
-
-        if ($this->profile->bio) {
-            $this->elementStart('dl', 'entity_note');
-            $this->element('dt', null, _('Note'));
-            $this->element('dd', 'note', $this->profile->bio);
-            $this->elementEnd('dl');
-        }
-
-        $tags = Profile_tag::getTags($this->profile->id, $this->profile->id);
-        if (count($tags) > 0) {
-            $this->elementStart('dl', 'entity_tags');
-            $this->element('dt', null, _('Tags'));
-            $this->elementStart('dd');
-            $this->elementStart('ul', 'tags xoxo');
-            foreach ($tags as $tag) {
-                $this->elementStart('li');
-                // Avoid space by using raw output.
-                $pt = '<span class="mark_hash">#</span><a rel="tag" href="' .
-                      common_local_url('peopletag', array('tag' => $tag)) .
-                      '">' . $tag . '</a>';
-                $this->raw($pt);
-                $this->elementEnd('li');
-            }
-            $this->elementEnd('ul');
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
-        }
-        $this->elementEnd('div');
-
-        $this->elementStart('div', 'entity_actions');
-        $this->element('h2', null, _('User actions'));
-        $this->elementStart('ul');
-        $cur = common_current_user();
-
-        if ($cur && $cur->id == $this->profile->id) {
-            $this->elementStart('li', 'entity_edit');
-            $this->element('a', array('href' => common_local_url('profilesettings'),
-                                      'title' => _('Edit profile settings')),
-                           _('Edit'));
-            $this->elementEnd('li');
-        }
-
-        if ($cur) {
-            if ($cur->id != $this->profile->id) {
-                $this->elementStart('li', 'entity_subscribe');
-                if ($cur->isSubscribed($this->profile)) {
-                    $usf = new UnsubscribeForm($this, $this->profile);
-                    $usf->show();
-                } else {
-                    $sf = new SubscribeForm($this, $this->profile);
-                    $sf->show();
-                }
-                $this->elementEnd('li');
-            }
-        } else {
-            $this->elementStart('li', 'entity_subscribe');
-            $this->showRemoteSubscribeLink();
-            $this->elementEnd('li');
-        }
-
-        if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) {
-            $this->elementStart('li', 'entity_send-a-message');
-            $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id)),
-                                      'title' => _('Send a direct message to this user')),
-                           _('Message'));
-            $this->elementEnd('li');
-
-            if ($user->email && $user->emailnotifynudge) {
-                $this->elementStart('li', 'entity_nudge');
-                $nf = new NudgeForm($this, $user);
-                $nf->show();
-                $this->elementEnd('li');
-            }
-        }
-
-        if ($cur && $cur->id != $this->profile->id) {
-            $blocked = $cur->hasBlocked($this->profile);
-            $this->elementStart('li', 'entity_block');
-            if ($blocked) {
-                $ubf = new UnblockForm($this, $this->profile,
-                                       array('action' => 'showstream',
-                                             'nickname' => $this->profile->nickname));
-                $ubf->show();
-            } else {
-                $bf = new BlockForm($this, $this->profile,
-                                    array('action' => 'showstream',
-                                          'nickname' => $this->profile->nickname));
-                $bf->show();
-            }
-            $this->elementEnd('li');
-        }
-        $this->elementEnd('ul');
-        $this->elementEnd('div');
-    }
-
-    function showRemoteSubscribeLink()
-    {
-        $url = common_local_url('remotesubscribe',
-                                array('nickname' => $this->profile->nickname));
-        $this->element('a', array('href' => $url,
-                                  'class' => 'entity_remote_subscribe'),
-                       _('Subscribe'));
+        $profile = new UserProfile($this, $this->user, $this->profile);
+        $profile->show();
     }
 
     function showEmptyListMessage()
@@ -358,9 +199,7 @@ class ShowstreamAction extends ProfileAction
             }
         }
         else {
-            $message .= sprintf(_('Why not [register an account](%%%%action.%s%%%%) and then nudge %s or post a notice to his or her attention.'),
-                                (!common_config('site','openidonly')) ? 'register' : 'openidlogin',
-                                $this->user->nickname);
+            $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname);
         }
 
         $this->elementStart('div', 'guide');
@@ -371,7 +210,7 @@ class ShowstreamAction extends ProfileAction
     function showNotices()
     {
         $notice = empty($this->tag)
-            ? $this->user->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1)
+          ? $this->user->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1)
             : $this->user->getTaggedNotices($this->tag, ($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1, 0, 0, null);
 
         $pnl = new ProfileNoticeList($notice, $this);
@@ -393,16 +232,14 @@ class ShowstreamAction extends ProfileAction
     {
         if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
             $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
-                 'based on the Free Software [StatusNet](http://status.net/) tool. ' .
-                 '[Join now](%%%%action.%s%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'),
-                 $this->user->nickname,
-                 (!common_config('site','openidonly')) ? 'register' : 'openidlogin',
-                 $this->user->nickname);
+                           'based on the Free Software [StatusNet](http://status.net/) tool. ' .
+                           '[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'),
+                         $this->user->nickname, $this->user->nickname);
         } else {
             $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
-                 'based on the Free Software [StatusNet](http://status.net/) tool. '),
-                 $this->user->nickname, $this->user->nickname);
-	}
+                           'based on the Free Software [StatusNet](http://status.net/) tool. '),
+                         $this->user->nickname, $this->user->nickname);
+        }
         $this->elementStart('div', array('id' => 'anon_notice'));
         $this->raw(common_markup_to_html($m));
         $this->elementEnd('div');