diff options
| author | Friendika <info@friendika.com> | 2011-05-22 21:20:28 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-05-22 21:20:28 -0700 |
| commit | 5996e2cd4c82834dace66f7bc4bd7a2ed5e4b293 (patch) | |
| tree | 4ca8ee47e74231a1fc71184f517f0c6d5060e036 | |
| parent | 576f8eda085b3996ebb4aec62d8f6c866c390836 (diff) | |
| download | volse-hubzilla-5996e2cd4c82834dace66f7bc4bd7a2ed5e4b293.tar.gz volse-hubzilla-5996e2cd4c82834dace66f7bc4bd7a2ed5e4b293.tar.bz2 volse-hubzilla-5996e2cd4c82834dace66f7bc4bd7a2ed5e4b293.zip | |
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.
| -rw-r--r-- | addon/facebook/facebook.php | 3 | ||||
| -rw-r--r-- | mod/pubsub.php | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php index 83a34c072..9410b73dc 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 5d8ea2ed7..f829eb4d9 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 ); |