' . t('Facebook') . '
'; - $b .= '' . t('Facebook Post Settings') . ''; + $b .= '
'; } return $o; @@ -290,11 +321,18 @@ function fbpost_content(&$a) { */ function fbpost_plugin_settings(&$a,&$b) { + $enabled = get_pconfig(local_user(),'facebook','post'); + $css = (($enabled) ? '' : '-disabled'); + + $result = q("SELECT `installed` FROM `addon` WHERE `name` = 'fbsync' AND `installed`"); + if(count($result) > 0) + $title = t('Facebook Import/Export/Mirror'); + else + $title = t('Facebook Export/Mirror'); + $b .= '
".$match[2].""; - $text = "\n\t".$match[2].":\t"; + if (strpos($body, "[bookmark") !== false) { + // splitting the text in two parts: + // before and after the bookmark + $pos = strpos($body, "[bookmark"); + $body1 = substr($body, 0, $pos); + $body2 = substr($body, $pos); - return($text); -} + // Removing all quotes after the bookmark + // they are mostly only the content after the bookmark. + $body2 = preg_replace("/\[quote\=([^\]]*)\](.*?)\[\/quote\]/ism",'',$body2); + $body2 = preg_replace("/\[quote\](.*?)\[\/quote\]/ism",'',$body2); + + $pos2 = strpos($body2, "[/bookmark]"); + if ($pos2) + $body2 = substr($body2, $pos2 + 11); + + $body = $body1.$body2; + } + + // Add some newlines so that the message could be cut better + $body = str_replace(array("[quote", "[bookmark", "[/bookmark]", "[/quote]"), + array("\n[quote", "\n[bookmark", "[/bookmark]\n", "[/quote]\n"), $body); + + // remove the recycle signs and the names since they aren't helpful on twitter + // $recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8'); + // $body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n", $body); + + // At first convert the text to html + $html = bbcode($body, false, false, 2); + + // Then convert it to plain text + //$msg = trim($b['title']." \n\n".html2plain($html, 0, true)); + $msg = trim(html2plain($html, 0, true)); + $msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8'); + // Removing multiple newlines + while (strpos($msg, "\n\n\n") !== false) + $msg = str_replace("\n\n\n", "\n\n", $msg); + + // Removing multiple spaces + while (strpos($msg, " ") !== false) + $msg = str_replace(" ", " ", $msg); + + // Removing URLs + $msg = preg_replace('/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/i', "", $msg); + + $msg = trim($msg); + + $link = ''; + $linkname = ''; + // look for bookmark-bbcode and handle it with priority + if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches)) { + $link = $matches[1]; + $linkname = $matches[2]; + } + + $multiplelinks = (strpos($b['body'], "[bookmark") != strrpos($b['body'], "[bookmark")); + + if ($multiplelinks) + $linkname = ''; + + // If there is no bookmark element then take the first link + if ($link == '') { + $links = collecturls($html); + if (sizeof($links) > 0) { + reset($links); + $link = current($links); + } + $multiplelinks = (sizeof($links) > 1); + } + + $msglink = ""; + if ($multiplelinks) + $msglink = $b["plink"]; + else if ($link != "") + $msglink = $link; + else if ($multipleimages) + $msglink = $b["plink"]; + else if ($image != "") + $msglink = $image; + + // Removing multiple spaces - again + while (strpos($msg, " ") !== false) + $msg = str_replace(" ", " ", $msg); + + if ($msglink != "") { + // Looking if the link points to an image + $img_str = fetch_url($msglink); + + $tempfile = tempnam(get_config("system","temppath"), "cache"); + file_put_contents($tempfile, $img_str); + $mime = image_type_to_mime_type(exif_imagetype($tempfile)); + unlink($tempfile); + } else + $mime = ""; + + if (($image == $msglink) OR (substr($mime, 0, 6) == "image/")) + return(array("msg"=>trim($msg), "link"=>"", "linkname"=>$linkname, "image"=>$msglink)); + else + return(array("msg"=>trim($msg), "link"=>$msglink, "linkname"=>$linkname,"image"=>$image)); +} /** * @param App $a @@ -390,18 +529,19 @@ function fbpost_ShareAttributes($match) { */ function fbpost_post_hook(&$a,&$b) { + logger('fbpost_post_hook: Facebook post invoked', LOGGER_DEBUG); if($b['deleted'] || ($b['created'] !== $b['edited'])) return; - // Don't transmit answers (have to be cleaned up in the following code) - if($b['parent'] != $b['id']) - return; + logger('fbpost_post_hook: Facebook post first check successful', LOGGER_DEBUG); // if post comes from facebook don't send it back - if($b['app'] == "Facebook") + if(($b['app'] == "Facebook") AND ($b['verb'] != ACTIVITY_LIKE)) return; + logger('fbpost_post_hook: Facebook post accepted', LOGGER_DEBUG); + /** * Post to Facebook stream */ @@ -409,7 +549,6 @@ function fbpost_post_hook(&$a,&$b) { require_once('include/group.php'); require_once('include/html2plain.php'); - logger('Facebook post'); $reply = false; $likes = false; @@ -422,14 +561,21 @@ function fbpost_post_hook(&$a,&$b) { $linking = ((get_pconfig($b['uid'],'facebook','no_linking')) ? 0 : 1); - if((! $toplevel) && ($linking)) { + if((!$toplevel) && ($linking)) { $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($b['parent']), intval($b['uid']) ); + //$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + // dbesc($b['parent-uri']), + // intval($b['uid']) + //); + + // is it a reply to a facebook post? + // A reply to a toplevel post is only allowed for "real" facebook posts if(count($r) && substr($r[0]['uri'],0,4) === 'fb::') $reply = substr($r[0]['uri'],4); - elseif(count($r) && substr($r[0]['extid'],0,4) === 'fb::') + elseif(count($r) && (substr($r[0]['extid'],0,4) === 'fb::') AND ($r[0]['id'] != $r[0]['parent'])) $reply = substr($r[0]['extid'],4); else return; @@ -446,7 +592,7 @@ function fbpost_post_hook(&$a,&$b) { return; - logger('facebook reply id=' . $reply); + logger('fbpost_post_hook: facebook reply id=' . $reply); } if(strstr($b['postopts'],'facebook') || ($b['private']) || ($reply)) { @@ -462,7 +608,8 @@ function fbpost_post_hook(&$a,&$b) { $allow_str = dbesc(implode(', ',$recipients)); if($allow_str) { - $r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $allow_str ) AND `network` = 'face'"); + logger("fbpost_post_hook: private post to: ".$allow_str, LOGGER_DEBUG); + $r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $allow_str ) AND `network` = 'face'"); if(count($r)) foreach($r as $rr) $allow_arr[] = $rr['notify']; @@ -470,7 +617,7 @@ function fbpost_post_hook(&$a,&$b) { $deny_str = dbesc(implode(', ',$deny)); if($deny_str) { - $r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $deny_str ) AND `network` = 'face'"); + $r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $deny_str ) AND `network` = 'face'"); if(count($r)) foreach($r as $rr) $deny_arr[] = $rr['notify']; @@ -495,8 +642,10 @@ function fbpost_post_hook(&$a,&$b) { return; } - if($b['verb'] == ACTIVITY_LIKE) + if($b['verb'] == ACTIVITY_LIKE) { $likes = true; + logger('fbpost_post_hook: liking '.print_r($b, true), LOGGER_DEBUG); + } $appid = get_config('facebook', 'appid' ); @@ -504,7 +653,7 @@ function fbpost_post_hook(&$a,&$b) { if($appid && $secret) { - logger('facebook: have appid+secret'); + logger('fbpost_post_hook: have appid+secret'); $fb_token = get_pconfig($b['uid'],'facebook','access_token'); @@ -514,179 +663,46 @@ function fbpost_post_hook(&$a,&$b) { // or it's a reply or likes action to an existing facebook post if($fb_token && ($toplevel || $b['private'] || $reply)) { - logger('facebook: able to post'); + logger('fbpost_post_hook: able to post'); require_once('library/facebook.php'); require_once('include/bbcode.php'); $msg = $b['body']; - logger('Facebook post: original msg=' . $msg, LOGGER_DATA); - - // make links readable before we strip the code - - // unless it's a dislike - just send the text as a comment - - // if($b['verb'] == ACTIVITY_DISLIKE) - // $msg = trim(strip_tags(bbcode($msg))); - - // Old code - /*$search_str = $a->get_baseurl() . '/search'; - - if(preg_match("/\[url=(.*?)\](.*?)\[\/url\]/is",$msg,$matches)) { - - // don't use hashtags for message link - - if(strpos($matches[2],$search_str) === false) { - $link = $matches[1]; - if(substr($matches[2],0,5) != '[img]') - $linkname = $matches[2]; - } - } - - // strip tag links to avoid link clutter, this really should be - // configurable because we're losing information - - $msg = preg_replace("/\#\[url=(.*?)\](.*?)\[\/url\]/is",'#$2',$msg); - - // provide the link separately for normal links - $msg = preg_replace("/\[url=(.*?)\](.*?)\[\/url\]/is",'$2 $1',$msg); - - if(preg_match("/\[img\](.*?)\[\/img\]/is",$msg,$matches)) - $image = $matches[1]; - - $msg = preg_replace("/\[img\](.*?)\[\/img\]/is", t('Image: ') . '$1', $msg); + logger('fbpost_post_hook: original msg=' . $msg, LOGGER_DATA); - if((strpos($link,z_root()) !== false) && (! $image)) - $image = $a->get_baseurl() . '/images/friendica-64.jpg'; + if ($toplevel) { + $msgarr = fbpost_createmsg($b); + $msg = $msgarr["msg"]; + $link = $msgarr["link"]; + $image = $msgarr["image"]; + $linkname = $msgarr["linkname"]; - $msg = trim(strip_tags(bbcode($msg)));*/ + // Fallback - if message is empty + if(!strlen($msg)) + $msg = $linkname; - // New code + if(!strlen($msg)) + $msg = $link; - // Looking for the first image - $image = ''; - if(preg_match("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/is",$b['body'],$matches)) - $image = $matches[3]; - - if ($image == '') - if(preg_match("/\[img\](.*?)\[\/img\]/is",$b['body'],$matches)) - $image = $matches[1]; - - // When saved into the database the content is sent through htmlspecialchars - // That means that we have to decode all image-urls - $image = htmlspecialchars_decode($image); - - // Checking for a bookmark element - $body = $b['body']; - if (strpos($body, "[bookmark") !== false) { - // splitting the text in two parts: - // before and after the bookmark - $pos = strpos($body, "[bookmark"); - $body1 = substr($body, 0, $pos); - $body2 = substr($body, $pos); - - // Removing the bookmark and all quotes after the bookmark - // they are mostly only the content after the bookmark. - $body2 = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'',$body2); - $body2 = preg_replace("/\[quote\=([^\]]*)\](.*?)\[\/quote\]/ism",'',$body2); - $body2 = preg_replace("/\[quote\](.*?)\[\/quote\]/ism",'',$body2); - - $body = $body1.$body2; - } - - // Convert recycle signs - $body = str_replace("\t", " ", $body); - // recycle 1 - $recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8'); - $body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n\t$2:\t", $body); - // recycle 2 (Test) - $recycle = html_entity_decode("◌ ", ENT_QUOTES, 'UTF-8'); - $body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n\t$2:\t", $body); - - // share element - $body = preg_replace_callback("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]/ism","fbpost_ShareAttributes", $body); - - $bodyparts = explode("\t", $body); - // Doesn't help with multiple repeats - the problem has to be solved later - if (sizeof($bodyparts) == 3) { - $html = bbcode($bodyparts[2], false, false); - $test = trim(html2plain($html, 0, true)); - - if (trim($bodyparts[0]) == "") - $body = trim($bodyparts[2]); - else if (trim($test) == "") - $body = trim($bodyparts[0]); - else - $body = trim($bodyparts[0])."\n\n".trim($bodyparts[1])."[quote]".trim($bodyparts[2])."[/quote]"; - } else - $body = str_replace("\t", "", $body); - - // At first convert the text to html - $html = bbcode($body, false, false); - - // Then convert it to plain text - $msg = trim($b['title']." \n\n".html2plain($html, 0, true)); - - // Removing useless spaces - if (substr($msg, -2) == "«") - $msg = trim(substr($msg, 0, -2))."«"; - - $msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8'); - - // Removing multiple newlines - while (strpos($msg, "\n\n\n") !== false) - $msg = str_replace("\n\n\n", "\n\n", $msg); - - // add any attachments as text urls - $arr = explode(',',$b['attach']); - - if(count($arr)) { - $msg .= "\n"; - foreach($arr as $r) { - $matches = false; - $cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches); - if($cnt) { - $msg .= "\n".$matches[1]; - } - } - } - - $link = ''; - $linkname = ''; - // look for bookmark-bbcode and handle it with priority - if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches)) { - $link = $matches[1]; - $linkname = $matches[2]; - } - - // If there is no bookmark element then take the first link - if ($link == '') { - $links = collecturls($html); - if (sizeof($links) > 0) { - reset($links); - $link = current($links); - } + if(!strlen($msg)) + $msg = $image; + } else { + require_once("include/bbcode.php"); + require_once("include/html2plain.php"); + $msg = bb_CleanPictureLinks($msg); + $msg = bbcode($msg, false, false, 2, true); + $msg = trim(html2plain($msg, 0)); + $link = ""; + $image = ""; + $linkname = ""; } - // Remove trailing and leading spaces - $msg = trim($msg); - - - // Fallback - if message is empty - if(!strlen($msg)) - $msg = $linkname; - - if(!strlen($msg)) - $msg = $link; - - if(!strlen($msg)) - $msg = $image; - // If there is nothing to post then exit if(!strlen($msg)) return; - logger('Facebook post: msg=' . $msg, LOGGER_DATA); + logger('fbpost_post_hook: msg=' . $msg, LOGGER_DATA); $video = ""; @@ -694,11 +710,11 @@ function fbpost_post_hook(&$a,&$b) { $postvars = array('access_token' => $fb_token); } else { // message, picture, link, name, caption, description, source, place, tags - if(trim($link) != "") - if (@exif_imagetype($link) != 0) { - $image = $link; - $link = ""; - } + //if(trim($link) != "") + // if (@exif_imagetype($link) != 0) { + // $image = $link; + // $link = ""; + // } $postvars = array( 'access_token' => $fb_token, @@ -778,39 +794,50 @@ function fbpost_post_hook(&$a,&$b) { if (!$reply and ($target != "me") and $page_access_token) $postvars['access_token'] = $page_access_token; - logger('facebook: post to ' . $url); - logger('facebook: postvars: ' . print_r($postvars,true)); + logger('fbpost_post_hook: post to ' . $url); + logger('fbpost_post_hook: postvars: ' . print_r($postvars,true)); // "test_mode" prevents anything from actually being posted. // Otherwise, let's do it. - if(! get_config('facebook','test_mode')) { + if(!get_config('facebook','test_mode')) { $x = post_url($url, $postvars); - logger('Facebook post returns: ' . $x, LOGGER_DEBUG); + logger('fbpost_post_hook: post returns: ' . $x, LOGGER_DEBUG); $retj = json_decode($x); if($retj->id) { - q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1", + // Only set the extid when it isn't the toplevel post + q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d AND `parent` != %d", dbesc('fb::' . $retj->id), + intval($b['id']), intval($b['id']) ); - } - else { - if(! $likes) { + } else { + // Sometimes posts are accepted from facebook although it telling an error + // This leads to endless comment flooding. + + // If it is a special kind of failure the post was receiced + // Although facebook said it wasn't received ... + if (!$likes AND (($retj->error->type != "OAuthException") OR ($retj->error->code != 2)) AND ($x <> "")) { + $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", intval($b['uid'])); + if (count($r)) + $a->contact = $r[0]["id"]; + $s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $postvars)); require_once('include/queue_fn.php'); add_to_queue($a->contact,NETWORK_FACEBOOK,$s); + logger('fbpost_post_hook: Post failed, requeued.', LOGGER_DEBUG); notice( t('Facebook post failed. Queued for retry.') . EOL); } if (isset($retj->error) && $retj->error->type == "OAuthException" && $retj->error->code == 190) { - logger('Facebook session has expired due to changed password.', LOGGER_DEBUG); + logger('fbpost_post_hook: Facebook session has expired due to changed password.', LOGGER_DEBUG); $last_notification = get_pconfig($b['uid'], 'facebook', 'session_expired_mailsent'); if (!$last_notification || $last_notification < (time() - FACEBOOK_SESSION_ERR_NOTIFICATION_INTERVAL)) { require_once('include/enotify.php'); - $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($b['uid']) ); + $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($b['uid'])); notification(array( 'uid' => $b['uid'], 'type' => NOTIFY_SYSTEM, @@ -824,7 +851,7 @@ function fbpost_post_hook(&$a,&$b) { )); set_pconfig($b['uid'], 'facebook', 'session_expired_mailsent', time()); - } else logger('Facebook: No notification, as the last one was sent on ' . $last_notification, LOGGER_DEBUG); + } else logger('fbpost_post_hook: No notification, as the last one was sent on ' . $last_notification, LOGGER_DEBUG); } } } @@ -839,10 +866,10 @@ function fbpost_post_hook(&$a,&$b) { */ function fbpost_enotify(&$app, &$data) { if (x($data, 'params') && $data['params']['type'] == NOTIFY_SYSTEM && x($data['params'], 'system_type') && $data['params']['system_type'] == 'facebook_connection_invalid') { - $data['itemlink'] = '/facebook'; + $data['itemlink'] = '/fbpost'; $data['epreamble'] = $data['preamble'] = t('Your Facebook connection became invalid. Please Re-authenticate.'); $data['subject'] = t('Facebook connection became invalid'); - $data['body'] = sprintf( t("Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."), $data['params']['to_name'], "[url=" . $app->config["system"]["url"] . "]" . $app->config["sitename"] . "[/url]", "[url=" . $app->config["system"]["url"] . "/facebook]", "[/url]"); + $data['body'] = sprintf( t("Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."), $data['params']['to_name'], "[url=" . $app->config["system"]["url"] . "]" . $app->config["sitename"] . "[/url]", "[url=" . $app->config["system"]["url"] . "/fbpost]", "[/url]"); } } @@ -898,14 +925,17 @@ function fbpost_queue_hook(&$a,&$b) { if($x['network'] !== NETWORK_FACEBOOK) continue; - logger('facebook_queue: run'); + logger('fbpost_queue_hook: run'); $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid` WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1", intval($x['cid']) ); - if(! count($r)) + if(! count($r)) { + logger('fbpost_queue_hook: no user found for entry '.print_r($x, true)); + update_queue_time($x['id']); continue; + } $user = $r[0]; @@ -917,7 +947,7 @@ function fbpost_queue_hook(&$a,&$b) { $fb_token = get_pconfig($user['uid'],'facebook','access_token'); if($fb_post && $fb_token) { - logger('facebook_queue: able to post'); + logger('fbpost_queue_hook: able to post'); require_once('library/facebook.php'); $z = unserialize($x['content']); @@ -926,18 +956,32 @@ function fbpost_queue_hook(&$a,&$b) { $retj = json_decode($j); if($retj->id) { - q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1", + // Only set the extid when it isn't the toplevel post + q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d AND `parent` != %d", dbesc('fb::' . $retj->id), + intval($item), intval($item) ); - logger('facebook_queue: success: ' . $j); + logger('fbpost_queue_hook: success: ' . $j); remove_queue_item($x['id']); + } else { + logger('fbpost_queue_hook: failed: ' . $j); + + // If it is a special kind of failure the post was receiced + // Although facebook said it wasn't received ... + $ret = json_decode($j); + if (($ret->error->type != "OAuthException") OR ($ret->error->code != 2) AND ($j <> "")) + update_queue_time($x['id']); + else + logger('fbpost_queue_hook: Not requeued, since it seems to be received'); } - else { - logger('facebook_queue: failed: ' . $j); - update_queue_time($x['id']); - } + } else { + logger('fbpost_queue_hook: No fb_post or fb_token.'); + update_queue_time($x['id']); } + } else { + logger('fbpost_queue_hook: No appid or secret.'); + update_queue_time($x['id']); } } } @@ -966,7 +1010,7 @@ function fbpost_get_app_access_token() { logger('fb_get_app_access_token: returned access token: ' . $x, LOGGER_DATA); $token = str_replace('access_token=', '', $x); - if(strpos($token,'&') !== false) + if(strpos($token,'&') !== false) $token = substr($token,0,strpos($token,'&')); if ($token == "") { @@ -1011,6 +1055,8 @@ function fbpost_cron($a,$b) { } function fbpost_fetchwall($a, $uid) { + require_once("include/oembed.php"); + $access_token = get_pconfig($uid,'facebook','access_token'); $post_to_page = get_pconfig($uid,'facebook','post_to_page'); $lastcreated = get_pconfig($uid,'facebook','last_created'); @@ -1049,34 +1095,31 @@ function fbpost_fetchwall($a, $uid) { if (($post_to_page != $item->from->id) AND ((int)$post_to_page != 0)) continue; + if (!strstr($item->id, $item->from->id."_") AND isset($item->to) AND ((int)$post_to_page == 0)) + continue; + $_SESSION["authenticated"] = true; $_SESSION["uid"] = $uid; + unset($_REQUEST); $_REQUEST["type"] = "wall"; $_REQUEST["api_source"] = true; $_REQUEST["profile_uid"] = $uid; $_REQUEST["source"] = "Facebook"; - $_REQUEST["body"] = (isset($item->message) ? escape_tags($item->message) : ''); + $_REQUEST["title"] = ""; - if(isset($item->name) and isset($item->link)) - $_REQUEST["body"] .= "\n\n[bookmark=".$item->link."]".$item->name."[/bookmark]"; - elseif (isset($item->name)) - $_REQUEST["body"] .= "\n\n[b]" . $item->name."[/b]"; + $_REQUEST["body"] = (isset($item->message) ? escape_tags($item->message) : ''); - /*if(isset($item->caption)) { - if(!isset($item->name) and isset($item->link)) - $_REQUEST["body"] .= "\n\n[bookmark=".$item->link."]".$item->caption."[/bookmark]"; - //else - // $_REQUEST["body"] .= "[i]" . $item->caption."[/i]\n"; - } + $content = ""; + $type = ""; - if(!isset($item->caption) and !isset($item->name)) { - if (isset($item->link)) - $_REQUEST["body"] .= "\n[url]".$item->link."[/url]\n"; - else - $_REQUEST["body"] .= "\n"; - }*/ + if(isset($item->name) and isset($item->link)) { + $oembed_data = oembed_fetch_url($item->link); + $type = $oembed_data->type; + $content = "[bookmark=".$item->link."]".$item->name."[/bookmark]"; + } elseif (isset($item->name)) + $content .= "[b]".$item->name."[/b]"; $quote = ""; if(isset($item->description) and ($item->type != "photo")) @@ -1085,39 +1128,45 @@ function fbpost_fetchwall($a, $uid) { if(isset($item->caption) and ($item->type == "photo")) $quote = $item->caption; - //if (isset($item->properties)) - // foreach ($item->properties as $property) - // $quote .= "\n".$property->name.": [url=".$property->href."]".$property->text."[/url]"; - - if ($quote) - $_REQUEST["body"] .= "\n[quote]".$quote."[/quote]"; - // Only import the picture when the message is no video // oembed display a picture of the video as well - if ($item->type != "video") { + //if ($item->type != "video") { //if (($item->type != "video") and ($item->type != "photo")) { + if (($type == "") OR ($type == "link")) { + + $type = $item->type; + if(isset($item->picture) && isset($item->link)) - $_REQUEST["body"] .= "\n".'[url='.$item->link.'][img]'.fpost_cleanpicture($item->picture).'[/img][/url]'; + $content .= "\n".'[url='.$item->link.'][img]'.fpost_cleanpicture($item->picture).'[/img][/url]'; else { if (isset($item->picture)) - $_REQUEST["body"] .= "\n".'[img]'.fpost_cleanpicture($item->picture).'[/img]'; + $content .= "\n".'[img]'.fpost_cleanpicture($item->picture).'[/img]'; // if just a link, it may be a wall photo - check if(isset($item->link)) - $_REQUEST["body"] .= fbpost_get_photo($uid,$item->link); + $content .= fbpost_get_photo($uid,$item->link); } } - /*if (($datarray['app'] == "Events") and isset($item->actions)) - foreach ($item->actions as $action) - if ($action->name == "View") - $_REQUEST["body"] .= " [url=".$action->link."]".$item->story."[/url]"; - */ - - if(trim($_REQUEST["body"]) == '') { + if(trim($_REQUEST["body"].$content.$quote) == '') { logger('facebook: empty body '.$item->id.' '.print_r($item, true)); continue; } + if ($content) + $_REQUEST["body"] .= "\n"; + + if ($type) + $_REQUEST["body"] .= "[class=type-".$type."]"; + + if ($content) + $_REQUEST["body"] .= trim($content); + + if ($quote) + $_REQUEST["body"] .= "\n[quote]".$quote."[/quote]"; + + if ($type) + $_REQUEST["body"] .= "[/class]"; + $_REQUEST["body"] = trim($_REQUEST["body"]); if (isset($item->place)) { @@ -1171,7 +1220,7 @@ function fbpost_get_photo($uid,$link) { function fpost_cleanpicture($image) { - if (strpos($image, ".fbcdn.net/") and (substr($image, -6) == "_s.jpg")) + if ((strpos($image, ".fbcdn.net/") OR strpos($image, "/fbcdn-photos-")) and (substr($image, -6) == "_s.jpg")) $image = substr($image, 0, -6)."_n.jpg"; $queryvar = fbpost_parse_query($image);