X-Git-Url: https://reisub.nsupdate.info/git/?a=blobdiff_plain;f=mod%2Fwall_upload.php;h=c23c3adbc6e7e8295fdf01171618008038769561;hb=59d06b6c7809179339f3e8bf82467a85f17294b8;hp=ce73f85151dde9277796c619baaef129110a299d;hpb=0dce57d4007d7e3cff578825f212a7c0a6cb8800;p=friendica.git%2F.git

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index ce73f85151..c23c3adbc6 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file mod/wall_upload.php
  * @brief Module for uploading a picture to the profile wall
@@ -10,31 +9,34 @@
  */
 
 use Friendica\App;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
-use Friendica\Object\Photo;
-
-function wall_upload_post(App $a, $desktopmode = true) {
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\Photo;
+use Friendica\Object\Image;
 
+function wall_upload_post(App $a, $desktopmode = true)
+{
 	logger("wall upload: starting new upload", LOGGER_DEBUG);
 
 	$r_json = (x($_GET, 'response') && $_GET['response'] == 'json');
 	$album = (x($_GET, 'album') ? notags(trim($_GET['album'])) : '');
 
 	if ($a->argc > 1) {
-		if (! x($_FILES, 'media')) {
+		if (!x($_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",
-				dbesc($nick)
+				DBA::escape($nick)
 			);
 
-			if (! DBM::is_result($r)) {
+			if (!DBA::isResult($r)) {
 				if ($r_json) {
-					echo json_encode(array('error'=>t('Invalid request.')));
+					echo json_encode(['error' => L10n::t('Invalid request.')]);
 					killme();
 				}
 				return;
@@ -45,12 +47,12 @@ function wall_upload_post(App $a, $desktopmode = true) {
 				INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
 				WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0
 				AND `contact`.`self` = 1 LIMIT 1",
-				dbesc($user_info['screen_name'])
+				DBA::escape($user_info['screen_name'])
 			);
 		}
 	} else {
 		if ($r_json) {
-			echo json_encode(array('error'=>t('Invalid request.')));
+			echo json_encode(['error' => L10n::t('Invalid request.')]);
 			killme();
 		}
 		return;
@@ -65,7 +67,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	$page_owner_uid   = $r[0]['uid'];
 	$default_cid      = $r[0]['id'];
 	$page_owner_nick  = $r[0]['nickname'];
-	$community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+	$community_page   = (($r[0]['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false);
 
 	if ((local_user()) && (local_user() == $page_owner_uid)) {
 		$can_post = true;
@@ -88,7 +90,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 					intval($contact_id),
 					intval($page_owner_uid)
 				);
-				if (DBM::is_result($r)) {
+				if (DBA::isResult($r)) {
 					$can_post = true;
 					$visitor = $contact_id;
 				}
@@ -97,23 +99,26 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	}
 
 
-	if (! $can_post) {
+	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 (!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']);
@@ -121,37 +126,45 @@ function wall_upload_post(App $a, $desktopmode = true) {
 		$filetype = $_FILES['userfile']['type'];
 
 	} elseif (x($_FILES, 'media')) {
-		if (is_array($_FILES['media']['tmp_name'])) {
-			$src = $_FILES['media']['tmp_name'][0];
-		} else {
-			$src = $_FILES['media']['tmp_name'];
+		if (!empty($_FILES['media']['tmp_name'])) {
+			if (is_array($_FILES['media']['tmp_name'])) {
+				$src = $_FILES['media']['tmp_name'][0];
+			} else {
+				$src = $_FILES['media']['tmp_name'];
+			}
 		}
 
-		if (is_array($_FILES['media']['name'])) {
-			$filename = basename($_FILES['media']['name'][0]);
-		} else {
-			$filename = basename($_FILES['media']['name']);
+		if (!empty($_FILES['media']['name'])) {
+			if (is_array($_FILES['media']['name'])) {
+				$filename = basename($_FILES['media']['name'][0]);
+			} else {
+				$filename = basename($_FILES['media']['name']);
+			}
 		}
 
-		if (is_array($_FILES['media']['size'])) {
-			$filesize = intval($_FILES['media']['size'][0]);
-		} else {
-			$filesize = intval($_FILES['media']['size']);
+		if (!empty($_FILES['media']['size'])) {
+			if (is_array($_FILES['media']['size'])) {
+				$filesize = intval($_FILES['media']['size'][0]);
+			} else {
+				$filesize = intval($_FILES['media']['size']);
+			}
 		}
 
-		if (is_array($_FILES['media']['type'])) {
-			$filetype = $_FILES['media']['type'][0];
-		} else {
-			$filetype = $_FILES['media']['type'];
+		if (!empty($_FILES['media']['type'])) {
+			if (is_array($_FILES['media']['type'])) {
+				$filetype = $_FILES['media']['type'][0];
+			} else {
+				$filetype = $_FILES['media']['type'];
+			}
 		}
 	}
 
-	if ($src=="") {
+	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();
 	}
 
@@ -161,8 +174,8 @@ function wall_upload_post(App $a, $desktopmode = true) {
 		$filetype = "";
 	}
 
-	if ($filetype=="") {
-		$filetype=Photo::guessImageType($filename);
+	if ($filetype == "") {
+		$filetype = Image::guessType($filename);
 	}
 
 	// If there is a temp name, then do a manual check
@@ -179,9 +192,9 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	$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;
 		}
@@ -190,12 +203,12 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	}
 
 	$imagedata = @file_get_contents($src);
-	$ph = new Photo($imagedata, $filetype);
+	$Image = new Image($imagedata, $filetype);
 
-	if (! $ph->isValid()) {
-		$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;
 		}
@@ -203,38 +216,38 @@ function wall_upload_post(App $a, $desktopmode = true) {
 		killme();
 	}
 
-	$ph->orient($src);
+	$Image->orient($src);
 	@unlink($src);
 
 	$max_length = Config::get('system', 'max_image_length');
-	if (! $max_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');
+	if (!strlen($album)) {
+		$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.');
+	if (!$r) {
+		$msg = L10n::t('Image upload failed.');
 		if ($r_json) {
-			echo json_encode(array('error'=>$msg));
+			echo json_encode(['error' => $msg]);
 		} else {
 			echo  $msg. EOL;
 		}
@@ -242,16 +255,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;
 		}
@@ -267,12 +280,12 @@ 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"];
@@ -280,32 +293,25 @@ function wall_upload_post(App $a, $desktopmode = true) {
 		$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." . $ph->getExt();
-		$picture["preview"]   = System::baseUrl() . "/photo/{$hash}-{$smallest}." . $ph->getExt();
+		$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();
 		}
+		logger("upload done", LOGGER_DEBUG);
 		return $picture;
 	}
 
+	logger("upload done", LOGGER_DEBUG);
 
 	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=' . System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . System::baseUrl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
-	} else {
-		$m = '[url='.System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash.'][img]'.System::baseUrl()."/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]";
-		return($m);
-	}
-/* mod Waitman Gobble NO WARRANTY */
-
+	echo  "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . System::baseUrl() . "/photo/{$hash}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n";
 	killme();
 	// NOTREACHED
 }