X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_upload.php;h=c99c43fa0a1495a591b3954f615d075b134a0978;hb=1849bf0a120e236624ddc25461f424071ab8c8a2;hp=3841ef97b52c399ae64b3374499c167944d45c3a;hpb=d3722c945b99955b33a813a7369ee4581a784f8a;p=friendica.git

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 3841ef97b5..c99c43fa0a 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -41,19 +41,13 @@ function wall_upload_post(App $a, $desktopmode = true)
 	Logger::log("wall upload: starting new upload", Logger::DEBUG);
 
 	$r_json = (!empty($_GET['response']) && $_GET['response'] == 'json');
-	$album = (!empty($_GET['album']) ? Strings::escapeTags(trim($_GET['album'])) : '');
+	$album = trim($_GET['album'] ?? '');
 
 	if ($a->argc > 1) {
 		if (empty($_FILES['media'])) {
-			$nick = $a->argv[1];
-			$r = q("SELECT `user`.*, `contact`.`id` FROM `user`
-				INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
-				WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0
-				AND `contact`.`self` = 1 LIMIT 1",
-				DBA::escape($nick)
-			);
-
-			if (!DBA::isResult($r)) {
+			$nick = $a->argv[1];			
+			$user = DBA::selectFirst('owner-view', ['id', 'uid', 'nickname', 'page-flags'], ['nickname' => $nick, 'blocked' => false]);
+			if (!DBA::isResult($user)) {
 				if ($r_json) {
 					echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
 					exit();
@@ -62,12 +56,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 			}
 		} else {
 			$user_info = api_get_user($a);
-			$r = q("SELECT `user`.*, `contact`.`id` FROM `user`
-				INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
-				WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0
-				AND `contact`.`self` = 1 LIMIT 1",
-				DBA::escape($user_info['screen_name'])
-			);
+			$user = DBA::selectFirst('owner-view', ['id', 'uid', 'nickname', 'page-flags'], ['nickname' => $user_info['screen_name'], 'blocked' => false]);
 		}
 	} else {
 		if ($r_json) {
@@ -83,10 +72,10 @@ function wall_upload_post(App $a, $desktopmode = true)
 	$can_post  = false;
 	$visitor   = 0;
 
-	$page_owner_uid   = $r[0]['uid'];
-	$default_cid      = $r[0]['id'];
-	$page_owner_nick  = $r[0]['nickname'];
-	$community_page   = (($r[0]['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false);
+	$page_owner_uid   = $user['uid'];
+	$default_cid      = $user['id'];
+	$page_owner_nick  = $user['nickname'];
+	$community_page   = (($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false);
 
 	if ((local_user()) && (local_user() == $page_owner_uid)) {
 		$can_post = true;
@@ -110,7 +99,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 			echo json_encode(['error' => DI::l10n()->t('Permission denied.')]);
 			exit();
 		}
-		notice(DI::l10n()->t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.'));
 		exit();
 	}
 
@@ -170,7 +159,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 			echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
 			exit();
 		}
-		notice(DI::l10n()->t('Invalid request.').EOL);
+		notice(DI::l10n()->t('Invalid request.'));
 		exit();
 	}
 
@@ -179,19 +168,6 @@ function wall_upload_post(App $a, $desktopmode = true)
 	Logger::log("File upload src: " . $src . " - filename: " . $filename .
 		" - size: " . $filesize . " - type: " . $filetype, Logger::DEBUG);
 
-	$maximagesize = DI::config()->get('system', 'maximagesize');
-
-	if (($maximagesize) && ($filesize > $maximagesize)) {
-		$msg = DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize));
-		if ($r_json) {
-			echo json_encode(['error' => $msg]);
-		} else {
-			echo  $msg. EOL;
-		}
-		@unlink($src);
-		exit();
-	}
-
 	$imagedata = @file_get_contents($src);
 	$Image = new Image($imagedata, $filetype);
 
@@ -215,12 +191,39 @@ function wall_upload_post(App $a, $desktopmode = true)
 	}
 	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);
 	}
 
 	$width = $Image->getWidth();
 	$height = $Image->getHeight();
 
+	$maximagesize = DI::config()->get('system', 'maximagesize');
+
+	if (!empty($maximagesize) && ($filesize > $maximagesize)) {
+		// Scale down to multiples of 640 until the maximum size isn't exceeded anymore
+		foreach ([5120, 2560, 1280, 640] as $pixels) {
+			if (($filesize > $maximagesize) && (max($width, $height) > $pixels)) {
+				Logger::info('Resize', ['size' => $filesize, 'width' => $width, 'height' => $height, 'max' => $maximagesize, 'pixels' => $pixels]);
+				$Image->scaleDown($pixels);
+				$filesize = strlen($Image->asString());
+				$width = $Image->getWidth();
+				$height = $Image->getHeight();
+			}
+		}
+		if ($filesize > $maximagesize) {
+			Logger::notice('Image size is too big', ['size' => $filesize, 'max' => $maximagesize]);
+			$msg = DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize));
+			if ($r_json) {
+				echo json_encode(['error' => $msg]);
+			} else {
+				echo  $msg. EOL;
+			}
+			@unlink($src);
+			exit();
+		}
+	}
+
 	$resource_id = Photo::newResource();
 
 	$smallest = 0;