fromgplus: settings moved to connector settings

[friendica-addons.git] / fromgplus / fromgplus.php

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index e28b3658cf0043535518b0c48835273394b3c10c..a6d3d84ff05d7fe9da6f7660a9afc0581b06e49b 100644 (file)
--- 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) {
@@ -109,6 +113,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 +128,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,7 +222,15 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
        return($cleaned);
 }
 
-function fromgplus_handleattachments($item) {
+function fromgplus_cleantext($text) {
+       $text = strip_tags($text);
+       $text = html_entity_decode($text);
+       $text = trim($text);
+       $text = str_replace(array("\n", "\r", " "), array("", "", ""), $text);
+       return($text);
+}
+
+function fromgplus_handleattachments($item, $displaytext) {
        $post = "";
        $quote = "";
 
@@ -233,9 +251,11 @@ function fromgplus_handleattachments($item) {
                                $post .= "\n\n[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"] != "")
+                               //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";
 
                                //$post .= "[quote]".trim(fromgplus_html2bbcode($attachment->content))."[/quote]";
@@ -251,7 +271,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;
 
@@ -288,6 +308,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');
 
@@ -314,12 +337,21 @@ function fromgplus_fetch($a, $uid) {
                        $lastdate = strtotime($item->published);
 
                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))
@@ -335,7 +367,7 @@ function fromgplus_fetch($a, $uid) {
                                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.
@@ -344,7 +376,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 {
@@ -353,7 +385,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))