From 5996e2cd4c82834dace66f7bc4bd7a2ed5e4b293 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 22 May 2011 21:20:28 -0700
Subject: [PATCH] if no FB image and fb link is on our site, use Friendika logo
 for fb image. Otherwise it's going to end up being a random friend.

---
 addon/facebook/facebook.php | 3 ++-
 mod/pubsub.php              | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index 83a34c0726..9410b73dc9 100644
--- a/addon/facebook/facebook.php
+++ b/addon/facebook/facebook.php
@@ -499,7 +499,8 @@ function facebook_post_hook(&$a,&$b) {
 
 				$msg = preg_replace("/\[img\](.+?)\[\/img\]/is", t('Image: ') . '$1', $msg);
 
-
+				if((strpos($link,$a->get_baseurl()) !== false) && (! $image))
+					$image = $a->get_baseurl() . '/images/friendika-64.jpg';
 
 				$msg = trim(strip_tags(bbcode($msg)));
 				$msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
diff --git a/mod/pubsub.php b/mod/pubsub.php
index 5d8ea2ed76..f829eb4d98 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -91,6 +91,11 @@ function pubsub_post(&$a) {
 	logger('pubsub: user-agent: ' . $_SERVER['HTTP_USER_AGENT'] );
 	logger('pubsub: data: ' . $xml, LOGGER_DATA);
 
+	if(! stristr($xml,'<?xml')) {
+		logger('pubsub_post: bad xml');
+		hub_post_return();
+	}
+
 	$nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
 	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );