X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fattach.php;h=03f850f0d1749972d7e68e63de295007bf856cb5;hb=778ed772d2c4d1a1b1222f2f9bbe98ad9fa67eff;hp=3953d3aa19945b34477817254bd6b7ce8c1ac3d1;hpb=2a679b1164207ee983a26cb6d06fef10d4b81bb0;p=friendica.git

diff --git a/mod/attach.php b/mod/attach.php
index 3953d3aa19..03f850f0d1 100644
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once('include/security.php');
+
 function attach_init(&$a) {
 
 	if($a->argc != 2) {
@@ -9,6 +11,8 @@ function attach_init(&$a) {
 
 	$item_id = intval($a->argv[1]);
 
+	// Check for existence, which will also provide us the owner uid
+
 	$r = q("SELECT * FROM `attach` WHERE `id` = %d LIMIT 1",
 		intval($item_id)
 	);
@@ -17,39 +21,7 @@ function attach_init(&$a) {
 		return;
 	}
 
-	$owner = $r[0]['uid'];
-
-	$sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' ";
-
-	if(local_user() && ($owner == $_SESSION['uid'])) {
-
-			// Owner can always see his/her photos
-			$sql_extra = ''; 
-
-	}
-	elseif(remote_user()) {
-
-		// authenticated visitor - here lie dragons
-
-		$groups = init_groups_visitor($_SESSION['visitor_id']);
-		$gs = '<<>>'; // should be impossible to match
-		if(count($groups)) {
-			foreach($groups as $g)
-				$gs .= '|<' . intval($g) . '>';
-		} 
-
-		$sql_extra = sprintf(
-			" AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' ) 
-			  AND ( `deny_cid`  = '' OR  NOT `deny_cid` REGEXP '<%d>' ) 
-			  AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
-			  AND ( `deny_gid`  = '' OR NOT `deny_gid` REGEXP '%s') ",
-
-			intval($_SESSION['visitor_id']),
-			intval($_SESSION['visitor_id']),
-			dbesc($gs),
-			dbesc($gs)
-		);
-	}
+	$sql_extra = permissions_sql($r[0]['uid']);
 
 	// Now we'll see if we can access the attachment
 
@@ -57,17 +29,21 @@ function attach_init(&$a) {
 		dbesc($item_id)
 	);
 
-	if(count($r)) {
-		$data = $r[0]['data'];
-	}
-	else {
+	if(! count($r)) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
+	// 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']);
-	echo $data;
+	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
-}
\ No newline at end of file
+}