X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_upload.php;h=fd33cdd17af813ce4b8f5b28172ae56df4dee3ee;hb=79803a6546dd251f6fee557434816a39bc1fb7ce;hp=1224b6dab0a6cb00fbaea2c0ceacf1c20fda365f;hpb=36ba7fa79c7c2d4304f3423d84215771e3bb6a9f;p=friendica.git

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 1224b6dab0..fd33cdd17a 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,24 +1,39 @@
 <?php
 /**
- * @file mod/wall_upload.php
- * @brief Module for uploading a picture to the profile wall
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Module for uploading a picture to the profile wall
  *
  * By default the picture will be stored in the photo album with the name Wall Photos.
  * You can specify a different album by adding an optional query string "album="
  * to the url
+ *
  */
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\System;
 use Friendica\Core\Session;
-use Friendica\Core\Config;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
+use Friendica\DI;
 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)
@@ -40,7 +55,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 
 			if (!DBA::isResult($r)) {
 				if ($r_json) {
-					echo json_encode(['error' => L10n::t('Invalid request.')]);
+					echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
 					exit();
 				}
 				return;
@@ -56,7 +71,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 		}
 	} else {
 		if ($r_json) {
-			echo json_encode(['error' => L10n::t('Invalid request.')]);
+			echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
 			exit();
 		}
 		return;
@@ -92,16 +107,16 @@ function wall_upload_post(App $a, $desktopmode = true)
 
 	if (!$can_post) {
 		if ($r_json) {
-			echo json_encode(['error' => L10n::t('Permission denied.')]);
+			echo json_encode(['error' => DI::l10n()->t('Permission denied.')]);
 			exit();
 		}
-		notice(L10n::t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.') . EOL);
 		exit();
 	}
 
 	if (empty($_FILES['userfile']) && empty($_FILES['media'])) {
 		if ($r_json) {
-			echo json_encode(['error' => L10n::t('Invalid request.')]);
+			echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
 		}
 		exit();
 	}
@@ -152,10 +167,10 @@ function wall_upload_post(App $a, $desktopmode = true)
 
 	if ($src == "") {
 		if ($r_json) {
-			echo json_encode(['error' => L10n::t('Invalid request.')]);
+			echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
 			exit();
 		}
-		notice(L10n::t('Invalid request.').EOL);
+		notice(DI::l10n()->t('Invalid request.').EOL);
 		exit();
 	}
 
@@ -166,7 +181,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
@@ -180,10 +195,10 @@ function wall_upload_post(App $a, $desktopmode = true)
 	Logger::log("File upload src: " . $src . " - filename: " . $filename .
 		" - size: " . $filesize . " - type: " . $filetype, Logger::DEBUG);
 
-	$maximagesize = Config::get('system', 'maximagesize');
+	$maximagesize = DI::config()->get('system', 'maximagesize');
 
 	if (($maximagesize) && ($filesize > $maximagesize)) {
-		$msg = L10n::t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize));
+		$msg = DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize));
 		if ($r_json) {
 			echo json_encode(['error' => $msg]);
 		} else {
@@ -197,7 +212,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 	$Image = new Image($imagedata, $filetype);
 
 	if (!$Image->isValid()) {
-		$msg = L10n::t('Unable to process image.');
+		$msg = DI::l10n()->t('Unable to process image.');
 		if ($r_json) {
 			echo json_encode(['error' => $msg]);
 		} else {
@@ -210,7 +225,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 	$Image->orient($src);
 	@unlink($src);
 
-	$max_length = Config::get('system', 'max_image_length');
+	$max_length = DI::config()->get('system', 'max_image_length');
 	if (!$max_length) {
 		$max_length = MAX_IMAGE_LENGTH;
 	}
@@ -222,21 +237,21 @@ function wall_upload_post(App $a, $desktopmode = true)
 	$width = $Image->getWidth();
 	$height = $Image->getHeight();
 
-	$hash = Photo::newResource();
+	$resource_id = Photo::newResource();
 
 	$smallest = 0;
 
 	// If we don't have an album name use the Wall Photos album
 	if (!strlen($album)) {
-		$album = L10n::t('Wall Photos');
+		$album = DI::l10n()->t('Wall Photos');
 	}
 
 	$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.');
+		$msg = DI::l10n()->t('Image upload failed.');
 		if ($r_json) {
 			echo json_encode(['error' => $msg]);
 		} else {
@@ -247,7 +262,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;
 		}
@@ -255,7 +270,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;
 		}
@@ -265,7 +280,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) {
@@ -281,9 +296,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"] = 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();
 
 		if ($r_json) {
 			echo json_encode(['picture' => $picture]);
@@ -300,7 +315,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=' . DI::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id . '][img]' . DI::baseUrl() . "/photo/{$resource_id}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n";
 	exit();
 	// NOTREACHED
 }