Rewrite Proxy module

[friendica.git] / mod / attach.php

diff --git a/mod/attach.php b/mod/attach.php
index ae6540201e70f96227a1bf633aec78deaed4384e..cf2c8cc6dd55d68191fb94d639dce31e7158f3bd 100644 (file)
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -1,11 +1,17 @@
 <?php
-
-require_once('include/security.php');
-
-function attach_init(&$a) {
-
-       if($a->argc != 2) {
-               notice( t('Item not available.') . EOL);
+/**
+ * @file mod/attach.php
+ */
+
+use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Database\DBA;
+use Friendica\Util\Security;
+
+function attach_init(App $a)
+{
+       if ($a->argc != 2) {
+               notice(L10n::t('Item not available.') . EOL);
                return;
        }
 
@@ -13,30 +19,36 @@ function attach_init(&$a) {
 
        // Check for existence, which will also provide us the owner uid
 
-       $r = q("SELECT * FROM `attach` WHERE `id` = %d LIMIT 1",
-               intval($item_id)
-       );
-       if(! count($r)) {
-               notice( t('Item was not found.'). EOL);
+       $r = DBA::selectFirst('attach', [], ['id' => $item_id]);
+       if (!DBA::isResult($r)) {
+               notice(L10n::t('Item was not found.'). EOL);
                return;
        }
 
-       $sql_extra = permissions_sql($r[0]['uid']);
+       $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)) {
-               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']);
+       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
+}