X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_upload.php;h=61578ca5c8204e334b7b86728b671c0660472840;hb=5ebe10d7fc808dc2ed3502b532e6db020928aa1c;hp=3e88bd76b537404cf5b8bb510a9fe9f319f84bda;hpb=a2ad01383082a01eb540ffa6c89c82519fec7b11;p=friendica.git

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 3e88bd76b5..61578ca5c8 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,15 +1,20 @@
 <?php
-
 /**
  * @file mod/wall_upload.php
  * @brief 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
  */
 
-require_once 'include/Photo.php';
+use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Model\Photo;
+use Friendica\Object\Image;
 
 function wall_upload_post(App $a, $desktopmode = true) {
 
@@ -28,9 +33,9 @@ function wall_upload_post(App $a, $desktopmode = true) {
 				dbesc($nick)
 			);
 
-			if (! dbm::is_result($r)) {
+			if (! DBM::is_result($r)) {
 				if ($r_json) {
-					echo json_encode(array('error'=>t('Invalid request.')));
+					echo json_encode(['error'=>L10n::t('Invalid request.')]);
 					killme();
 				}
 				return;
@@ -46,7 +51,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 		}
 	} else {
 		if ($r_json) {
-			echo json_encode(array('error'=>t('Invalid request.')));
+			echo json_encode(['error'=>L10n::t('Invalid request.')]);
 			killme();
 		}
 		return;
@@ -84,7 +89,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 					intval($contact_id),
 					intval($page_owner_uid)
 				);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$can_post = true;
 					$visitor = $contact_id;
 				}
