$_REQUEST['profile_uid'] = $uid;
$_REQUEST['source'] = $source;
+ $_REQUEST['extid'] = NETWORK_GPLUS;
// $_REQUEST['verb']
// $_REQUEST['parent']
}
function fromgplus_cleanupgoogleproxy($fullImage, $image) {
+ //$preview = "/w".$fullImage->width."-h".$fullImage->height."/";
+ //$preview2 = "/w".$fullImage->width."-h".$fullImage->height."-p/";
+ //$fullImage = str_replace(array($preview, $preview2), array("/", "/"), $fullImage->url);
+ $fullImage = $fullImage->url;
- $preview = "/w".$fullImage->width."-h".$fullImage->height."/";
- $preview2 = "/w".$fullImage->width."-h".$fullImage->height."-p/";
- $fullImage = str_replace(array($preview, $preview2), array("/", "/"), $fullImage->url);
-
- $preview = "/w".$image->width."-h".$image->height."/";
- $preview2 = "/w".$image->width."-h".$image->height."-p/";
- $image = str_replace(array($preview, $preview2), array("/", "/"), $image->url);
+ //$preview = "/w".$image->width."-h".$image->height."/";
+ //$preview2 = "/w".$image->width."-h".$image->height."-p/";
+ //$image = str_replace(array($preview, $preview2), array("/", "/"), $image->url);
+ $image = $image->url;
$cleaned = array();
$cleaned["preview"] = "";
}
- if ($cleaned["full"] == $cleaned["preview"])
+ if ($cleaned["full"] != "")
+ $infoFull = get_photo_info($cleaned["full"]);
+ else
+ $infoFull = array("0" => 0, "1" => 0);
+
+ if ($cleaned["preview"] != "")
+ $infoPreview = get_photo_info($cleaned["preview"]);
+ else
+ $infoFull = array("0" => 0, "1" => 0);
+
+ if (($infoPreview[0] >= $infoFull[0]) AND ($infoPreview[1] >= $infoFull[1])) {
+ $temp = $cleaned["full"];
+ $cleaned["full"] = $cleaned["preview"];
+ $cleaned["preview"] = $temp;
+ }
+
+ if (($cleaned["full"] == $cleaned["preview"]) OR (($infoPreview[0] == $infoFull[0]) AND ($infoPreview[1] == $infoFull[1])))
$cleaned["preview"] = "";
if ($cleaned["full"] == "")
if ($cleaned["full"] == "")
if (@exif_imagetype($image) != 0)
- $cleaned["full"] = $fullImage;
+ $cleaned["full"] = $image;
+
+ // Could be changed in the future to a link to the album
+ $cleaned["page"] = $cleaned["full"];
return($cleaned);
}
return($text);
}
-function fromgplus_handleattachments($item, $displaytext) {
+function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
+ require_once("include/Photo.php");
+ require_once("include/items.php");
+ require_once("include/network.php");
+
$post = "";
$quote = "";
- $type = "";
+ $pagedata = array();
+ $pagedata["type"] = "";
foreach ($item->object->attachments as $attachment) {
switch($attachment->objectType) {
case "video":
- $post .= "\n[class=type-video][bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n[/class]";
+ $pagedata["type"] = "video";
+ $pagedata["url"] = original_url($attachment->url);
+ $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
break;
case "article":
- $post .= "\n[class=type-link][bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
+ $pagedata["type"] = "link";
+ $pagedata["url"] = original_url($attachment->url);
+ $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
if ($images["full"] != "")
- $post .= "\n[img]".$images["full"]."[/img]";
+ $pagedata["images"][0]["src"] = $images["full"];
$quote = trim(fromgplus_html2bbcode($attachment->content));
+
if ($quote != "")
- $quote = "\n[quote]".$quote."[/quote]";
+ $pagedata["text"] = $quote;
- $quote .= "[/class]";
break;
case "photo":
- $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
- if ($images["preview"] != "")
- $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n";
- elseif ($images["full"] != "")
+ // Don't store shared pictures in your wall photos (to prevent a possible violating of licenses)
+ if ($shared)
+ $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
+ else {
+ if ($attachment->fullImage->url != "")
+ $images = store_photo($a, $uid, "", $attachment->fullImage->url);
+ elseif ($attachment->image->url != "")
+ $images = store_photo($a, $uid, "", $attachment->image->url);
+ }
+
+ if ($images["preview"] != "") {
+ $post .= "\n[url=".$images["page"]."][img]".$images["preview"]."[/img][/url]\n";
+ $pagedata["images"][0]["src"] = $images["preview"];
+ $pagedata["url"] = $images["page"];
+ } elseif ($images["full"] != "") {
$post .= "\n[img]".$images["full"]."[/img]\n";
+ $pagedata["images"][0]["src"] = $images["full"];
+
+ if ($images["preview"] != "")
+ $pagedata["images"][1]["src"] = $images["preview"];
+ }
- if (($attachment->displayName != "") AND (fromgplus_cleantext($attachment->displayName) != fromgplus_cleantext($displaytext)))
+ if (($attachment->displayName != "") AND (fromgplus_cleantext($attachment->displayName) != fromgplus_cleantext($displaytext))) {
$post .= fromgplus_html2bbcode($attachment->displayName)."\n";
+ $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
+ }
break;
case "photo-album":
- $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
+ $pagedata["url"] = original_url($attachment->url);
+ $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
+ $post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n";
$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
- if ($images["preview"] != "")
+
+ if ($images["preview"] != "") {
$post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n";
- elseif ($images["full"] != "")
+ $pagedata["images"][0]["src"] = $images["preview"];
+ $pagedata["url"] = $images["full"];
+ } elseif ($images["full"] != "") {
$post .= "\n[img]".$images["full"]."[/img]\n";
+ $pagedata["images"][0]["src"] = $images["full"];
+ if ($images["preview"] != "")
+ $pagedata["images"][1]["src"] = $images["preview"];
+ }
break;
case "album":
- $post .= "\n[class=type-link][bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]";
+ $pagedata["type"] = "link";
+ $pagedata["url"] = original_url($attachment->url);
+ $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
$thumb = $attachment->thumbnails[0];
- $post .= "\n[img]".$thumb->image->url."[/img]";
+ $pagedata["images"][0]["src"] = $thumb->image->url;
$quote = trim(fromgplus_html2bbcode($thumb->description));
if ($quote != "")
- $quote = "\n[quote]".$quote."[/quote]";
-
- //foreach($attachment->thumbnails as $thumb) {
- // $preview = "/w".$thumb->image->width."-h".$thumb->image->height."/";
- // $preview2 = "/w".$thumb->image->width."-h".$thumb->image->height."-p/";
- // $image = str_replace(array($preview, $preview2), array("/", "/"), $thumb->image->url);
+ $pagedata["text"] = $quote;
- // $post .= "\n[url=".$thumb->url."][img]".$image."[/img][/url]\n";
- //}
- $quote .= "[/class]";
break;
+
case "audio":
- $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
+ $pagedata["url"] = original_url($attachment->url);
+ $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
+ $post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n";
break;
+
//default:
// die($attachment->objectType);
}
}
+
+ if ($pagedata["type"] != "")
+ return(add_page_info_data($pagedata));
+
return($post.$quote);
}
$reversed = array_reverse($activities->items);
foreach($reversed as $item) {
+
if (strtotime($item->published) <= $initiallastdate)
continue;
+ // Don't publish items that are too young
+ if (strtotime($item->published) > (time() - 3*60)) {
+ logger('fromgplus_fetch: item too new '.$item->published);
+ continue;
+ }
+
if ($lastdate < strtotime($item->published))
$lastdate = strtotime($item->published);
if ($first_time)
continue;
- if ($item->access->description == "Public")
-
- // Loop prevention - ignore postings from HootSuite
- if ($item->provider->title == "HootSuite")
- continue;
+ if ($item->access->description == "Public") {
// Loop prevention through the special blank from the googleplus connector
- if (strstr($item->object->content, $blank))
+ //if (strstr($item->object->content, $blank))
+ if (strrpos($item->object->content, $blank) >= strlen($item->object->content) - 5)
continue;
switch($item->object->objectType) {
$post = fromgplus_html2bbcode($item->object->content);
if (is_array($item->object->attachments))
- $post .= fromgplus_handleattachments($item, $item->object->content);
+ $post .= fromgplus_handleattachments($a, $uid, $item, $item->object->content, false);
// geocode, placeName
if (isset($item->address))
else
$location = "";
- fromgplus_post($a, $uid, "Google+", $post, $location);
- //fromgplus_post($a, $uid, $item->provider->title, $post, $location);
+ //fromgplus_post($a, $uid, "Google+", $post, $location);
+ fromgplus_post($a, $uid, $item->provider->title, $post, $location);
break;
$post .= fromgplus_html2bbcode($item->object->content);
if (is_array($item->object->attachments))
- $post .= "\n".trim(fromgplus_handleattachments($item, $item->object->content));
+ $post .= "\n".trim(fromgplus_handleattachments($a, $uid, $item, $item->object->content, true));
$post .= "[/share]";
} else {
$post .= fromgplus_html2bbcode($item->object->content);
if (is_array($item->object->attachments))
- $post .= "\n".trim(fromgplus_handleattachments($item, $item->object->content));
+ $post .= "\n".trim(fromgplus_handleattachments($a, $uid, $item, $item->object->content, true));
}
if (isset($item->address))
else
$location = "";
- fromgplus_post($a, $uid, "Google+", $post, $location);
- //fromgplus_post($a, $uid, $item->provider->title, $post, $location);
+ //fromgplus_post($a, $uid, "Google+", $post, $location);
+ fromgplus_post($a, $uid, $item->provider->title, $post, $location);
break;
}
+ }
}
if ($lastdate != 0)
set_pconfig($uid,'fromgplus','lastdate', $lastdate);
}
-
-/*
-// Test
-require_once("boot.php");
-
-if(@is_null($a)) {
- $a = new App;
-}
-
-if(@is_null($db)) {
- @include(".htconfig.php");
- require_once("include/dba.php");
- $db = new dba($db_host, $db_user, $db_pass, $db_data);
- unset($db_host, $db_user, $db_pass, $db_data);
-};
-
-$test = array();
-fromgplus_cron($a, $test);
-*/
projects / friendica-addons.git / blobdiff