]> git.mxchange.org Git - friendica-addons.git/blobdiff - fromgplus/fromgplus.php
Merge pull request #348 from annando/1604-gplus-coord
[friendica-addons.git] / fromgplus / fromgplus.php
index 9699ba9b32d8c3059297a0564138f1c0a2021167..d3365e710656b81adae10c17c7cec30d6dbd5990 100644 (file)
@@ -9,6 +9,8 @@
 
 define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 
+require_once('mod/share.php');
+
 function fromgplus_install() {
        register_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
        register_hook('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
@@ -79,6 +81,21 @@ function fromgplus_addon_settings_post(&$a,&$b) {
        }
 }
 
+function fromgplus_plugin_admin(&$a, &$o){
+        $t = get_markup_template("admin.tpl", "addon/fromgplus/");
+
+        $o = replace_macros($t, array(
+                '$submit' => t('Save Settings'),
+                '$key' => array('key', t('Key'), trim(get_config('fromgplus', 'key')), t('')),
+        ));
+}
+
+function fromgplus_plugin_admin_post(&$a){
+        $key = ((x($_POST,'key')) ? trim($_POST['key']) : '');
+        set_config('fromgplus','key',$key);
+        info( t('Settings updated.'). EOL );
+}
+
 function fromgplus_cron($a,$b) {
        $last = get_config('fromgplus','last_poll');
 
@@ -112,7 +129,7 @@ function fromgplus_cron($a,$b) {
        set_config('fromgplus','last_poll', time());
 }
 
-function fromgplus_post($a, $uid, $source, $body, $location) {
+function fromgplus_post($a, $uid, $source, $body, $location, $coord) {
 
        //$uid = 2;
 
@@ -138,6 +155,7 @@ function fromgplus_post($a, $uid, $source, $body, $location) {
 
        $_REQUEST['profile_uid'] = $uid;
        $_REQUEST['source'] = $source;
+       $_REQUEST['extid'] = NETWORK_GPLUS;
 
        // $_REQUEST['verb']
        // $_REQUEST['parent']
@@ -146,6 +164,7 @@ 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'] == "")) {
                logger('fromgplus: empty post for user '.$uid." ".print_r($_REQUEST, true));
@@ -275,29 +294,36 @@ function fromgplus_cleantext($text) {
 
 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":
@@ -311,52 +337,72 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
                                                $images = store_photo($a, $uid, "", $attachment->image->url);
                                }
 
-                               if ($images["preview"] != "")
+                               if ($images["preview"] != "") {
                                        $post .= "\n[url=".$images["page"]."][img]".$images["preview"]."[/img][/url]\n";
-                               elseif ($images["full"] != "")
+                                       $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 (($attachment->displayName != "") AND (fromgplus_cleantext($attachment->displayName) != fromgplus_cleantext($displaytext)))
+                                       if ($images["preview"] != "")
+                                               $pagedata["images"][1]["src"] = $images["preview"];
+                               }
+
+                               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);
 }
 
@@ -371,7 +417,6 @@ function fromgplus_fetch($a, $uid) {
 
        $result = fetch_url("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch);
        //$result = file_get_contents("google.txt");
-       //$result = file_get_contents("addon/fromgplus/album.txt");
        //file_put_contents("google.txt", $result);
 
        $activities = json_decode($result);
@@ -388,6 +433,7 @@ function fromgplus_fetch($a, $uid) {
        $reversed = array_reverse($activities->items);
 
        foreach($reversed as $item) {
+
                if (strtotime($item->published) <= $initiallastdate)
                        continue;
 
@@ -403,14 +449,11 @@ function fromgplus_fetch($a, $uid) {
                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) {
@@ -420,14 +463,23 @@ function fromgplus_fetch($a, $uid) {
                                        if (is_array($item->object->attachments))
                                                $post .= fromgplus_handleattachments($a, $uid, $item, $item->object->content, false);
 
-                                       // geocode, placeName
-                                       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) AND
+                                                       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);
 
                                        break;
 
@@ -435,10 +487,17 @@ function fromgplus_fetch($a, $uid) {
                                        $post = fromgplus_html2bbcode($item->annotation)."\n";
 
                                        if (!intval(get_config('system','old_share'))) {
-                                               $post .= "[share author='".str_replace("'", "&#039;",$item->object->actor->displayName).
-                                                               "' profile='".$item->object->actor->url.
-                                                               "' avatar='".$item->object->actor->image->url.
-                                                               "' link='".$item->object->url."']";
+
+                                               if (function_exists("share_header"))
+                                                       $post .= share_header($item->object->actor->displayName, $item->object->actor->url,
+                                                                               $item->object->actor->image->url, "",
+                                                                               datetime_convert('UTC','UTC',$item->object->published),$item->object->url);
+                                               else
+                                                       $post .= "[share author='".str_replace("'", "&#039;",$item->object->actor->displayName).
+                                                                       "' profile='".$item->object->actor->url.
+                                                                       "' avatar='".$item->object->actor->image->url.
+                                                                       "' posted='".datetime_convert('UTC','UTC',$item->object->published).
+                                                                       "' link='".$item->object->url."']";
 
                                                $post .= fromgplus_html2bbcode($item->object->content);
 
@@ -455,15 +514,26 @@ function fromgplus_fetch($a, $uid) {
                                                        $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) AND
+                                                       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);
                                        break;
                        }
+               }
        }
        if ($lastdate != 0)
                set_pconfig($uid,'fromgplus','lastdate', $lastdate);