X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=fromgplus%2Ffromgplus.php;h=343edae7ca55f71b674873f13421ab4b64b3fbd3;hb=1754b58cd91729b75c038c2b2075df09307c1e3c;hp=f7841300f3531d5a3f7bd5d15082eaf59b932229;hpb=fc4bb9ee700450829048ae948041d2bb1610d604;p=friendica-addons.git
diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index f7841300..343edae7 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -10,15 +10,19 @@
define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
function fromgplus_install() {
- register_hook('plugin_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
- register_hook('plugin_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
+ register_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
+ register_hook('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
register_hook('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron');
}
function fromgplus_uninstall() {
+ unregister_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
+ unregister_hook('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
+ unregister_hook('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron');
+
+ // Old hooks
unregister_hook('plugin_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
unregister_hook('plugin_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
- unregister_hook('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron');
}
function fromgplus_addon_settings(&$a,&$s) {
@@ -29,8 +33,14 @@ function fromgplus_addon_settings(&$a,&$s) {
$enable_checked = (intval(get_pconfig(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
$account = get_pconfig(local_user(),'fromgplus','account');
- $s .= '
';
+ $s .= '
';
+ $s .= '' . t('Google+ Import Settings').'
';
+ $s .= '';
+ $s .= '
';
+ $s .= '
';
$s .= '' . t('Google+ Import Settings').'
';
+ $s .= '';
+
$s .= '
';
$s .= '';
@@ -41,7 +51,7 @@ function fromgplus_addon_settings(&$a,&$s) {
$s .= '
';
$s .= '
';
+class="settings-submit" value="' . t('Save Settings') . '" />
';
$s .= '
';
return;
@@ -97,6 +107,10 @@ function fromgplus_post($a, $uid, $source, $body, $location) {
//$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]") {
@@ -109,6 +123,7 @@ function fromgplus_post($a, $uid, $source, $body, $location) {
$_SESSION['authenticated'] = true;
$_SESSION['uid'] = $uid;
+ unset($_REQUEST);
$_REQUEST['type'] = 'wall';
$_REQUEST['api_source'] = true;
@@ -123,11 +138,16 @@ function fromgplus_post($a, $uid, $source, $body, $location) {
$_REQUEST['body'] = $body;
$_REQUEST['location'] = $location;
- logger('fromgplus: posting for user '.$uid);
+ if (($_REQUEST['title'] == "") AND ($_REQUEST['body'] == "")) {
+ logger('fromgplus: empty post for user '.$uid." ".print_r($_REQUEST, true));
+ return;
+ }
require_once('mod/item.php');
//print_r($_REQUEST);
+ logger('fromgplus: posting for user '.$uid." ".print_r($_REQUEST, true));
item_post($a);
+ logger('fromgplus: done for user '.$uid);
}
function fromgplus_html2bbcode($html) {
@@ -212,9 +232,22 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
return($cleaned);
}
-function fromgplus_handleattachments($item) {
+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 = trim($text);
+ $text = str_replace(array("\n", "\r", " ", $trash), array("", "", "", ""), $text);
+ return($text);
+}
+
+function fromgplus_handleattachments($item, $displaytext) {
$post = "";
$quote = "";
+ $type = "";
foreach ($item->object->attachments as $attachment) {
switch($attachment->objectType) {
@@ -230,18 +263,22 @@ function fromgplus_handleattachments($item) {
break;
case "article":
- $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
+ $post .= "\n\n[class=type-link][bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
$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["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]";
//$post .= "[quote]".trim(fromgplus_html2bbcode($attachment->content))."[/quote]";
$quote = trim(fromgplus_html2bbcode($attachment->content));
if ($quote != "")
$quote = "\n[quote]".$quote."[/quote]";
+
+ $quote .= "[/class]";
break;
case "photo":
@@ -251,7 +288,7 @@ function fromgplus_handleattachments($item) {
elseif ($images["full"] != "")
$post .= "\n[img]".$images["full"]."[/img]\n";
- if ($attachment->displayName != "")
+ if (($attachment->displayName != "") AND (fromgplus_cleantext($attachment->displayName) != fromgplus_cleantext($displaytext)))
$post .= fromgplus_html2bbcode($attachment->displayName)."\n";
break;
@@ -275,6 +312,9 @@ function fromgplus_handleattachments($item) {
$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";
+ break;
//default:
// die($attachment->objectType);
}
@@ -285,6 +325,9 @@ function fromgplus_handleattachments($item) {
function fromgplus_fetch($a, $uid) {
$maxfetch = 20;
+ // 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');
@@ -296,8 +339,13 @@ function fromgplus_fetch($a, $uid) {
$initiallastdate = get_pconfig($uid,'fromgplus','lastdate');
+ $first_time = ($initiallastdate == "");
+
$lastdate = 0;
+ if (!is_array($activities->items))
+ return;
+
$reversed = array_reverse($activities->items);
foreach($reversed as $item) {
@@ -307,13 +355,25 @@ function fromgplus_fetch($a, $uid) {
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;
+
+ // Loop prevention through the special blank from the googleplus connector
+ if (strstr($item->object->content, $blank))
+ continue;
+
switch($item->object->objectType) {
case "note":
$post = fromgplus_html2bbcode($item->object->content);
if (is_array($item->object->attachments))
- $post .= fromgplus_handleattachments($item);
+ $post .= fromgplus_handleattachments($item, $item->object->content);
// geocode, placeName
if (isset($item->address))
@@ -321,14 +381,15 @@ function fromgplus_fetch($a, $uid) {
else
$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;
case "activity":
$post = fromgplus_html2bbcode($item->annotation)."\n";
- if (intval(get_config('system','new_share'))) {
+ 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.
@@ -337,7 +398,7 @@ function fromgplus_fetch($a, $uid) {
$post .= fromgplus_html2bbcode($item->object->content);
if (is_array($item->object->attachments))
- $post .= "\n".trim(fromgplus_handleattachments($item));
+ $post .= "\n".trim(fromgplus_handleattachments($item, $item->object->content));
$post .= "[/share]";
} else {
@@ -346,7 +407,7 @@ function fromgplus_fetch($a, $uid) {
$post .= fromgplus_html2bbcode($item->object->content);
if (is_array($item->object->attachments))
- $post .= "\n".trim(fromgplus_handleattachments($item));
+ $post .= "\n".trim(fromgplus_handleattachments($item, $item->object->content));
}
if (isset($item->address))
@@ -354,7 +415,8 @@ function fromgplus_fetch($a, $uid) {
else
$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;
}
}