Merge branch 'master' of git@gitorious.org:statusnet/mainline

[quix0rs-gnu-social.git] / plugins / Facebook / facebookutil.php

diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php
index 6f50c173ad875d4deb028f957e58f27bb3686248..ac532e18bf2682e086ab56b1134200e0cfbb8cd6 100644 (file)
--- a/plugins/Facebook/facebookutil.php
+++ b/plugins/Facebook/facebookutil.php
@@ -138,21 +138,23 @@ function facebookBroadcastNotice($notice)
 
             $code = $e->getCode();
 
-            common_log(LOG_WARNING, 'Facebook returned error code ' .
-                       $code . ': ' . $e->getMessage());
-            common_log(LOG_WARNING,
-                       'Unable to update Facebook status for ' .
-                       "$user->nickname (user id: $user->id)!");
+            $msg = "Facebook returned error code $code: " .
+              $e->getMessage() . ' - ' .
+              "Unable to update Facebook status (notice $notice->id) " .
+              "for $user->nickname (user id: $user->id)!";
 
-            if ($code == 200 || $code == 250) {
+            common_log(LOG_WARNING, $msg);
 
+            if ($code == 100 || $code == 200 || $code == 250) {
+
+                // 100 The account is 'inactive' (probably - this is not well documented)
                 // 200 The application does not have permission to operate on the passed in uid parameter.
                 // 250 Updating status requires the extended permission status_update or publish_stream.
                 // see: http://wiki.developers.facebook.com/index.php/Users.setStatus#Example_Return_XML
 
                 remove_facebook_app($flink);
 
-            } else {
+        } else {
 
                 // Try sending again later.
 
@@ -168,7 +170,7 @@ function facebookBroadcastNotice($notice)
 
 function updateProfileBox($facebook, $flink, $notice) {
     $fbaction = new FacebookAction($output = 'php://output',
-                                   $indent = true, $facebook, $flink);
+                                   $indent = null, $facebook, $flink);
     $fbaction->updateProfileBox($notice);
 }
 
@@ -277,10 +279,10 @@ function mail_facebook_app_removed($user)
     $site_name = common_config('site', 'name');
 
     $subject = sprintf(
-        _('Your %1$s Facebook application access has been disabled.',
+        _m('Your %1$s Facebook application access has been disabled.',
             $site_name));
 
-    $body = sprintf(_("Hi, %1\$s. We're sorry to inform you that we are " .
+    $body = sprintf(_m("Hi, %1\$s. We're sorry to inform you that we are " .
         'unable to update your Facebook status from %2$s, and have disabled ' .
         'the Facebook application for your account. This may be because ' .
         'you have removed the Facebook application\'s authorization, or ' .