Merge branch 'master' of /var/www/trunk

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

diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index 372c40c28c7aa0c6a791e784c4443c894b49763c..bc034bc46d7a3e538fa60efd9b544e9e09f2a88d 100644 (file)
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -50,12 +50,13 @@ class FacebooksettingsAction extends FacebookAction
         $flink->set_flags($noticesync, $replysync, false);
         $result = $flink->update($original);
 
-        $facebook->api_client->data_setUserPreference(1, substr($prefix, 0, 128));
+        $facebook->api_client->data_setUserPreference(FACEBOOK_NOTICE_PREFIX,
+            substr($prefix, 0, 128));
 
         if ($result) {
-            $this->show_form('Sync preferences saved.', true);
+            $this->showForm('Sync preferences saved.', true);
         } else {
-            $this->show_form('There was a problem saving your sync preferences!');
+            $this->showForm('There was a problem saving your sync preferences!');
         }
     }
 
@@ -66,43 +67,56 @@ class FacebooksettingsAction extends FacebookAction
 
         $flink = Foreign_link::getByForeignID($fbuid, FACEBOOK_SERVICE);
 
-        $this->showHeader('Settings', $msg, $success);
-
-        common_element('form', array('id' => 'redirect_form',
-                                     'style' => 'display: none;'));        
-                
-        common_element_start('p');
-        common_element_start('fb:prompt-permission', array('perms' => 'status_update',
-            'next_fbjs' => 'redirectSettings()'));
-        common_element('h2', null, _('Allow Identi.ca to update my Facebook status'));
-        common_element_end('fb:prompt-permission');
-        common_element_end('p');
-
-
+        $this->showHeader($msg, $success);
+        $this->showNav('Settings');
 
         if ($facebook->api_client->users_hasAppPermission('status_update')) {
 
-            common_element_start('form', array('method' => 'post',
+            $this->elementStart('form', array('method' => 'post',
                                                'id' => 'facebook_settings'));
 
-            common_element('h2', null, _('Sync preferences'));
+            $this->element('h2', null, _('Sync preferences'));
 
-            common_checkbox('noticesync', _('Automatically update my Facebook status with my notices.'),
+            $this->checkbox('noticesync', _('Automatically update my Facebook status with my notices.'),
                                 ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND) : true);
 
-            common_checkbox('replysync', _('Send local "@" replies to Facebook.'),
+            $this->checkbox('replysync', _('Send "@" replies to Facebook.'),
                              ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) : true);
 
             $prefix = $facebook->api_client->data_getUserPreference(1);
-            
 
-            common_input('prefix', _('Prefix'),
+            $this->input('prefix', _('Prefix'),
                          ($prefix) ? $prefix : null,
                          _('A string to prefix notices with.'));
-            common_submit('save', _('Save'));
+            $this->submit('save', _('Save'));
 
-            common_element_end('form');
+            $this->elementEnd('form');
+
+        } else {
 
+            // Figure what the URL of our app is.
+            $app_props = $facebook->api_client->Admin_getAppProperties(
+                    array('canvas_name', 'application_name'));
+            $app_url = 'http://apps.facebook.com/' . $app_props['canvas_name'] . '/settings.php';
+            $app_name = $app_props['application_name'];
+
+            $instructions = sprintf(_('If you would like the %s app to automatically update ' .
+                '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');
+
+            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',
+                'next_fbjs' => 'document.setLocation(\'' . $app_url . '\')'));
+            common_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->showFooter();