From 7adc6027ff3c344f549bddd2c60372a2c5ea9c40 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 8 Oct 2010 11:06:30 -0700 Subject: Fix fatal error in FacebookremoveAction if we end up getting called double and the foreign_link entry has already been removed. --- plugins/Facebook/facebookremove.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'plugins/Facebook') diff --git a/plugins/Facebook/facebookremove.php b/plugins/Facebook/facebookremove.php index b048a435f..bc76daaef 100644 --- a/plugins/Facebook/facebookremove.php +++ b/plugins/Facebook/facebookremove.php @@ -48,6 +48,12 @@ class FacebookremoveAction extends FacebookAction $flink = Foreign_link::getByForeignID($this->arg('fb_sig_user'), 2); + if (!$flink) { + common_log(LOG_ERR, "Tried to delete missing foreign_link entry with Facebook ID " . $this->arg('fb_sig_user')); + $this->serverError(_m('Couldn\'t remove Facebook user: already deleted.')); + return; + } + common_debug("Removing foreign link to Facebook - local user ID: $flink->user_id, Facebook ID: $flink->foreign_id"); $result = $flink->delete(); -- cgit v1.2.3-54-g00ecf From 34e9549756102dccd9069fc6156f1c28839801e8 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 8 Oct 2010 11:26:57 -0700 Subject: execution guard fixes in Facebook plugin files --- plugins/Facebook/FBConnectAuth.php | 4 ++++ plugins/Facebook/facebookutil.php | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'plugins/Facebook') diff --git a/plugins/Facebook/FBConnectAuth.php b/plugins/Facebook/FBConnectAuth.php index f06dffaaa..d6d378626 100644 --- a/plugins/Facebook/FBConnectAuth.php +++ b/plugins/Facebook/FBConnectAuth.php @@ -27,6 +27,10 @@ * @link http://status.net/ */ +if (!defined('STATUSNET')) { + exit(1); +} + require_once INSTALLDIR . '/plugins/Facebook/FacebookPlugin.php'; class FBConnectauthAction extends Action diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index e78856f7c..fb70c51bc 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -17,6 +17,10 @@ * along with this program. If not, see . */ +if (!defined('STATUSNET')) { + exit(1); +} + require_once INSTALLDIR . '/plugins/Facebook/facebook/facebook.php'; require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php'; require_once INSTALLDIR . '/lib/noticelist.php'; -- cgit v1.2.3-54-g00ecf