From 8c5ee7e062451dcf4262616456979c67a1bba52f Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 19 Oct 2014 00:26:06 +0200 Subject: [PATCH] Removed some stuff from another branch --- fbpost/fbpost.php | 21 ++------------------- fbsync/fbsync.php | 4 ---- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/fbpost/fbpost.php b/fbpost/fbpost.php index 38fe1920..2ac558ea 100644 --- a/fbpost/fbpost.php +++ b/fbpost/fbpost.php @@ -967,21 +967,8 @@ function fbpost_cron($a,$b) { set_config('facebook','last_poll', time()); } -function fbpost_cleanpicture($url) { - require_once("include/Photo.php"); - - $urldata = parse_url($url); - if (isset($urldata["query"])) { - parse_str($urldata["query"], $querydata); - if (isset($querydata["url"]) AND (get_photo_info($querydata["url"]))) - return($querydata["url"]); - } - return($url); -} - function fbpost_fetchwall($a, $uid) { require_once("include/oembed.php"); - require_once("include/network.php"); require_once('mod/item.php'); $access_token = get_pconfig($uid,'facebook','access_token'); @@ -1042,7 +1029,6 @@ function fbpost_fetchwall($a, $uid) { $type = ""; if(isset($item->name) and isset($item->link)) { - $item->link = original_url($item->link); $oembed_data = oembed_fetch_url($item->link); $type = $oembed_data->type; $content = "[bookmark=".$item->link."]".$item->name."[/bookmark]"; @@ -1085,12 +1071,9 @@ function fbpost_fetchwall($a, $uid) { } } - $picture = fbpost_cleanpicture($picture); - - if(($picture != "") && isset($item->link)) { - $item->link = original_url($item->link); + if(($picture != "") && isset($item->link)) $content .= "\n".'[url='.$item->link.'][img]'.$picture.'[/img][/url]'; - } else { + else { if ($picture != "") $content .= "\n".'[img]'.$picture.'[/img]'; // if just a link, it may be a wall photo - check diff --git a/fbsync/fbsync.php b/fbsync/fbsync.php index 64f6fe2a..51d2747f 100644 --- a/fbsync/fbsync.php +++ b/fbsync/fbsync.php @@ -216,7 +216,6 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr $access_token = get_pconfig($uid,'facebook','access_token'); require_once("include/oembed.php"); - require_once("include/network.php"); // check if it was already imported $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1", @@ -340,7 +339,6 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr $type = ""; if (isset($post->attachment->name) and isset($post->attachment->href)) { - $post->attachment->href = original_url($post->attachment->href); $oembed_data = oembed_fetch_url($post->attachment->href); $type = $oembed_data->type; if ($type == "rich") @@ -393,8 +391,6 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr } } - $preview = fbpost_cleanpicture($preview); - if (isset($media->href) AND ($preview != "") AND ($media->href != "")) $content .= "\n".'[url='.$media->href.'][img]'.$preview.'[/img][/url]'; else {