X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fattach.php;h=6dd9135e511d9d2f00243512723bfe8d000780ad;hb=9e99066fd70a9dd9a291a523afba1a390f0e3a0b;hp=76d60a6907167bcfc28d03276adb773c0e216140;hpb=cc9ce39e3f1d7335de2124f78c5ecb02becd197c;p=friendica.git

diff --git a/mod/attach.php b/mod/attach.php
index 76d60a6907..6dd9135e51 100644
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -1,8 +1,11 @@
 <?php
 
+use Friendica\App;
+use Friendica\Database\DBM;
+
 require_once('include/security.php');
 
-function attach_init(&$a) {
+function attach_init(App $a) {
 
 	if($a->argc != 2) {
 		notice( t('Item not available.') . EOL);
@@ -16,7 +19,7 @@ function attach_init(&$a) {
 	$r = q("SELECT * FROM `attach` WHERE `id` = %d LIMIT 1",
 		intval($item_id)
 	);
-	if(! count($r)) {
+	if (! DBM::is_result($r)) {
 		notice( t('Item was not found.'). EOL);
 		return;
 	}
@@ -29,7 +32,7 @@ function attach_init(&$a) {
 		dbesc($item_id)
 	);
 
-	if(! count($r)) {
+	if (! DBM::is_result($r)) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -37,7 +40,12 @@ function attach_init(&$a) {
 	// Use quotes around the filename to prevent a "multiple Content-Disposition"
 	// error in Chrome for filenames with commas in them
 	header('Content-type: ' . $r[0]['filetype']);
-	header('Content-disposition: attachment; filename="' . $r[0]['filename'] . '"');
+	header('Content-length: ' . $r[0]['filesize']);
+	if(isset($_GET['attachment']) && $_GET['attachment'] === '0')
+		header('Content-disposition: filename="' . $r[0]['filename'] . '"');
+	else
+		header('Content-disposition: attachment; filename="' . $r[0]['filename'] . '"');
+
 	echo $r[0]['data'];
 	killme();
 	// NOTREACHED