X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_upload.php;h=31112367a9442eb0c33253d3e68c4fab3b072d3f;hb=ac9b3b78457f466980c7300cea602d78e7af8d45;hp=89655981ea9a090f9f0cf993703459e72df612c2;hpb=69a73678ebc18ad27b27f1bf92bc9433b7e7066f;p=friendica.git

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 89655981ea..31112367a9 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -9,14 +9,16 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\Session;
 use Friendica\Core\System;
-use Friendica\Core\Config;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
 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)
@@ -39,7 +41,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 			if (!DBA::isResult($r)) {
 				if ($r_json) {
 					echo json_encode(['error' => L10n::t('Invalid request.')]);
-					killme();
+					exit();
 				}
 				return;
 			}
@@ -55,7 +57,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 	} else {
 		if ($r_json) {
 			echo json_encode(['error' => L10n::t('Invalid request.')]);
-			killme();
+			exit();
 		}
 		return;
 	}
@@ -69,52 +71,39 @@ 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'] == Contact::PAGE_COMMUNITY) ? true : false);
+	$community_page   = (($r[0]['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false);
 
 	if ((local_user()) && (local_user() == $page_owner_uid)) {
 		$can_post = true;
-	} else {
-		if ($community_page && remote_user()) {
-			$contact_id = 0;
-			if (is_array($_SESSION['remote'])) {
-				foreach ($_SESSION['remote'] as $v) {
-					if ($v['uid'] == $page_owner_uid) {
-						$contact_id = $v['cid'];
-						break;
-					}
-				}
-			}
-
-			if ($contact_id) {
-				$r = q("SELECT `uid` FROM `contact`
-					WHERE `blocked` = 0 AND `pending` = 0
-					AND `id` = %d AND `uid` = %d LIMIT 1",
-					intval($contact_id),
-					intval($page_owner_uid)
-				);
-				if (DBA::isResult($r)) {
-					$can_post = true;
-					$visitor = $contact_id;
-				}
-			}
+	} elseif ($community_page && !empty(Session::getRemoteContactID($page_owner_uid))) {
+		$contact_id = Session::getRemoteContactID($page_owner_uid);
+
+		$r = q("SELECT `uid` FROM `contact`
+			WHERE `blocked` = 0 AND `pending` = 0
+			AND `id` = %d AND `uid` = %d LIMIT 1",
+			intval($contact_id),
+			intval($page_owner_uid)
+		);
+		if (DBA::isResult($r)) {
+			$can_post = true;
+			$visitor = $contact_id;
 		}
 	}
 
-
 	if (!$can_post) {
 		if ($r_json) {
 			echo json_encode(['error' => L10n::t('Permission denied.')]);
-			killme();
+			exit();
 		}
 		notice(L10n::t('Permission denied.') . EOL);
-		killme();
+		exit();
 	}
 
 	if (empty($_FILES['userfile']) && empty($_FILES['media'])) {
 		if ($r_json) {
 			echo json_encode(['error' => L10n::t('Invalid request.')]);
 		}
-		killme();
+		exit();
 	}
 
 	$src = '';
@@ -164,10 +153,10 @@ function wall_upload_post(App $a, $desktopmode = true)
 	if ($src == "") {
 		if ($r_json) {
 			echo json_encode(['error' => L10n::t('Invalid request.')]);
-			killme();
+			exit();
 		}
 		notice(L10n::t('Invalid request.').EOL);
-		killme();
+		exit();
 	}
 
 	// This is a special treatment for picture upload from Twidere
@@ -177,7 +166,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
@@ -201,7 +190,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 			echo  $msg. EOL;
 		}
 		@unlink($src);
-		killme();
+		exit();
 	}
 
 	$imagedata = @file_get_contents($src);
@@ -215,7 +204,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 			echo  $msg. EOL;
 		}
 		@unlink($src);
-		killme();
+		exit();
 	}
 
 	$Image->orient($src);
@@ -233,7 +222,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 	$width = $Image->getWidth();
 	$height = $Image->getHeight();
 
-	$hash = Photo::newResource();
+	$resource_id = Photo::newResource();
 
 	$smallest = 0;
 
@@ -244,7 +233,7 @@ function wall_upload_post(App $a, $desktopmode = true)
 
 	$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.');
@@ -253,12 +242,12 @@ function wall_upload_post(App $a, $desktopmode = true)
 		} else {
 			echo  $msg. EOL;
 		}
-		killme();
+		exit();
 	}
 
 	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;
 		}
@@ -266,24 +255,22 @@ 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;
 		}
 	}
 
-	$basename = basename($filename);
-
 	if (!$desktopmode) {
 		$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) {
 				echo json_encode(['error' => '']);
-				killme();
+				exit();
 			}
 			return false;
 		}
@@ -294,13 +281,13 @@ 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"] = System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id;
+		$picture["picture"]   = System::baseUrl() . "/photo/{$resource_id}-0." . $Image->getExt();
+		$picture["preview"]   = System::baseUrl() . "/photo/{$resource_id}-{$smallest}." . $Image->getExt();
 
 		if ($r_json) {
 			echo json_encode(['picture' => $picture]);
-			killme();
+			exit();
 		}
 		Logger::log("upload done", Logger::DEBUG);
 		return $picture;
@@ -310,10 +297,10 @@ function wall_upload_post(App $a, $desktopmode = true)
 
 	if ($r_json) {
 		echo json_encode(['ok' => true]);
-		killme();
+		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";
-	killme();
+	echo  "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id . '][img]' . System::baseUrl() . "/photo/{$resource_id}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n";
+	exit();
 	// NOTREACHED
 }