X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_attach.php;h=8cb19ab1a09e4953e1a2653c667553358260fb23;hb=a7d75702cc43b13b6100d993df6d8d409e5e2351;hp=4a4d1edc532af179de370093112c58ca408cf0c8;hpb=ad9c67663d8206315c649be3b27bf5418fb91ad3;p=friendica.git

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 4a4d1edc53..8cb19ab1a0 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -1,14 +1,30 @@
 <?php
 /**
- * @file mod/wall_attach.php
+ * @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/>.
+ *
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
+use Friendica\Core\Session;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Attach;
-use Friendica\Model\Contact;
+use Friendica\Model\User;
 use Friendica\Util\Strings;
 
 function wall_attach_post(App $a) {
@@ -23,14 +39,14 @@ function wall_attach_post(App $a) {
 
 		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;
 		}
 	} else {
 		if ($r_json) {
-			echo json_encode(['error' => L10n::t('Invalid request.')]);
+			echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
 			exit();
 		}
 
@@ -43,46 +59,32 @@ function wall_attach_post(App $a) {
 	$page_owner_cid   = $r[0]['id'];
 	$community_page   = (($r[0]['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false);
 
-	if ((local_user()) && (local_user() == $page_owner_uid)) {
+	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 > 0) {
-				$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)
-				);
+	} 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;
-				}
-			}
+		if (DBA::isResult($r)) {
+			$can_post = true;
 		}
 	}
 
-	if (! $can_post) {
+	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'])) {
 		if ($r_json) {
-			echo json_encode(['error' => L10n::t('Invalid request.')]);
+			echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
 		}
 		exit();
 	}
@@ -91,7 +93,7 @@ function wall_attach_post(App $a) {
 	$filename = basename($_FILES['userfile']['name']);
 	$filesize = intval($_FILES['userfile']['size']);
 
-	$maxfilesize = Config::get('system','maxfilesize');
+	$maxfilesize = DI::config()->get('system','maxfilesize');
 
 	/* Found html code written in text field of form,
 	 * when trying to upload a file with filesize
@@ -100,18 +102,18 @@ function wall_attach_post(App $a) {
 	 */
 
 	if ($filesize <= 0) {
-		$msg = L10n::t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(L10n::t('Or - did you try to upload an empty file?'));
+		$msg = DI::l10n()->t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(DI::l10n()->t('Or - did you try to upload an empty file?'));
 		if ($r_json) {
 			echo json_encode(['error' => $msg]);
 		} else {
-			notice($msg . EOL);
+			notice($msg);
 		}
 		@unlink($src);
 		exit();
 	}
 
 	if ($maxfilesize && $filesize > $maxfilesize) {
-		$msg = L10n::t('File exceeds size limit of %s', Strings::formatBytes($maxfilesize));
+		$msg = DI::l10n()->t('File exceeds size limit of %s', Strings::formatBytes($maxfilesize));
 		if ($r_json) {
 			echo json_encode(['error' => $msg]);
 		} else {
@@ -126,7 +128,7 @@ function wall_attach_post(App $a) {
 	@unlink($src);
 
 	if ($newid === false) {
-		$msg =  L10n::t('File upload failed.');
+		$msg =  DI::l10n()->t('File upload failed.');
 		if ($r_json) {
 			echo json_encode(['error' => $msg]);
 		} else {