[xmpp] Fixes: (#668)

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

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 94ff98340a391c23b70a7c556c0065321cca22e1..0f208037a0efe3b18846256c2869e991a7af0d67 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -14,6 +14,9 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Object\Image;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
+use Friendica\Model\Item;
 
 require_once 'mod/share.php';
 require_once 'mod/parse_url.php';
@@ -101,7 +104,7 @@ function fromgplus_addon_admin(&$a, &$o)
 
        $o = replace_macros($t, [
                        '$submit' => L10n::t('Save Settings'),
-                       '$key' => ['key', L10n::t('Key'), trim(Config::get('fromgplus', 'key')), L10n::t('')],
+                       '$key' => ['key', L10n::t('Key'), trim(Config::get('fromgplus', 'key')), ''],
        ]);
 }
 
@@ -166,7 +169,6 @@ function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) {
        $_SESSION['uid'] = $uid;
 
        unset($_REQUEST);
-       $_REQUEST['type'] = 'wall';
        $_REQUEST['api_source'] = true;
 
        $_REQUEST['profile_uid'] = $uid;
@@ -174,7 +176,7 @@ function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) {
        $_REQUEST['extid'] = NETWORK_GPLUS;
 
        if (isset($id)) {
-               $_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_GPLUS.':'.$id);
+               $_REQUEST['message_id'] = Item::newURI($uid, NETWORK_GPLUS.':'.$id);
        }
 
        // $_REQUEST['verb']
@@ -313,8 +315,7 @@ function fromgplus_cleantext($text) {
 }
 
 function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
-       require_once("include/items.php");
-       require_once("include/network.php");
+       require_once 'include/items.php';
 
        $post = "";
        $quote = "";
@@ -325,13 +326,13 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
                switch($attachment->objectType) {
                        case "video":
                                $pagedata["type"] = "video";
-                               $pagedata["url"] = original_url($attachment->url);
+                               $pagedata["url"] = Network::finalUrl($attachment->url);
                                $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
                                break;
 
                        case "article":
                                $pagedata["type"] = "link";
-                               $pagedata["url"] = original_url($attachment->url);
+                               $pagedata["url"] = Network::finalUrl($attachment->url);
                                $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
 
                                $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
@@ -382,7 +383,7 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
                                break;
 
                        case "photo-album":
-                               $pagedata["url"] = original_url($attachment->url);
+                               $pagedata["url"] = Network::finalUrl($attachment->url);
                                $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
                                $post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n";
 
@@ -403,7 +404,7 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
 
                        case "album":
                                $pagedata["type"] = "link";
-                               $pagedata["url"] = original_url($attachment->url);
+                               $pagedata["url"] = Network::finalUrl($attachment->url);
                                $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
 
                                $thumb = $attachment->thumbnails[0];
@@ -416,7 +417,7 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
                                break;
 
                        case "audio":
-                               $pagedata["url"] = original_url($attachment->url);
+                               $pagedata["url"] = Network::finalUrl($attachment->url);
                                $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
                                $post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n";
                                break;
@@ -441,7 +442,7 @@ function fromgplus_fetch($a, $uid) {
        $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);
 
@@ -453,7 +454,7 @@ function fromgplus_fetch($a, $uid) {
 
        $lastdate = 0;
 
-       if (!is_array($activities->items))
+       if (empty($activities->items))
                return;
 
        $reversed = array_reverse($activities->items);
@@ -519,12 +520,12 @@ function fromgplus_fetch($a, $uid) {
                                                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);
+                                                                               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='".datetime_convert('UTC','UTC',$item->object->published).
+                                                                       "' posted='".DateTimeFormat::utc($item->object->published).
                                                                        "' link='".$item->object->url."']";
 
                                                $post .= fromgplus_html2bbcode($item->object->content);