X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_attach.php;h=c4ee33bd18f97468b614bc5c598db8fad5091688;hb=6c341962648b73c935c2de26996b07332b776a1f;hp=b13d1f6e0a779c568f1f9e3a80a8d6acd014eae9;hpb=a6fb3568f989f72164b435baafc63a174397b542;p=friendica.git

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index b13d1f6e0a..c4ee33bd18 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -6,84 +6,85 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Mimetype;
+use Friendica\Model\Attach;
+use Friendica\Model\User;
+use Friendica\Util\Strings;
 
 function wall_attach_post(App $a) {
 
-	$r_json = (x($_GET,'response') && $_GET['response']=='json');
+	$r_json = (!empty($_GET['response']) && $_GET['response']=='json');
 
-	if($a->argc > 1) {
+	if ($a->argc > 1) {
 		$nick = $a->argv[1];
 		$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
 			DBA::escape($nick)
 		);
+
 		if (! DBA::isResult($r)) {
 			if ($r_json) {
-				echo json_encode(['error'=>L10n::t('Invalid request.')]);
-				killme();
+				echo json_encode(['error' => L10n::t('Invalid request.')]);
+				exit();
 			}
 			return;
-	}
-
+		}
 	} else {
 		if ($r_json) {
-			echo json_encode(['error'=>L10n::t('Invalid request.')]);
-			killme();
+			echo json_encode(['error' => L10n::t('Invalid request.')]);
+			exit();
 		}
+
 		return;
 	}
 
 	$can_post  = false;
-	$visitor   = 0;
 
 	$page_owner_uid   = $r[0]['uid'];
 	$page_owner_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'] == 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()) {
+	} 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) {
+
+			if (is_array($_SESSION['remote'])) {
+				foreach ($_SESSION['remote'] as $v) {
+					if ($v['uid'] == $page_owner_uid) {
 						$contact_id = $v['cid'];
 						break;
 					}
 				}
 			}
-			if($contact_id) {
 
+			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)
 				);
+
 				if (DBA::isResult($r)) {
 					$can_post = true;
-					$visitor = $contact_id;
 				}
 			}
 		}
 	}
-	if(! $can_post) {
+
+	if (! $can_post) {
 		if ($r_json) {
-			echo json_encode(['error'=>L10n::t('Permission denied.')]);
-			killme();
+			echo json_encode(['error' => L10n::t('Permission denied.')]);
+			exit();
 		}
 		notice(L10n::t('Permission denied.') . EOL );
-		killme();
+		exit();
 	}
 
-	if(! x($_FILES,'userfile')) {
+	if (empty($_FILES['userfile'])) {
 		if ($r_json) {
-			echo json_encode(['error'=>L10n::t('Invalid request.')]);
+			echo json_encode(['error' => L10n::t('Invalid request.')]);
 		}
-		killme();
+		exit();
 	}
 
 	$src      = $_FILES['userfile']['tmp_name'];
@@ -98,76 +99,51 @@ function wall_attach_post(App $a) {
 	 * Then Filesize gets <= 0.
 	 */
 
-	if($filesize <=0) {
+	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?'));
 		if ($r_json) {
-			echo json_encode(['error'=>$msg]);
+			echo json_encode(['error' => $msg]);
 		} else {
-			notice( $msg. EOL );
+			notice($msg . EOL);
 		}
 		@unlink($src);
-		killme();
+		exit();
 	}
 
-	if(($maxfilesize) && ($filesize > $maxfilesize)) {
-		$msg = L10n::t('File exceeds size limit of %s', formatBytes($maxfilesize));
+	if ($maxfilesize && $filesize > $maxfilesize) {
+		$msg = L10n::t('File exceeds size limit of %s', Strings::formatBytes($maxfilesize));
 		if ($r_json) {
-			echo json_encode(['error'=>$msg]);
+			echo json_encode(['error' => $msg]);
 		} else {
-			echo  $msg. EOL ;
+			echo $msg . EOL;
 		}
 		@unlink($src);
-		killme();
+		exit();
 	}
 
-	$filedata = @file_get_contents($src);
-	$mimetype = Mimetype::getContentType($filename);
-	$hash = System::createGUID(64);
-	$created = DateTimeFormat::utcNow();
-
-	$fields = ['uid' => $page_owner_uid, 'hash' => $hash, 'filename' => $filename, 'filetype' => $mimetype,
-		'filesize' => $filesize, 'data' => $filedata, 'created' => $created, 'edited' => $created,
-		'allow_cid' => '<' . $page_owner_cid . '>', 'allow_gid' => '','deny_cid' => '', 'deny_gid' => ''];
-
-	$r = DBA::insert('attach', $fields);
+	$newid = Attach::storeFile($src, $page_owner_uid, $filename, '<' . $page_owner_cid . '>');
 
 	@unlink($src);
 
-	if(! $r) {
+	if ($newid === false) {
 		$msg =  L10n::t('File upload failed.');
 		if ($r_json) {
-			echo json_encode(['error'=>$msg]);
-		} else {
-			echo  $msg. EOL ;
-		}
-		killme();
-	}
-
-	$r = q("SELECT `id` FROM `attach` WHERE `uid` = %d AND `created` = '%s' AND `hash` = '%s' LIMIT 1",
-		intval($page_owner_uid),
-		DBA::escape($created),
-		DBA::escape($hash)
-	);
-
-	if (! DBA::isResult($r)) {
-		$msg = L10n::t('File upload failed.');
-		if ($r_json) {
-			echo json_encode(['error'=>$msg]);
+			echo json_encode(['error' => $msg]);
 		} else {
-			echo  $msg. EOL ;
+			echo $msg . EOL;
 		}
-		killme();
+		exit();
 	}
 
 	if ($r_json) {
-		echo json_encode(['ok'=>true]);
-		killme();
+		echo json_encode(['ok' => true, 'id' => $newid]);
+		exit();
 	}
 
 	$lf = "\n";
 
-	echo  $lf . $lf . '[attachment]' . $r[0]['id'] . '[/attachment]' . $lf;
+	echo  $lf . $lf . '[attachment]' . $newid . '[/attachment]' . $lf;
 
-	killme();
+	exit();
 	// NOTREACHED
 }