';
+ $s .= '
';
+ $s .= '
'. L10n::t('Google+ Mirror').'
';
+ $s .= '';
- $s .= '
';
- $s .= '
' . t('Google+ Import Settings').'
';
$s .= '
';
- $s .= '
';
+ $s .= '
';
$s .= '
';
$s .= '
';
- $s .= '
';
+ $s .= '
';
$s .= '
';
$s .= '
';
+ $s .= '
';
+ $s .= '
';
+ $s .= '
';
- $s .= '
';
+ $s .= '
';
$s .= '
';
return;
@@ -53,17 +85,40 @@ function fromgplus_addon_settings_post(&$a,&$b) {
return;
if($_POST['fromgplus-submit']) {
- set_pconfig(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
+ PConfig::set(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
$enable = ((x($_POST,'fromgplus-enable')) ? intval($_POST['fromgplus-enable']) : 0);
- set_pconfig(local_user(),'fromgplus','enable', $enable);
- info( t('Google+ Import Settings saved.') . EOL);
+ PConfig::set(local_user(),'fromgplus','enable', $enable);
+ $keywords = ((x($_POST, 'fromgplus-keywords')) ? intval($_POST['fromgplus-keywords']) : 0);
+ PConfig::set(local_user(),'fromgplus', 'keywords', $keywords);
+
+ if (!$enable)
+ PConfig::delete(local_user(),'fromgplus','lastdate');
+
+ info(L10n::t('Google+ Import Settings saved.') . EOL);
}
}
+function fromgplus_addon_admin(&$a, &$o)
+{
+ $t = get_markup_template("admin.tpl", "addon/fromgplus/");
+
+ $o = replace_macros($t, [
+ '$submit' => L10n::t('Save Settings'),
+ '$key' => ['key', L10n::t('Key'), trim(Config::get('fromgplus', 'key')), ''],
+ ]);
+}
+
+function fromgplus_addon_admin_post(&$a)
+{
+ $key = ((x($_POST, 'key')) ? trim($_POST['key']) : '');
+ Config::set('fromgplus', 'key', $key);
+ info(L10n::t('Settings updated.'). EOL);
+}
+
function fromgplus_cron($a,$b) {
- $last = get_config('fromgplus','last_poll');
+ $last = Config::get('fromgplus','last_poll');
- $poll_interval = intval(get_config('fromgplus','poll_interval'));
+ $poll_interval = intval(Config::get('fromgplus','poll_interval'));
if(! $poll_interval)
$poll_interval = FROMGPLUS_DEFAULT_POLL_INTERVAL;
@@ -80,7 +135,7 @@ function fromgplus_cron($a,$b) {
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'fromgplus' AND `k` = 'enable' AND `v` = '1' ORDER BY RAND() ");
if(count($r)) {
foreach($r as $rr) {
- $account = get_pconfig($rr['uid'],'fromgplus','account');
+ $account = PConfig::get($rr['uid'],'fromgplus','account');
if ($account) {
logger('fromgplus: fetching for user '.$rr['uid']);
fromgplus_fetch($a, $rr['uid']);
@@ -90,13 +145,17 @@ function fromgplus_cron($a,$b) {
logger('fromgplus: cron_end');
- set_config('fromgplus','last_poll', time());
+ Config::set('fromgplus','last_poll', time());
}
-function fromgplus_post($a, $uid, $source, $body, $location) {
+function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) {
//$uid = 2;
+ // Don't know what it is. Maybe some trash from the mobile client
+ $trash = html_entity_decode("", ENT_QUOTES, 'UTF-8');
+ $body = str_replace($trash, "", $body);
+
$body = trim($body);
if (substr($body, 0, 3) == "[b]") {
@@ -110,11 +169,15 @@ function fromgplus_post($a, $uid, $source, $body, $location) {
$_SESSION['uid'] = $uid;
unset($_REQUEST);
- $_REQUEST['type'] = 'wall';
$_REQUEST['api_source'] = true;
$_REQUEST['profile_uid'] = $uid;
$_REQUEST['source'] = $source;
+ $_REQUEST['extid'] = NETWORK_GPLUS;
+
+ if (isset($id)) {
+ $_REQUEST['message_id'] = Item::newURI($uid, NETWORK_GPLUS.':'.$id);
+ }
// $_REQUEST['verb']
// $_REQUEST['parent']
@@ -123,8 +186,9 @@ function fromgplus_post($a, $uid, $source, $body, $location) {
$_REQUEST['title'] = $title;
$_REQUEST['body'] = $body;
$_REQUEST['location'] = $location;
+ $_REQUEST['coord'] = $coord;
- if (($_REQUEST['title'] == "") AND ($_REQUEST['body'] == "")) {
+ if (($_REQUEST['title'] == "") && ($_REQUEST['body'] == "")) {
logger('fromgplus: empty post for user '.$uid." ".print_r($_REQUEST, true));
return;
}
@@ -140,13 +204,13 @@ function fromgplus_html2bbcode($html) {
$bbcode = html_entity_decode($html, ENT_QUOTES, 'UTF-8');
- $bbcode = str_ireplace(array("\n"), array(""), $bbcode);
- $bbcode = str_ireplace(array("
", ""), array("[b]", "[/b]"), $bbcode);
- $bbcode = str_ireplace(array("
", ""), array("[i]", "[/i]"), $bbcode);
- $bbcode = str_ireplace(array("
", ""), array("[s]", "[/s]"), $bbcode);
- $bbcode = str_ireplace(array("
"), array("\n"), $bbcode);
- $bbcode = str_ireplace(array("
"), array("\n"), $bbcode);
- $bbcode = str_ireplace(array("
"), array("\n"), $bbcode);
+ $bbcode = str_ireplace(["\n"], [""], $bbcode);
+ $bbcode = str_ireplace(["
", ""], ["[b]", "[/b]"], $bbcode);
+ $bbcode = str_ireplace(["
", ""], ["[i]", "[/i]"], $bbcode);
+ $bbcode = str_ireplace(["
", ""], ["[s]", "[/s]"], $bbcode);
+ $bbcode = str_ireplace(["
"], ["\n"], $bbcode);
+ $bbcode = str_ireplace(["
"], ["\n"], $bbcode);
+ $bbcode = str_ireplace(["
"], ["\n"], $bbcode);
$bbcode = trim(strip_tags($bbcode));
return($bbcode);
@@ -161,7 +225,7 @@ function fromgplus_parse_query($var)
$var = parse_url($var, PHP_URL_QUERY);
$var = html_entity_decode($var);
$var = explode('&', $var);
- $arr = array();
+ $arr = [];
foreach($var as $val) {
$x = explode('=', $val);
@@ -172,16 +236,17 @@ function fromgplus_parse_query($var)
}
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 = [];
$queryvar = fromgplus_parse_query($fullImage);
if ($queryvar['url'] != "")
@@ -204,7 +269,23 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
$cleaned["preview"] = "";
}
- if ($cleaned["full"] == $cleaned["preview"])
+ if ($cleaned["full"] != "")
+ $infoFull = Image::getInfoFromURL($cleaned["full"]);
+ else
+ $infoFull = ["0" => 0, "1" => 0];
+
+ if ($cleaned["preview"] != "")
+ $infoPreview = Image::getInfoFromURL($cleaned["preview"]);
+ else
+ $infoFull = ["0" => 0, "1" => 0];
+
+ if (($infoPreview[0] >= $infoFull[0]) && ($infoPreview[1] >= $infoFull[1])) {
+ $temp = $cleaned["full"];
+ $cleaned["full"] = $cleaned["preview"];
+ $cleaned["preview"] = $temp;
+ }
+
+ if (($cleaned["full"] == $cleaned["preview"]) || (($infoPreview[0] == $infoFull[0]) && ($infoPreview[1] == $infoFull[1])))
$cleaned["preview"] = "";
if ($cleaned["full"] == "")
@@ -213,91 +294,142 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
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);
}
function fromgplus_cleantext($text) {
+
+ // Don't know what it is. But it is added to the text.
+ $trash = html_entity_decode("", ENT_QUOTES, 'UTF-8');
+
$text = strip_tags($text);
- $text = html_entity_decode($text);
+ $text = html_entity_decode($text, ENT_QUOTES);
$text = trim($text);
- $text = str_replace(array("\n", "\r", " "), array("", "", ""), $text);
+ $text = str_replace(["\n", "\r", " ", $trash], ["", "", "", ""], $text);
return($text);
}
-function fromgplus_handleattachments($item, $displaytext) {
+function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
+ require_once 'include/items.php';
+
$post = "";
$quote = "";
+ $pagedata = [];
+ $pagedata["type"] = "";
foreach ($item->object->attachments as $attachment) {
switch($attachment->objectType) {
case "video":
- $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
-
- /*$images = cleanupgoogleproxy($attachment->fullImage, $attachment->image);
- if ($images["preview"] != "")
- $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n";
- elseif ($images["full"] != "")
- $post .= "\n[img]".$images["full"]."[/img]\n";*/
-
+ $pagedata["type"] = "video";
+ $pagedata["url"] = Network::finalUrl($attachment->url);
+ $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
break;
case "article":
- $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
+ $pagedata["type"] = "link";
+ $pagedata["url"] = Network::finalUrl($attachment->url);
+ $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
- //if ($images["preview"] != "")
- // $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n";
- //elseif ($images["full"] != "")
- // $post .= "\n[img]".$images["full"]."[/img]\n";
if ($images["full"] != "")
- $post .= "\n[img]".$images["full"]."[/img]\n";
+ $pagedata["images"][0]["src"] = $images["full"];
- //$post .= "[quote]".trim(fromgplus_html2bbcode($attachment->content))."[/quote]";
$quote = trim(fromgplus_html2bbcode($attachment->content));
+
if ($quote != "")
- $quote = "\n[quote]".$quote."[/quote]";
+ $pagedata["text"] = $quote;
+
+ // Add Keywords to page link
+ $data = parseurl_getsiteinfo_cached($pagedata["url"], true);
+ if (isset($data["keywords"]) && PConfig::get($uid, 'fromgplus', 'keywords')) {
+ $pagedata["keywords"] = $data["keywords"];
+ }
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 = Image::storePhoto($a, $uid, "", $attachment->fullImage->url);
+ } elseif ($attachment->image->url != "") {
+ $images = Image::storePhoto($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 != "") && (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"] = Network::finalUrl($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":
- 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["type"] = "link";
+ $pagedata["url"] = Network::finalUrl($attachment->url);
+ $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
+
+ $thumb = $attachment->thumbnails[0];
+ $pagedata["images"][0]["src"] = $thumb->image->url;
+
+ $quote = trim(fromgplus_html2bbcode($thumb->description));
+ if ($quote != "")
+ $pagedata["text"] = $quote;
- $post .= "\n[url=".$thumb->url."][img]".$image."[/img][/url]\n";
- }
break;
+
case "audio":
- $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
+ $pagedata["url"] = Network::finalUrl($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);
}
@@ -307,39 +439,50 @@ function fromgplus_fetch($a, $uid) {
// Special blank to identify postings from the googleplus connector
$blank = html_entity_decode(" ", ENT_QUOTES, 'UTF-8');
- $account = get_pconfig($uid,'fromgplus','account');
- $key = get_config('fromgplus','key');
+ $account = PConfig::get($uid,'fromgplus','account');
+ $key = Config::get('fromgplus','key');
- $result = fetch_url("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch);
+ $result = Network::fetchUrl("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch);
//$result = file_get_contents("google.txt");
//file_put_contents("google.txt", $result);
$activities = json_decode($result);
- $initiallastdate = get_pconfig($uid,'fromgplus','lastdate');
+ $initiallastdate = PConfig::get($uid,'fromgplus','lastdate');
+
+ $first_time = ($initiallastdate == "");
$lastdate = 0;
- if (!is_array($activities->items))
+ if (empty($activities->items))
return;
$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 ($item->access->description == "Public")
+ PConfig::set($uid,'fromgplus','lastdate', $lastdate);
- // Loop prevention - ignore postings from HootSuite
- if ($item->provider->title == "HootSuite")
- continue;
+ if ($first_time)
+ 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) {
@@ -347,32 +490,48 @@ function fromgplus_fetch($a, $uid) {
$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);
+
+ $coord = "";
+ $location = "";
+ if (isset($item->location)) {
+ if (isset($item->location->address->formatted))
+ $location = $item->location->address->formatted;
+
+ if (isset($item->location->displayName))
+ $location = $item->location->displayName;
- // geocode, placeName
- if (isset($item->address))
+ if (isset($item->location->position->latitude) &&
+ isset($item->location->position->longitude))
+ $coord = $item->location->position->latitude." ".$item->location->position->longitude;
+
+ } elseif (isset($item->address))
$location = $item->address;
- else
- $location = "";
- fromgplus_post($a, $uid, "Google+", $post, $location);
- //fromgplus_post($a, $uid, $item->provider->title, $post, $location);
+ fromgplus_post($a, $uid, $item->provider->title, $post, $location, $coord, $item->id);
break;
case "activity":
$post = fromgplus_html2bbcode($item->annotation)."\n";
- if (!intval(get_config('system','old_share'))) {
- $post .= "[share author='".str_replace("'", "'",$item->object->actor->displayName).
- "' profile='".$item->object->actor->url.
- "' avatar='".$item->object->actor->image->url.
- "' link='".$item->object->url."']";
+ if (!intval(Config::get('system','old_share'))) {
+
+ if (function_exists("share_header"))
+ $post .= share_header($item->object->actor->displayName, $item->object->actor->url,
+ $item->object->actor->image->url, "",
+ DateTimeFormat::utc($item->object->published),$item->object->url);
+ else
+ $post .= "[share author='".str_replace("'", "'",$item->object->actor->displayName).
+ "' profile='".$item->object->actor->url.
+ "' avatar='".$item->object->actor->image->url.
+ "' posted='".DateTimeFormat::utc($item->object->published).
+ "' link='".$item->object->url."']";
$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 {
@@ -381,38 +540,30 @@ function fromgplus_fetch($a, $uid) {
$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))
+ $coord = "";
+ $location = "";
+ if (isset($item->location)) {
+ if (isset($item->location->address->formatted))
+ $location = $item->location->address->formatted;
+
+ if (isset($item->location->displayName))
+ $location = $item->location->displayName;
+
+ if (isset($item->location->position->latitude) &&
+ isset($item->location->position->longitude))
+ $coord = $item->location->position->latitude." ".$item->location->position->longitude;
+
+ } elseif (isset($item->address))
$location = $item->address;
- else
- $location = "";
- fromgplus_post($a, $uid, "Google+", $post, $location);
- //fromgplus_post($a, $uid, $item->provider->title, $post, $location);
+ fromgplus_post($a, $uid, $item->provider->title, $post, $location, $coord, $item->id);
break;
}
+ }
}
if ($lastdate != 0)
- set_pconfig($uid,'fromgplus','lastdate', $lastdate);
+ PConfig::set($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);
-*/