Merge pull request #5719 from annando/notices-yeah

[friendica.git/.git] / mod / attach.php

diff --git a/mod/attach.php b/mod/attach.php
index 6155a3f..99f0fc4 100644 (file)
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -1,13 +1,19 @@
 <?php
+/**
+ * @file mod/attach.php
+ */
 
 use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Database\DBA;
 
-require_once('include/security.php');
+require_once 'include/dba.php';
+require_once 'include/security.php';
 
-function attach_init(App $a) {
-
-       if($a->argc != 2) {
-               notice( t('Item not available.') . EOL);
+function attach_init(App $a)
+{
+       if ($a->argc != 2) {
+               notice(L10n::t('Item not available.') . EOL);
                return;
        }
 
@@ -15,24 +21,22 @@ function attach_init(App $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 (! dbm::is_result($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 = permissions_sql($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 (! dbm::is_result($r)) {
-               notice( t('Permission denied.') . EOL);
+       if (!DBA::isResult($r)) {
+               notice(L10n::t('Permission denied.') . EOL);
                return;
        }
 
@@ -40,10 +44,11 @@ function attach_init(App $a) {
        // error in Chrome for filenames with commas in them
        header('Content-type: ' . $r[0]['filetype']);
        header('Content-length: ' . $r[0]['filesize']);
-       if(isset($_GET['attachment']) && $_GET['attachment'] === '0')
+       if (isset($_GET['attachment']) && $_GET['attachment'] === '0') {
                header('Content-disposition: filename="' . $r[0]['filename'] . '"');
-       else
+       } else {
                header('Content-disposition: attachment; filename="' . $r[0]['filename'] . '"');
+       }
 
        echo $r[0]['data'];
        killme();