X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fattach.php;h=9ca701ba356ebde93865136b15dd19ef927d33b0;hb=f2ca3e5be44192c486e8e3af2a993e065ad40a7d;hp=3953d3aa19945b34477817254bd6b7ce8c1ac3d1;hpb=2a679b1164207ee983a26cb6d06fef10d4b81bb0;p=friendica.git

diff --git a/mod/attach.php b/mod/attach.php
index 3953d3aa19..9ca701ba35 100644
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -1,73 +1,56 @@
 <?php
+/**
+ * @file mod/attach.php
+ */
 
-function attach_init(&$a) {
+use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Database\DBA;
+use Friendica\Util\Security;
 
-	if($a->argc != 2) {
-		notice( t('Item not available.') . EOL);
-		return;
-	}
-
-	$item_id = intval($a->argv[1]);
+require_once 'include/dba.php';
 
-	$r = q("SELECT * FROM `attach` WHERE `id` = %d LIMIT 1",
-		intval($item_id)
-	);
-	if(! count($r)) {
-		notice( t('Item was not found.'). EOL);
+function attach_init(App $a)
+{
+	if ($a->argc != 2) {
+		notice(L10n::t('Item not available.') . EOL);
 		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'])) {
+	$item_id = intval($a->argv[1]);
 
-			// Owner can always see his/her photos
-			$sql_extra = ''; 
+	// Check for existence, which will also provide us the owner uid
 
+	$r = DBA::selectFirst('attach', [], ['id' => $item_id]);
+	if (!DBA::isResult($r)) {
+		notice(L10n::t('Item was not found.'). EOL);
+		return;
 	}
-	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 = Security::getPermissionsSQLByUserId($r['uid']);
 
 	// Now we'll see if we can access the attachment
 
 	$r = q("SELECT * FROM `attach` WHERE `id` = '%d' $sql_extra LIMIT 1",
-		dbesc($item_id)
+		DBA::escape($item_id)
 	);
 
-	if(count($r)) {
-		$data = $r[0]['data'];
-	}
-	else {
-		notice( t('Permission denied.') . EOL);
+	if (!DBA::isResult($r)) {
+		notice(L10n::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
+}