Convert all actions to use new UI functions

I did a massive search-and-replace to get all the action subclasses to
use the new output function (common_element() -> $this->element(), etc.)

There's still a lot to do, but it's a first step

1 files changed, 78 insertions, 78 deletions

diff --git a/actions/showstream.php b/actions/showstream.php
index e4e5d96d1..9a59f7ae4 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -106,53 +106,53 @@ class ShowstreamAction extends StreamAction
     function show_header($user)
     {
         # Feeds
-        common_element('link', array('rel' => 'alternate',
+        $this->element('link', array('rel' => 'alternate',
                                      'href' => common_local_url('api',
                                                                 array('apiaction' => 'statuses',
                                                                       'method' => 'user_timeline.rss',
                                                                       'argument' => $user->nickname)),
                                      'type' => 'application/rss+xml',
                                      'title' => sprintf(_('Notice feed for %s'), $user->nickname)));
-        common_element('link', array('rel' => 'alternate feed',
+        $this->element('link', array('rel' => 'alternate feed',
                                      'href' => common_local_url('api',
                                                                 array('apiaction' => 'statuses',
                                                                       'method' => 'user_timeline.atom',
                                                                       'argument' => $user->nickname)),
                                      'type' => 'application/atom+xml',
                                      'title' => sprintf(_('Notice feed for %s'), $user->nickname)));
-        common_element('link', array('rel' => 'alternate',
+        $this->element('link', array('rel' => 'alternate',
                                      'href' => common_local_url('userrss', array('nickname' =>
                                                                                $user->nickname)),
                                      'type' => 'application/rdf+xml',
                                      'title' => sprintf(_('Notice feed for %s'), $user->nickname)));
         # FOAF
-        common_element('link', array('rel' => 'meta',
+        $this->element('link', array('rel' => 'meta',
                                      'href' => common_local_url('foaf', array('nickname' =>
                                                                               $user->nickname)),
                                      'type' => 'application/rdf+xml',
                                      'title' => 'FOAF'));
         # for remote subscriptions etc.
-        common_element('meta', array('http-equiv' => 'X-XRDS-Location',
+        $this->element('meta', array('http-equiv' => 'X-XRDS-Location',
                                      'content' => common_local_url('xrds', array('nickname' =>
                                                                                $user->nickname))));
         $profile = $user->getProfile();
         if ($profile->bio) {
-            common_element('meta', array('name' => 'description',
+            $this->element('meta', array('name' => 'description',
                                          'content' => $profile->bio));
         }
 
         if ($user->emailmicroid && $user->email && $profile->profileurl) {
-            common_element('meta', array('name' => 'microid',
+            $this->element('meta', array('name' => 'microid',
                                          'content' => "mailto+http:sha1:" . sha1(sha1('mailto:' . $user->email) . sha1($profile->profileurl))));
         }
         if ($user->jabbermicroid && $user->jabber && $profile->profileurl) {
-            common_element('meta', array('name' => 'microid',
+            $this->element('meta', array('name' => 'microid',
                                          'content' => "xmpp+http:sha1:" . sha1(sha1('xmpp:' . $user->jabber) . sha1($profile->profileurl))));
         }
 
         # See https://wiki.mozilla.org/Microsummaries
 
-        common_element('link', array('rel' => 'microsummary',
+        $this->element('link', array('rel' => 'microsummary',
                                      'href' => common_local_url('microsummary',
                                                                 array('nickname' => $profile->nickname))));
     }
@@ -165,7 +165,7 @@ class ShowstreamAction extends StreamAction
     function show_profile($profile)
     {
 
-        common_element_start('div', array('id' => 'profile', 'class' => 'vcard'));
+        $this->elementStart('div', array('id' => 'profile', 'class' => 'vcard'));
 
         $this->show_personal($profile);
 
@@ -175,23 +175,23 @@ class ShowstreamAction extends StreamAction
 
         $this->show_subscriptions($profile);
 
-        common_element_end('div');
+        $this->elementEnd('div');
     }
 
     function show_personal($profile)
     {
 
         $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-        common_element_start('div', array('id' => 'profile_avatar'));
-        common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
+        $this->elementStart('div', array('id' => 'profile_avatar'));
+        $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
                                     'class' => 'avatar profile photo',
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
                                     'alt' => $profile->nickname));
 
-        common_element_start('ul', array('id' => 'profile_actions'));
+        $this->elementStart('ul', array('id' => 'profile_actions'));
 
-        common_element_start('li', array('id' => 'profile_subscribe'));
+        $this->elementStart('li', array('id' => 'profile_subscribe'));
         $cur = common_current_user();
         if ($cur) {
             if ($cur->id != $profile->id) {
@@ -204,14 +204,14 @@ class ShowstreamAction extends StreamAction
         } else {
             $this->show_remote_subscribe_link($profile);
         }
-        common_element_end('li');
+        $this->elementEnd('li');
 
         $user = User::staticGet('id', $profile->id);
         common_profile_new_message_nudge($cur, $user, $profile);
 
         if ($cur && $cur->id != $profile->id) {
             $blocked = $cur->hasBlocked($profile);
-            common_element_start('li', array('id' => 'profile_block'));
+            $this->elementStart('li', array('id' => 'profile_block'));
             if ($blocked) {
                 common_unblock_form($profile, array('action' => 'showstream',
                                                     'nickname' => $profile->nickname));
@@ -219,62 +219,62 @@ class ShowstreamAction extends StreamAction
                 common_block_form($profile, array('action' => 'showstream',
                                                   'nickname' => $profile->nickname));
             }
-            common_element_end('li');
+            $this->elementEnd('li');
         }
 
-        common_element_end('ul');
+        $this->elementEnd('ul');
 
-        common_element_end('div');
+        $this->elementEnd('div');
 
-        common_element_start('div', array('id' => 'profile_information'));
+        $this->elementStart('div', array('id' => 'profile_information'));
 
         if ($profile->fullname) {
-            common_element('h1', array('class' => 'fn'), $profile->fullname . ' (' . $profile->nickname . ')');
+            $this->element('h1', array('class' => 'fn'), $profile->fullname . ' (' . $profile->nickname . ')');
         } else {
-            common_element('h1', array('class' => 'fn nickname'), $profile->nickname);
+            $this->element('h1', array('class' => 'fn nickname'), $profile->nickname);
         }
 
         if ($profile->location) {
-            common_element('p', 'location', $profile->location);
+            $this->element('p', 'location', $profile->location);
         }
         if ($profile->bio) {
-            common_element('p', 'description note', $profile->bio);
+            $this->element('p', 'description note', $profile->bio);
         }
         if ($profile->homepage) {
-            common_element_start('p', 'website');
-            common_element('a', array('href' => $profile->homepage,
+            $this->elementStart('p', 'website');
+            $this->element('a', array('href' => $profile->homepage,
                                       'rel' => 'me', 'class' => 'url'),
                            $profile->homepage);
-            common_element_end('p');
+            $this->elementEnd('p');
         }
 
         $this->show_statistics($profile);
 
-        common_element_end('div');
+        $this->elementEnd('div');
     }
 
     function show_remote_subscribe_link($profile)
     {
         $url = common_local_url('remotesubscribe',
                                 array('nickname' => $profile->nickname));
-        common_element('a', array('href' => $url,
+        $this->element('a', array('href' => $url,
                                   'id' => 'remotesubscribe'),
                        _('Subscribe'));
     }
 
     function show_unsubscribe_form($profile)
     {
-        common_element_start('form', array('id' => 'unsubscribe', 'method' => 'post',
+        $this->elementStart('form', array('id' => 'unsubscribe', 'method' => 'post',
                                            'action' => common_local_url('unsubscribe')));
-        common_hidden('token', common_session_token());
-        common_element('input', array('id' => 'unsubscribeto',
+        $this->hidden('token', common_session_token());
+        $this->element('input', array('id' => 'unsubscribeto',
                                       'name' => 'unsubscribeto',
                                       'type' => 'hidden',
                                       'value' => $profile->nickname));
-        common_element('input', array('type' => 'submit',
+        $this->element('input', array('type' => 'submit',
                                       'class' => 'submit',
                                       'value' => _('Unsubscribe')));
-        common_element_end('form');
+        $this->elementEnd('form');
     }
 
     function show_subscriptions($profile)
@@ -293,13 +293,13 @@ class ShowstreamAction extends StreamAction
 
         $subs_count = $subs->find();
 
-        common_element_start('div', array('id' => 'subscriptions'));
+        $this->elementStart('div', array('id' => 'subscriptions'));
 
-        common_element('h2', null, _('Subscriptions'));
+        $this->element('h2', null, _('Subscriptions'));
 
         if ($subs_count > 0) {
 
-            common_element_start('ul', array('id' => 'subscriptions_avatars'));
+            $this->elementStart('ul', array('id' => 'subscriptions_avatars'));
 
             for ($i = 0; $i < min($subs_count, SUBSCRIPTIONS); $i++) {
 
@@ -315,39 +315,39 @@ class ShowstreamAction extends StreamAction
                     continue;
                 }
 
-                common_element_start('li', 'vcard');
-                common_element_start('a', array('title' => ($other->fullname) ?
+                $this->elementStart('li', 'vcard');
+                $this->elementStart('a', array('title' => ($other->fullname) ?
                                                 $other->fullname :
                                                 $other->nickname,
                                                 'href' => $other->profileurl,
                                                 'rel' => 'contact',
                                                  'class' => 'subscription fn url'));
                 $avatar = $other->getAvatar(AVATAR_MINI_SIZE);
-                common_element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
+                $this->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
                                             'width' => AVATAR_MINI_SIZE,
                                             'height' => AVATAR_MINI_SIZE,
                                             'class' => 'avatar mini photo',
                                             'alt' =>  ($other->fullname) ?
                                             $other->fullname :
                                             $other->nickname));
-                common_element_end('a');
-                common_element_end('li');
+                $this->elementEnd('a');
+                $this->elementEnd('li');
             }
 
-            common_element_end('ul');
+            $this->elementEnd('ul');
         }
 
         if ($subs_count > SUBSCRIPTIONS) {
-            common_element_start('p', array('id' => 'subscriptions_viewall'));
+            $this->elementStart('p', array('id' => 'subscriptions_viewall'));
 
-            common_element('a', array('href' => common_local_url('subscriptions',
+            $this->element('a', array('href' => common_local_url('subscriptions',
                                                                  array('nickname' => $profile->nickname)),
                                       'class' => 'moresubscriptions'),
                            _('All subscriptions'));
-            common_element_end('p');
+            $this->elementEnd('p');
         }
 
-        common_element_end('div');
+        $this->elementEnd('div');
     }
 
     function show_statistics($profile)
@@ -366,49 +366,49 @@ class ShowstreamAction extends StreamAction
         $notices->profile_id = $profile->id;
         $notice_count = (int) $notices->count();
 
-        common_element_start('div', 'statistics');
-        common_element('h2', 'statistics', _('Statistics'));
+        $this->elementStart('div', 'statistics');
+        $this->element('h2', 'statistics', _('Statistics'));
 
         # Other stats...?
-        common_element_start('dl', 'statistics');
-        common_element('dt', 'membersince', _('Member since'));
-        common_element('dd', 'membersince', date('j M Y',
+        $this->elementStart('dl', 'statistics');
+        $this->element('dt', 'membersince', _('Member since'));
+        $this->element('dd', 'membersince', date('j M Y',
                                                  strtotime($profile->created)));
 
-        common_element_start('dt', 'subscriptions');
-        common_element('a', array('href' => common_local_url('subscriptions',
+        $this->elementStart('dt', 'subscriptions');
+        $this->element('a', array('href' => common_local_url('subscriptions',
                                                              array('nickname' => $profile->nickname))),
                        _('Subscriptions'));
-        common_element_end('dt');
-        common_element('dd', 'subscriptions', (is_int($subs_count)) ? $subs_count : '0');
-        common_element_start('dt', 'subscribers');
-        common_element('a', array('href' => common_local_url('subscribers',
+        $this->elementEnd('dt');
+        $this->element('dd', 'subscriptions', (is_int($subs_count)) ? $subs_count : '0');
+        $this->elementStart('dt', 'subscribers');
+        $this->element('a', array('href' => common_local_url('subscribers',
                                                              array('nickname' => $profile->nickname))),
                        _('Subscribers'));
-        common_element_end('dt');
-        common_element('dd', 'subscribers', (is_int($subbed_count)) ? $subbed_count : '0');
-        common_element('dt', 'notices', _('Notices'));
-        common_element('dd', 'notices', (is_int($notice_count)) ? $notice_count : '0');
+        $this->elementEnd('dt');
+        $this->element('dd', 'subscribers', (is_int($subbed_count)) ? $subbed_count : '0');
+        $this->element('dt', 'notices', _('Notices'));
+        $this->element('dd', 'notices', (is_int($notice_count)) ? $notice_count : '0');
         # XXX: link these to something
-        common_element('dt', 'tags', _('Tags'));
-        common_element_start('dd', 'tags');
+        $this->element('dt', 'tags', _('Tags'));
+        $this->elementStart('dd', 'tags');
         $tags = Profile_tag::getTags($profile->id, $profile->id);
 
-        common_element_start('ul', 'tags xoxo');
+        $this->elementStart('ul', 'tags xoxo');
         foreach ($tags as $tag) {
-            common_element_start('li');
-            common_element('a', array('rel' => 'bookmark tag',
+            $this->elementStart('li');
+            $this->element('a', array('rel' => 'bookmark tag',
                                       'href' => common_local_url('peopletag',
                                                                  array('tag' => $tag))),
                            $tag);
-            common_element_end('li');
+            $this->elementEnd('li');
         }
-        common_element_end('ul');
-        common_element_end('dd');
+        $this->elementEnd('ul');
+        $this->elementEnd('dd');
 
-        common_element_end('dl');
+        $this->elementEnd('dl');
 
-        common_element_end('div');
+        $this->elementEnd('div');
     }
 
     function show_notices($user)
@@ -428,22 +428,22 @@ class ShowstreamAction extends StreamAction
     function show_last_notice($profile)
     {
 
-        common_element('h2', null, _('Currently'));
+        $this->element('h2', null, _('Currently'));
 
         $notice = $profile->getCurrentNotice();
 
         if ($notice) {
             # FIXME: URL, image, video, audio
-            common_element_start('p', array('class' => 'notice_current'));
+            $this->elementStart('p', array('class' => 'notice_current'));
             if ($notice->rendered) {
-                common_raw($notice->rendered);
+                $this->raw($notice->rendered);
             } else {
                 # XXX: may be some uncooked notices in the DB,
                 # we cook them right now. This can probably disappear in future
                 # versions (>> 0.4.x)
-                common_raw(common_render_content($notice->content, $notice));
+                $this->raw(common_render_content($notice->content, $notice));
             }
-            common_element_end('p');
+            $this->elementEnd('p');
         }
     }
 }