Merge pull request #7810 from annando/diaspora-add-contact

[friendica.git] / mod / wall_upload.php

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 0848c05906d888b863e9d6b21ecf88cf12bda4a4..31112367a9442eb0c33253d3e68c4fab3b072d3f 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -9,15 +9,16 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\Session;
 use Friendica\Core\System;
-use Friendica\Core\Config;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Object\Image;
+use Friendica\Util\Images;
 use Friendica\Util\Strings;
 
 function wall_upload_post(App $a, $desktopmode = true)
@@ -74,8 +75,8 @@ function wall_upload_post(App $a, $desktopmode = true)
 
        if ((local_user()) && (local_user() == $page_owner_uid)) {
                $can_post = true;
-       } elseif ($community_page && !empty(remote_user($page_owner_uid))) {
-               $contact_id = remote_user($page_owner_uid);
+       } elseif ($community_page && !empty(Session::getRemoteContactID($page_owner_uid))) {
+               $contact_id = Session::getRemoteContactID($page_owner_uid);
 
                $r = q("SELECT `uid` FROM `contact`
                        WHERE `blocked` = 0 AND `pending` = 0
@@ -165,7 +166,7 @@ function wall_upload_post(App $a, $desktopmode = true)
        }
 
        if ($filetype == "") {
-               $filetype = Image::guessType($filename);
+               $filetype = Images::guessType($filename);
        }
 
        // If there is a temp name, then do a manual check
@@ -221,7 +222,7 @@ function wall_upload_post(App $a, $desktopmode = true)
        $width = $Image->getWidth();
        $height = $Image->getHeight();
 
-       $hash = Photo::newResource();
+       $resource_id = Photo::newResource();
 
        $smallest = 0;
 
@@ -232,7 +233,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 
        $defperm = '<' . $default_cid . '>';
 
-       $r = Photo::store($Image, $page_owner_uid, $visitor, $hash, $filename, $album, 0, 0, $defperm);
+       $r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 0, 0, $defperm);
 
        if (!$r) {
                $msg = L10n::t('Image upload failed.');
@@ -246,7 +247,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 
        if ($width > 640 || $height > 640) {
                $Image->scaleDown(640);
-               $r = Photo::store($Image, $page_owner_uid, $visitor, $hash, $filename, $album, 1, 0, $defperm);
+               $r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 1, 0, $defperm);
                if ($r) {
                        $smallest = 1;
                }
@@ -254,7 +255,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 
        if ($width > 320 || $height > 320) {
                $Image->scaleDown(320);
-               $r = Photo::store($Image, $page_owner_uid, $visitor, $hash, $filename, $album, 2, 0, $defperm);
+               $r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 2, 0, $defperm);
                if ($r && ($smallest == 0)) {
                        $smallest = 2;
                }
@@ -264,7 +265,7 @@ function wall_upload_post(App $a, $desktopmode = true)
                $r = q("SELECT `id`, `datasize`, `width`, `height`, `type` FROM `photo`
                        WHERE `resource-id` = '%s'
                        ORDER BY `width` DESC LIMIT 1",
-                       $hash
+                       $resource_id
                );
                if (!$r) {
                        if ($r_json) {
@@ -280,9 +281,9 @@ function wall_upload_post(App $a, $desktopmode = true)
                $picture["width"]     = $r[0]["width"];
                $picture["height"]    = $r[0]["height"];
                $picture["type"]      = $r[0]["type"];
-               $picture["albumpage"] = System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $hash;
-               $picture["picture"]   = System::baseUrl() . "/photo/{$hash}-0." . $Image->getExt();
-               $picture["preview"]   = System::baseUrl() . "/photo/{$hash}-{$smallest}." . $Image->getExt();
+               $picture["albumpage"] = System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id;
+               $picture["picture"]   = System::baseUrl() . "/photo/{$resource_id}-0." . $Image->getExt();
+               $picture["preview"]   = System::baseUrl() . "/photo/{$resource_id}-{$smallest}." . $Image->getExt();
 
                if ($r_json) {
                        echo json_encode(['picture' => $picture]);
@@ -299,7 +300,7 @@ function wall_upload_post(App $a, $desktopmode = true)
                exit();
        }
 
-       echo  "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . System::baseUrl() . "/photo/{$hash}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n";
+       echo  "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id . '][img]' . System::baseUrl() . "/photo/{$resource_id}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n";
        exit();
        // NOTREACHED
 }