Merge pull request #482 from MrPetovan/task/fix-php-notices

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

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index e0a49b3fda32d4ed3856345d1da49ad4abcf40b2..0699f75bbf178d3d6a64191c5b830d26e29128c2 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -11,7 +11,7 @@ define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
-use Friendica\Object\Photo;
+use Friendica\Object\Image;
 
 require_once 'mod/share.php';
 require_once 'mod/parse_url.php';
@@ -264,12 +264,12 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
        }
 
        if ($cleaned["full"] != "")
-               $infoFull = Photo::getPhotoInfo($cleaned["full"]);
+               $infoFull = Image::getInfoFromURL($cleaned["full"]);
        else
                $infoFull = array("0" => 0, "1" => 0);
 
        if ($cleaned["preview"] != "")
-               $infoPreview = Photo::getPhotoInfo($cleaned["preview"]);
+               $infoPreview = Image::getInfoFromURL($cleaned["preview"]);
        else
                $infoFull = array("0" => 0, "1" => 0);
 
@@ -309,7 +309,6 @@ 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");
 
@@ -349,13 +348,14 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
 
                        case "photo":
                                // Don't store shared pictures in your wall photos (to prevent a possible violating of licenses)
-                               if ($shared)
+                               if ($shared) {
                                        $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
-                               else {
-                                       if ($attachment->fullImage->url != "")
-                                               $images = store_photo($a, $uid, "", $attachment->fullImage->url);
-                                       elseif ($attachment->image->url != "")
-                                               $images = store_photo($a, $uid, "", $attachment->image->url);
+                               } else {
+                                       if ($attachment->fullImage->url != "") {
+                                               $images = Image::storePhoto($a, $uid, "", $attachment->fullImage->url);
+                                       } elseif ($attachment->image->url != "") {
+                                               $images = Image::storePhoto($a, $uid, "", $attachment->image->url);
+                                       }
                                }
 
                                if ($images["preview"] != "") {
@@ -366,8 +366,9 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
                                        $post .= "\n[img]".$images["full"]."[/img]\n";
                                        $pagedata["images"][0]["src"] = $images["full"];
 
-                                       if ($images["preview"] != "")
+                                       if ($images["preview"] != "") {
                                                $pagedata["images"][1]["src"] = $images["preview"];
+                                       }
                                }
 
                                if (($attachment->displayName != "") && (fromgplus_cleantext($attachment->displayName) != fromgplus_cleantext($displaytext))) {