X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_attach.php;h=c4ee33bd18f97468b614bc5c598db8fad5091688;hb=80f81e670c721067cddf0ffff4ed4f2def1ad69c;hp=ba1a8205c589a8b98a6f2329fb208d75f5a7ee36;hpb=57695d48b41b5dba9a4ec1e97b531ff6590d8845;p=friendica.git

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index ba1a8205c5..c4ee33bd18 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -6,11 +6,9 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-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) {
@@ -26,26 +24,24 @@ function wall_attach_post(App $a) {
 		if (! DBA::isResult($r)) {
 			if ($r_json) {
 				echo json_encode(['error' => L10n::t('Invalid request.')]);
-				killme();
+				exit();
 			}
 			return;
 		}
 	} else {
 		if ($r_json) {
 			echo json_encode(['error' => L10n::t('Invalid request.')]);
-			killme();
+			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'] == 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;
@@ -70,7 +66,6 @@ function wall_attach_post(App $a) {
 
 				if (DBA::isResult($r)) {
 					$can_post = true;
-					$visitor = $contact_id;
 				}
 			}
 		}
@@ -79,17 +74,17 @@ function wall_attach_post(App $a) {
 	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'])) {
 		if ($r_json) {
 			echo json_encode(['error' => L10n::t('Invalid request.')]);
 		}
-		killme();
+		exit();
 	}
 
 	$src      = $_FILES['userfile']['tmp_name'];
@@ -112,7 +107,7 @@ function wall_attach_post(App $a) {
 			notice($msg . EOL);
 		}
 		@unlink($src);
-		killme();
+		exit();
 	}
 
 	if ($maxfilesize && $filesize > $maxfilesize) {
@@ -123,57 +118,32 @@ function wall_attach_post(App $a) {
 			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]);
-		} else {
-			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
 }