Update facebook stuff to use new methods

change facebook stuff to use new methods for XML and HTML.

3 files changed, 123 insertions, 127 deletions

diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index ae29ee1f8..14342f944 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -184,7 +184,7 @@ class FacebookhomeAction extends FacebookAction
 
         $this->showLogo();
 
-        common_element_start('div', array('class' => 'content'));
+        $this->elementStart('div', array('class' => 'content'));
 
         // Figure what the URL of our app is.
         $app_props = $facebook->api_client->Admin_getAppProperties(
@@ -196,30 +196,30 @@ class FacebookhomeAction extends FacebookAction
             'your Facebook status with your latest notice, you need ' .
             'to give it permission.'), $app_name);
 
-        common_element_start('p');
-        common_element('span', array('id' => 'permissions_notice'), $instructions);
-        common_element_end('p');
+        $this->elementStart('p');
+        $this->element('span', array('id' => 'permissions_notice'), $instructions);
+        $this->elementEnd('p');
 
-        common_element_start('form', array('method' => 'post',
+        $this->elementStart('form', array('method' => 'post',
                                            'action' => $app_url,
                                            'id' => 'facebook-skip-permissions'));
 
-        common_element_start('ul', array('id' => 'fb-permissions-list'));
-        common_element_start('li', array('id' => 'fb-permissions-item'));
-        common_element_start('fb:prompt-permission', array('perms' => 'status_update',
+        $this->elementStart('ul', array('id' => 'fb-permissions-list'));
+        $this->elementStart('li', array('id' => 'fb-permissions-item'));
+        $this->elementStart('fb:prompt-permission', array('perms' => 'status_update',
             'next_fbjs' => 'document.setLocation(\'' . $app_url . '\')'));
-        common_element('span', array('class' => 'facebook-button'),
+        $this->element('span', array('class' => 'facebook-button'),
             _('Allow Identi.ca to update my Facebook status'));
-        common_element_end('fb:prompt-permission');
-        common_element_end('li');
+        $this->elementEnd('fb:prompt-permission');
+        $this->elementEnd('li');
 
-        common_element_start('li', array('id' => 'fb-permissions-item'));
+        $this->elementStart('li', array('id' => 'fb-permissions-item'));
         common_submit('skip', _('Skip'));
-        common_element_end('li');
-        common_element_end('ul');
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
 
-        common_element_end('form');
-        common_element_end('div');
+        $this->elementEnd('form');
+        $this->elementEnd('div');
 
         common_end_xml();
 
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index bc034bc46..d4f03e58c 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -104,19 +104,19 @@ class FacebooksettingsAction extends FacebookAction
                 'your Facebook status with your latest notice, you need ' .
                 'to give it permission.'), $app_name);
 
-            common_element_start('p');
-            common_element('span', array('id' => 'permissions_notice'), $instructions);
-            common_element_end('p');
+            $this->elementStart('p');
+            $this->element('span', array('id' => 'permissions_notice'), $instructions);
+            $this->elementEnd('p');
 
-            common_element_start('ul', array('id' => 'fb-permissions-list'));
-            common_element_start('li', array('id' => 'fb-permissions-item'));
-            common_element_start('fb:prompt-permission', array('perms' => 'status_update',
+            $this->elementStart('ul', array('id' => 'fb-permissions-list'));
+            $this->elementStart('li', array('id' => 'fb-permissions-item'));
+            $this->elementStart('fb:prompt-permission', array('perms' => 'status_update',
                 'next_fbjs' => 'document.setLocation(\'' . $app_url . '\')'));
-            common_element('span', array('class' => 'facebook-button'),
+            $this->element('span', array('class' => 'facebook-button'),
                 _('Allow Identi.ca to update my Facebook status'));
-            common_element_end('fb:prompt-permission');
-            common_element_end('li');
-            common_element_end('ul');
+            $this->elementEnd('fb:prompt-permission');
+            $this->elementEnd('li');
+            $this->elementEnd('ul');
         }
 
         $this->showFooter();
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index cd43a2ccb..6d42596e8 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -38,132 +38,129 @@ class FacebookAction extends Action
         $this->showStylesheets();
         $this->showScripts();
 
-        common_element_start('a', array('class' => 'url home bookmark',
+        $this->elementStart('a', array('class' => 'url home bookmark',
                                             'href' => common_local_url('public')));
         if (common_config('site', 'logo') || file_exists(theme_file('logo.png'))) {
-            common_element('img', array('class' => 'logo photo',
+            $this->element('img', array('class' => 'logo photo',
                 'src' => (common_config('site', 'logo')) ?
                     common_config('site', 'logo') : theme_path('logo.png'),
                 'alt' => common_config('site', 'name')));
         }
 
-        common_element('span', array('class' => 'fn org'), common_config('site', 'name'));
-        common_element_end('a');
+        $this->element('span', array('class' => 'fn org'), common_config('site', 'name'));
+        $this->elementEnd('a');
 
     }
 
-
-    function showHeader($msg = null, $success = false) 
+    function showHeader($msg = null, $success = false)
     {
         startFBML();
 
-        common_element_start('fb:if-section-not-added', array('section' => 'profile'));
-        common_element_start('span', array('id' => 'add_to_profile'));
-        common_element('fb:add-section-button', array('section' => 'profile'));
-        common_element_end('span');
-        common_element_end('fb:if-section-not-added');
-        
+        $this->elementStart('fb:if-section-not-added', array('section' => 'profile'));
+        $this->elementStart('span', array('id' => 'add_to_profile'));
+        $this->element('fb:add-section-button', array('section' => 'profile'));
+        $this->elementEnd('span');
+        $this->elementEnd('fb:if-section-not-added');
+
         $this->showLogo();
 
         if ($msg) {
             if ($success) {
-                common_element('fb:success', array('message' => $msg));
+                $this->element('fb:success', array('message' => $msg));
             } else {
                 // XXX do an error message here
             }
         }
 
-        common_element_start('div', 'main_body');        
-        
+        $this->elementStart('div', 'main_body');
+
     }
 
     function showNav($selected = 'Home')
     {
 
-        common_element_start('dl', array("id" => 'site_nav_local_views'));
-        common_element('dt', null, _('Local Views'));
-        common_element_start('dd');
+        $this->elementStart('dl', array("id" => 'site_nav_local_views'));
+        $this->element('dt', null, _('Local Views'));
+        $this->elementStart('dd');
 
-        common_element_start('ul', array('class' => 'nav'));
+        $this->elementStart('ul', array('class' => 'nav'));
 
-        common_element_start('li', array('class' =>
+        $this->elementStart('li', array('class' =>
             ($selected == 'Home') ? 'current' : 'facebook_home'));
-        common_element('a',
+        $this->element('a',
             array('href' => 'index.php', 'title' => _('Home')), _('Home'));
-        common_element_end('li');
+        $this->elementEnd('li');
 
-        common_element_start('li',
+        $this->elementStart('li',
             array('class' =>
                 ($selected == 'Invite') ? 'current' : 'facebook_invite'));
-        common_element('a',
+        $this->element('a',
             array('href' => 'invite.php', 'title' => _('Invite')), _('Invite'));
-        common_element_end('li');
+        $this->elementEnd('li');
 
-        common_element_start('li',
+        $this->elementStart('li',
             array('class' =>
                 ($selected == 'Settings') ? 'current' : 'facebook_settings'));
-        common_element('a',
+        $this->element('a',
             array('href' => 'settings.php',
                 'title' => _('Settings')), _('Settings'));
-        common_element_end('li');
+        $this->elementEnd('li');
 
-        common_element_end('ul');
+        $this->elementEnd('ul');
 
-        common_element_end('dd');
-        common_element_end('dl');
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
 
     }
 
     function showFooter()
     {
-        common_element_end('div');
-        common_end_xml();
+        $this->elementEnd('div');
+        $this->endXml();
     }
 
-
     function showInstructions()
     {
         global $xw;
 
-        common_element_start('dl', array('class' => 'system_notice'));
-        common_element('dt', null, 'Page Notice');
+        $this->elementStart('dl', array('class' => 'system_notice'));
+        $this->element('dt', null, 'Page Notice');
 
         $loginmsg_part1 = _('To use the %s Facebook Application you need to login ' .
             'with your username and password. Don\'t have a username yet? ');
 
         $loginmsg_part2 = _(' a new account.');
 
-        common_element_start('dd');
-        common_element_start('p');
-        common_text(sprintf($loginmsg_part1, common_config('site', 'name')));
-        common_element('a',
+        $this->elementStart('dd');
+        $this->elementStart('p');
+        $this->text(sprintf($loginmsg_part1, common_config('site', 'name')));
+        $this->element('a',
             array('href' => common_local_url('register')), _('Register'));
-        common_text($loginmsg_part2);
-        common_element_end('dd');
-        common_element_end('dl');
+        $this->text($loginmsg_part2);
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
     }
 
-
-    function showStylesheets() 
+    function showStylesheets()
     {
         global $xw;
-        
-        common_element('link', array('rel' => 'stylesheet',
+
+        $this->element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
                                      'href' => getFacebookBaseCSS()));
 
-        common_element('link', array('rel' => 'stylesheet',
+        $this->element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
                                      'href' => getFacebookThemeCSS()));
     }
-    
-    function showScripts() 
+
+    function showScripts()
     {
         global $xw;
-        
-        common_element('script', array('type' => 'text/javascript',
+
+        $this->element('script', array('type' => 'text/javascript',
                                        'src' => getFacebookJS()));
-        
+
     }
 
     function showLoginForm($msg = null)
@@ -175,96 +172,95 @@ class FacebookAction extends Action
 
         $this->showLogo();
 
-        common_element_start('div', array('class' => 'content'));
-        common_element('h1', null, _('Login'));
+        $this->elementStart('div', array('class' => 'content'));
+        $this->element('h1', null, _('Login'));
 
         if ($msg) {
-             common_element('fb:error', array('message' => $msg));
+             $this->element('fb:error', array('message' => $msg));
         }
 
         $this->showInstructions();
 
-        common_element_start('div', array('id' => 'content_inner'));
+        $this->elementStart('div', array('id' => 'content_inner'));
 
-        common_element_start('form', array('method' => 'post',
+        $this->elementStart('form', array('method' => 'post',
                                                'class' => 'form_settings',
                                                'id' => 'login',
                                                'action' => 'index.php'));
 
-        common_element_start('fieldset');
-        common_element('legend', null, _('Login to site'));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Login to site'));
 
-        common_element_start('ul', array('class' => 'form_datas'));
-        common_element_start('li');
-        common_input('nickname', _('Nickname'));
-        common_element_end('li');
-        common_element_start('li');
-        common_password('password', _('Password'));
-        common_element_end('li');
-        common_element_end('ul');
+        $this->elementStart('ul', array('class' => 'form_datas'));
+        $this->elementStart('li');
+        $this->input('nickname', _('Nickname'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
+        $this->password('password', _('Password'));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
 
-        common_submit('submit', _('Login'));
-        common_element_end('form');
+        $this->submit('submit', _('Login'));
+        $this->elementEnd('form');
 
-        common_element_start('p');
-        common_element('a', array('href' => common_local_url('recoverpassword')),
+        $this->elementStart('p');
+        $this->element('a', array('href' => common_local_url('recoverpassword')),
                        _('Lost or forgotten password?'));
-        common_element_end('p');
+        $this->elementEnd('p');
 
-        common_element_end('div');
+        $this->elementEnd('div');
 
-        common_end_xml();
+        $this->endXml();
 
     }
 
-
-    function showNoticeForm($user) 
+    function showNoticeForm($user)
     {
-    
+
         global $xw;
 
-        common_element_start('form', array('id' => 'form_notice',
+        $this->elementStart('form', array('id' => 'form_notice',
                                            'method' => 'post',
                                            'action' => 'index.php'));
 
-        common_element_start('fieldset');
-        common_element('legend', null, 'Send a notice');
+        $this->elementStart('fieldset');
+        $this->element('legend', null, 'Send a notice');
 
-        common_element_start('ul', 'form_datas');
-        common_element_start('li', array('id' => 'noticcommon_elemente_text'));
-        common_element('label', array('for' => 'notice_data-text'),
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li', array('id' => 'noticcommon_elemente_text'));
+        $this->element('label', array('for' => 'notice_data-text'),
                             sprintf(_('What\'s up, %s?'), $user->nickname));
 
-        common_element('textarea', array('id' => 'notice_data-text',
+        $this->element('textarea', array('id' => 'notice_data-text',
                                               'cols' => 35,
                                               'rows' => 4,
                                               'name' => 'status_textarea'));
-        common_element_end('li');
-        common_element_end('ul');
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
 
-        common_element_start('dl', 'form_note');
-        common_element('dt', null, _('Available characters'));
-        common_element('dd', array('id' => 'notice_text-count'),
+        $this->elementStart('dl', 'form_note');
+        $this->element('dt', null, _('Available characters'));
+        $this->element('dd', array('id' => 'notice_text-count'),
                             '140');
-        common_element_end('dl');
+        $this->elementEnd('dl');
+
+        $this->elementStart('ul', array('class' => 'form_actions'));
+
+        $this->elementStart('li', array('id' => 'notice_submit'));
 
-        common_element_start('ul', array('class' => 'form_actions'));
+        $this->submit('submit', _('Send'));
 
-        common_element_start('li', array('id' => 'notice_submit'));
-        
-        common_submit('submit', _('Send'));
-        
         /*
-        common_element('input', array('id' => 'notice_action-submit',
+        $this->element('input', array('id' => 'notice_action-submit',
                                            'class' => 'submit',
                                            'name' => 'status_submit',
                                            'type' => 'submit',
                                            'value' => _('Send')));
         */
-        common_element_end('li');
-        common_element_end('ul');    
-        common_element_end('fieldset');    
-        common_element_end('form');
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+        $this->elementEnd('fieldset');
+        $this->elementEnd('form');
     }
 
 }