@@ -95,21 +100,24 @@ function wall_upload_post(App $a, $desktopmode = true) {
 
 	if (! $can_post) {
 		if ($r_json) {
-			echo json_encode(array('error'=>t('Permission denied.')));
+			echo json_encode(['error'=>L10n::t('Permission denied.')]);
 			killme();
 		}
-		notice(t('Permission denied.') . EOL);
+		notice(L10n::t('Permission denied.') . EOL);
 		killme();
 	}
 
 	if (! x($_FILES, 'userfile') && ! x($_FILES, 'media')) {
 		if ($r_json) {
-			echo json_encode(array('error'=>t('Invalid request.')));
+			echo json_encode(['error'=>L10n::t('Invalid request.')]);
 		}
 		killme();
 	}
 
-	$src = "";
+	$src = '';
+	$filename = '';
+	$filesize = 0;
+	$filetype = '';
 	if (x($_FILES, 'userfile')) {
 		$src      = $_FILES['userfile']['tmp_name'];
 		$filename = basename($_FILES['userfile']['name']);
@@ -144,10 +152,10 @@ function wall_upload_post(App $a, $desktopmode = true) {
 
 	if ($src=="") {
 		if ($r_json) {
-			echo json_encode(array('error'=>t('Invalid request.')));
+			echo json_encode(['error'=>L10n::t('Invalid request.')]);
 			killme();
 		}
-		notice(t('Invalid request.').EOL);
+		notice(L10n::t('Invalid request.').EOL);
 		killme();
 	}
 
@@ -157,8 +165,8 @@ function wall_upload_post(App $a, $desktopmode = true) {
 		$filetype = "";
 	}
 
-	if ($filetype=="") {
-		$filetype=guess_image_type($filename);
+	if ($filetype == "") {
+		$filetype = Image::guessType($filename);
 	}
 
 	// If there is a temp name, then do a manual check
@@ -172,12 +180,12 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	logger("File upload src: " . $src . " - filename: " . $filename .
 		" - size: " . $filesize . " - type: " . $filetype, LOGGER_DEBUG);
 
-	$maximagesize = get_config('system', 'maximagesize');
+	$maximagesize = Config::get('system', 'maximagesize');
 
 	if (($maximagesize) && ($filesize > $maximagesize)) {
-		$msg = sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize));
+		$msg = L10n::t('Image exceeds size limit of %s', formatBytes($maximagesize));
 		if ($r_json) {
-			echo json_encode(array('error'=>$msg));
+			echo json_encode(['error'=>$msg]);
 		} else {
 			echo  $msg. EOL;
 		}
@@ -185,36 +193,13 @@ function wall_upload_post(App $a, $desktopmode = true) {
 		killme();
 	}
 
-
-	$limit = service_class_fetch($page_owner_uid, 'photo_upload_limit');
-
-	if ($limit) {
-		$r = q("SELECT SUM(OCTET_LENGTH(`data`)) AS `total` FROM `photo`
-			WHERE `uid` = %d AND `scale` = 0
-			AND `album` != 'Contact Photos' ",
-			intval($page_owner_uid)
-		);
-		$size = $r[0]['total'];
-
-		if (($size + strlen($imagedata)) > $limit) {
-			$msg = upgrade_message(true);
-			if ($r_json) {
-				echo json_encode(array('error'=>$msg));
-			} else {
-				echo  $msg. EOL;
-			}
-			@unlink($src);
-			killme();
-		}
-	}
-
 	$imagedata = @file_get_contents($src);
-	$ph = new Photo($imagedata, $filetype);
+	$Image = new Image($imagedata, $filetype);
 
-	if (! $ph->is_valid()) {
-		$msg = t('Unable to process image.');
+	if (! $Image->isValid()) {
+		$msg = L10n::t('Unable to process image.');
 		if ($r_json) {
-			echo json_encode(array('error'=>$msg));
+			echo json_encode(['error'=>$msg]);
 		} else {
 			echo  $msg. EOL;
 		}
@@ -222,38 +207,38 @@ function wall_upload_post(App $a, $desktopmode = true) {
 		killme();
 	}
 
-	$ph->orient($src);
+	$Image->orient($src);
 	@unlink($src);
 
-	$max_length = get_config('system', 'max_image_length');
+	$max_length = Config::get('system', 'max_image_length');
 	if (! $max_length) {
 		$max_length = MAX_IMAGE_LENGTH;
 	}
 	if ($max_length > 0) {
-		$ph->scaleImage($max_length);
+		$Image->scaleDown($max_length);
 		logger("File upload: Scaling picture to new size " . $max_length, LOGGER_DEBUG);
 	}
 
-	$width = $ph->getWidth();
-	$height = $ph->getHeight();
+	$width = $Image->getWidth();
+	$height = $Image->getHeight();
 
-	$hash = photo_new_resource();
+	$hash = Photo::newResource();
 
 	$smallest = 0;
 
 	// If we don't have an album name use the Wall Photos album
 	if (! strlen($album)) {
-		$album = t('Wall Photos');
+		$album = L10n::t('Wall Photos');
 	}
 
 	$defperm = '<' . $default_cid . '>';
 
-	$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, $album, 0, 0, $defperm);
+	$r = Photo::store($Image, $page_owner_uid, $visitor, $hash, $filename, $album, 0, 0, $defperm);
 
 	if (! $r) {
-		$msg = t('Image upload failed.');
+		$msg = L10n::t('Image upload failed.');
 		if ($r_json) {
-			echo json_encode(array('error'=>$msg));
+			echo json_encode(['error'=>$msg]);
 		} else {
 			echo  $msg. EOL;
 		}
@@ -261,16 +246,16 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	}
 
 	if ($width > 640 || $height > 640) {
-		$ph->scaleImage(640);
-		$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, $album, 1, 0, $defperm);
+		$Image->scaleDown(640);
+		$r = Photo::store($Image, $page_owner_uid, $visitor, $hash, $filename, $album, 1, 0, $defperm);
 		if ($r) {
 			$smallest = 1;
 		}
 	}
 
 	if ($width > 320 || $height > 320) {
-		$ph->scaleImage(320);
-		$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, $album, 2, 0, $defperm);
+		$Image->scaleDown(320);
+		$r = Photo::store($Image, $page_owner_uid, $visitor, $hash, $filename, $album, 2, 0, $defperm);
 		if ($r && ($smallest == 0)) {
 			$smallest = 2;
 		}
@@ -286,24 +271,24 @@ function wall_upload_post(App $a, $desktopmode = true) {
 		);
 		if (!$r) {
 			if ($r_json) {
-				echo json_encode(array('error'=>''));
+				echo json_encode(['error'=>'']);
 				killme();
 			}
 			return false;
 		}
-		$picture = array();
+		$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["albumpage"] = App::get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash;
-		$picture["picture"]   = App::get_baseurl() . "/photo/{$hash}-0." . $ph->getExt();
-		$picture["preview"]   = App::get_baseurl() . "/photo/{$hash}-{$smallest}." . $ph->getExt();
+		$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();
 
 		if ($r_json) {
-			echo json_encode(array('picture'=>$picture));
+			echo json_encode(['picture'=>$picture]);
 			killme();
 		}
 		return $picture;
@@ -311,16 +296,16 @@ function wall_upload_post(App $a, $desktopmode = true) {
 
 
 	if ($r_json) {
-		echo json_encode(array('ok'=>true));
+		echo json_encode(['ok'=>true]);
 		killme();
 	}
 
 /* mod Waitman Gobble NO WARRANTY */
 	// if we get the signal then return the image url info in BBCODE
 	if ($_REQUEST['hush']!='yeah') {
-		echo  "\n\n" . '[url=' . App::get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . App::get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
+		echo  "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . System::baseUrl() . "/photo/{$hash}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n";
 	} else {
-		$m = '[url='.App::get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash.'][img]'.App::get_baseurl()."/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]";
+		$m = '[url='.System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash.'][img]'.System::baseUrl()."/photo/{$hash}-{$smallest}.".$Image->getExt()."[/img][/url]";
 		return($m);
 	}
 /* mod Waitman Gobble NO WARRANTY */