Merge pull request #348 from annando/1604-gplus-coord

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

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index e0725a46df22a295d529653db453358be85be6c3..d3365e710656b81adae10c17c7cec30d6dbd5990 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -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;
 
@@ -147,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));
@@ -399,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);
@@ -446,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;
 
@@ -461,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("'", "'",$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("'", "'",$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);
 
@@ -481,13 +514,23 @@ 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;
                        }
                }