trac750 Better workflow for asking user for status update permission

2 files changed, 44 insertions, 42 deletions

diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index a8f16b34a..0a364851f 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { 
+if (!defined('LACONICA')) {
     exit(1);
 }
 
@@ -32,9 +32,9 @@ class FacebookAction extends Action
     }
 
     function showLogo(){
-        
+
         global $xw;
-        
+
         common_element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
                                      'href' => getFacebookCSS()));
@@ -47,14 +47,14 @@ class FacebookAction extends Action
                                             'href' => common_local_url('public')));
         if (common_config('site', 'logo') || file_exists(theme_file('logo.png'))) {
             common_element('img', array('class' => 'logo photo',
-                'src' => (common_config('site', 'logo')) ? 
+                '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');
-    
+
     }
 
     function showHeader($selected = 'Home', $msg = null, $success = false)
@@ -76,25 +76,25 @@ class FacebookAction extends Action
 
         common_element_start('ul', array('class' => 'nav'));
 
-        common_element_start('li', array('class' => 
+        common_element_start('li', array('class' =>
             ($selected == 'Home') ? 'current' : 'facebook_home'));
-        common_element('a', 
+        common_element('a',
             array('href' => 'index.php', 'title' => _('Home')), _('Home'));
         common_element_end('li');
 
-        
-        common_element_start('li', 
+
+        common_element_start('li',
             array('class' =>
                 ($selected == 'Invite') ? 'current' : 'facebook_invite'));
-        common_element('a', 
+        common_element('a',
             array('href' => 'invite.php', 'title' => _('Invite')), _('Invite'));
         common_element_end('li');
 
-        common_element_start('li', 
+        common_element_start('li',
             array('class' =>
                 ($selected == 'Settings') ? 'current' : 'facebook_settings'));
-        common_element('a', 
-            array('href' => 'settings.php', 
+        common_element('a',
+            array('href' => 'settings.php',
                 'title' => _('Settings')), _('Settings'));
         common_element_end('li');
 
@@ -125,24 +125,24 @@ class FacebookAction extends Action
 
     function showInstructions()
     {
-        global $xw; 
-        
+        global $xw;
+
         common_element_start('dl', array('class' => 'system_notice'));
         common_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? '); 
-        
+            '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', 
+        common_element('a',
             array('href' => common_local_url('register')), _('Register'));
         common_text($loginmsg_part2);
         common_element_end('dd');
-        common_element_end('dl');        
+        common_element_end('dl');
     }
 
     function showLoginForm($msg = null)
@@ -154,14 +154,14 @@ class FacebookAction extends Action
                                      'href' => getFacebookCSS()));
 
         $this->showLogo();
-                                 
+
         common_element_start('div', array('class' => 'content'));
         common_element('h1', null, _('Login'));
-   
+
         if ($msg) {
              common_element('fb:error', array('message' => $msg));
         }
-        
+
         $this->showInstructions();
 
         common_element_start('div', array('id' => 'content_inner'));
@@ -169,19 +169,19 @@ class FacebookAction extends Action
         common_element_start('form', array('method' => 'post',
                                                'id' => 'login',
                                                'action' => 'index.php'));
-    
+
         common_element_start('fieldset');
         common_element('legend', null, _('Login to site'));
-        
+
         common_element_start('ul', array('class' => 'form_datas'));
-        common_element_start('li');                                             
+        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');
-        
+
         common_submit('submit', _('Login'));
         common_element_end('form');
 
@@ -189,7 +189,7 @@ class FacebookAction extends Action
         common_element('a', array('href' => common_local_url('recoverpassword')),
                        _('Lost or forgotten password?'));
         common_element_end('p');
-        
+
         common_element_end('div');
 
         common_end_xml();
diff --git a/lib/facebookutil.php b/lib/facebookutil.php
index 61469b3c6..74e594592 100644
--- a/lib/facebookutil.php
+++ b/lib/facebookutil.php
@@ -21,6 +21,8 @@ require_once INSTALLDIR.'/extlib/facebook/facebook.php';
 require_once INSTALLDIR.'/lib/noticelist.php';
 
 define("FACEBOOK_SERVICE", 2); // Facebook is foreign_service ID 2
+define("FACEBOOK_NOTICE_PREFIX", 1);
+define("FACEBOOK_PROMPTED_UPDATE_PREF", 2);
 
 // Gets all the notices from users with a Facebook link since a given ID
 function get_facebook_notices($since)
@@ -106,18 +108,18 @@ function update_profile_box($facebook, $fbuid, $user, $notice)
 }
 
 function getFacebookCSS()
-{    
+{
     # Add a timestamp to the CSS file so Facebook cache wont ignore our changes
     $ts = filemtime(theme_file('facebookapp.css'));
-    $cssurl = theme_path('facebookapp.css') . "?ts=$ts";   
+    $cssurl = theme_path('facebookapp.css') . "?ts=$ts";
     return $cssurl;
 }
 
 function getFacebookJS() {
-    
+
     # Add a timestamp to the FBJS file so Facebook cache wont ignore our changes
     $ts = filemtime(INSTALLDIR.'/js/facebookapp.js');
-    $jsurl = common_path('js/facebookapp.js') . "?ts=$ts";   
+    $jsurl = common_path('js/facebookapp.js') . "?ts=$ts";
     return $jsurl;
 }
 
@@ -157,7 +159,7 @@ class FacebookNoticeList extends NoticeList
 
         return $cnt;
     }
-    
+
     /**
      * returns a new list item for the current notice
      *
@@ -173,7 +175,7 @@ class FacebookNoticeList extends NoticeList
     {
         return new FacebookNoticeListItem($notice);
     }
-    
+
 }
 
 class FacebookNoticeListItem extends NoticeListItem
@@ -190,7 +192,7 @@ class FacebookNoticeListItem extends NoticeListItem
     function show()
     {
         $this->showStart();
-        
+
         common_element_start('div', 'entry-title');
         $this->showAuthor();
         $this->showContent();
@@ -201,10 +203,10 @@ class FacebookNoticeListItem extends NoticeListItem
         $this->showNoticeSource();
         $this->showReplyTo();
         common_element_end('div');
-        
+
         $this->showEnd();
     }
-    
+
     function showStart()
     {
         // XXX: RDFa
@@ -222,9 +224,9 @@ class FacebookNoticeListItem extends NoticeListItem
             preg_match('/^http/', $this->notice->uri)) {
             $noticeurl = $this->notice->uri;
         }
-        
+
         common_element_start('dl', 'timestamp');
-        common_element('dt', null, _('Published')); 
+        common_element('dt', null, _('Published'));
         common_element_start('dd', null);
         common_element_start('a', array('rel' => 'bookmark',
                                         'href' => $noticeurl));
@@ -237,5 +239,5 @@ class FacebookNoticeListItem extends NoticeListItem
         common_element_end('dl');
     }
 
-} 
+}