X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_upload.php;h=a9828e61f94333b478b4984ffe694c184fc2d62b;hb=720a43461d67ab229de0aecfc5008f22cc4c1c54;hp=d935c6d327fa6cb2b06819e345b579c962ea2de7;hpb=3d97149007872d69ca43ec955137b887d95239cf;p=friendica.git

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index d935c6d327..a9828e61f9 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -32,13 +32,14 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
+use Friendica\Module\BaseApi;
 use Friendica\Object\Image;
 use Friendica\Util\Images;
 use Friendica\Util\Strings;
 
 function wall_upload_post(App $a, $desktopmode = true)
 {
-	Logger::log("wall upload: starting new upload", Logger::DEBUG);
+	Logger::info("wall upload: starting new upload");
 
 	$r_json = (!empty($_GET['response']) && $_GET['response'] == 'json');
 	$album = trim($_GET['album'] ?? '');
@@ -55,8 +56,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 				return;
 			}
 		} else {
-			$user_info = api_get_user($a);
-			$user = DBA::selectFirst('owner-view', ['id', 'uid', 'nickname', 'page-flags'], ['nickname' => $user_info['screen_name'], 'blocked' => false]);
+			$user = DBA::selectFirst('owner-view', ['id', 'uid', 'nickname', 'page-flags'], ['uid' => BaseApi::getCurrentUserID(), 'blocked' => false]);
 		}
 	} else {
 		if ($r_json) {
@@ -156,8 +156,8 @@ function wall_upload_post(App $a, $desktopmode = true)
 
 	$filetype = Images::getMimeTypeBySource($src, $filename, $filetype);
 
-	Logger::log("File upload src: " . $src . " - filename: " . $filename .
-		" - size: " . $filesize . " - type: " . $filetype, Logger::DEBUG);
+	Logger::info("File upload src: " . $src . " - filename: " . $filename .
+		" - size: " . $filesize . " - type: " . $filetype);
 
 	$imagedata = @file_get_contents($src);
 	$Image = new Image($imagedata, $filetype);
@@ -177,13 +177,10 @@ function wall_upload_post(App $a, $desktopmode = true)
 	@unlink($src);
 
 	$max_length = DI::config()->get('system', 'max_image_length');
-	if (!$max_length) {
-		$max_length = MAX_IMAGE_LENGTH;
-	}
 	if ($max_length > 0) {
 		$Image->scaleDown($max_length);
 		$filesize = strlen($Image->asString());
-		Logger::log("File upload: Scaling picture to new size " . $max_length, Logger::DEBUG);
+		Logger::info("File upload: Scaling picture to new size " . $max_length);
 	}
 
 	$width = $Image->getWidth();
@@ -226,7 +223,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 
 	$defperm = '<' . $default_cid . '>';
 
-	$r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 0, 0, $defperm);
+	$r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 0, Photo::DEFAULT, $defperm);
 
 	if (!$r) {
 		$msg = DI::l10n()->t('Image upload failed.');
@@ -240,7 +237,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, $resource_id, $filename, $album, 1, 0, $defperm);
+		$r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 1, Photo::DEFAULT, $defperm);
 		if ($r) {
 			$smallest = 1;
 		}
@@ -248,19 +245,15 @@ function wall_upload_post(App $a, $desktopmode = true)
 
 	if ($width > 320 || $height > 320) {
 		$Image->scaleDown(320);
-		$r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 2, 0, $defperm);
+		$r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 2, Photo::DEFAULT, $defperm);
 		if ($r && ($smallest == 0)) {
 			$smallest = 2;
 		}
 	}
 
 	if (!$desktopmode) {
-		$r = q("SELECT `id`, `datasize`, `width`, `height`, `type` FROM `photo`
-			WHERE `resource-id` = '%s'
-			ORDER BY `width` DESC LIMIT 1",
-			$resource_id
-		);
-		if (!$r) {
+		$photo = Photo::selectFirst(['id', 'datasize', 'width', 'height', 'type'], ['resource-id' => $resource_id], ['order' => ['width']]);
+		if (!$photo) {
 			if ($r_json) {
 				echo json_encode(['error' => '']);
 				exit();
@@ -269,11 +262,11 @@ function wall_upload_post(App $a, $desktopmode = true)
 		}
 		$picture = [];
 
-		$picture["id"]        = $r[0]["id"];
-		$picture["size"]      = $r[0]["datasize"];
-		$picture["width"]     = $r[0]["width"];
-		$picture["height"]    = $r[0]["height"];
-		$picture["type"]      = $r[0]["type"];
+		$picture["id"]        = $photo["id"];
+		$picture["size"]      = $photo["datasize"];
+		$picture["width"]     = $photo["width"];
+		$picture["height"]    = $photo["height"];
+		$picture["type"]      = $photo["type"];
 		$picture["albumpage"] = DI::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id;
 		$picture["picture"]   = DI::baseUrl() . "/photo/{$resource_id}-0." . $Image->getExt();
 		$picture["preview"]   = DI::baseUrl() . "/photo/{$resource_id}-{$smallest}." . $Image->getExt();
@@ -282,11 +275,11 @@ function wall_upload_post(App $a, $desktopmode = true)
 			echo json_encode(['picture' => $picture]);
 			exit();
 		}
-		Logger::log("upload done", Logger::DEBUG);
+		Logger::info("upload done");
 		return $picture;
 	}
 
-	Logger::log("upload done", Logger::DEBUG);
+	Logger::info("upload done");
 
 	if ($r_json) {
 		echo json_encode(['ok' => true]);