Merge pull request #9858 from annando/notify-ignored

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

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index fd33cdd..c3ba323 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -41,19 +41,13 @@ function wall_upload_post(App $a, $desktopmode = true)
        Logger::log("wall upload: starting new upload", Logger::DEBUG);
 
        $r_json = (!empty($_GET['response']) && $_GET['response'] == 'json');
-       $album = (!empty($_GET['album']) ? Strings::escapeTags(trim($_GET['album'])) : '');
+       $album = trim($_GET['album'] ?? '');
 
        if ($a->argc > 1) {
                if (empty($_FILES['media'])) {
-                       $nick = $a->argv[1];
-                       $r = q("SELECT `user`.*, `contact`.`id` FROM `user`
-                               INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
-                               WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0
-                               AND `contact`.`self` = 1 LIMIT 1",
-                               DBA::escape($nick)
-                       );
-
-                       if (!DBA::isResult($r)) {
+                       $nick = $a->argv[1];                    
+                       $user = DBA::selectFirst('owner-view', ['id', 'uid', 'nickname', 'page-flags'], ['nickname' => $nick, 'blocked' => false]);
+                       if (!DBA::isResult($user)) {
                                if ($r_json) {
                                        echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
                                        exit();
@@ -62,12 +56,7 @@ function wall_upload_post(App $a, $desktopmode = true)
                        }
                } else {
                        $user_info = api_get_user($a);
-                       $r = q("SELECT `user`.*, `contact`.`id` FROM `user`
-                               INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
-                               WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0
-                               AND `contact`.`self` = 1 LIMIT 1",
-                               DBA::escape($user_info['screen_name'])
-                       );
+                       $user = DBA::selectFirst('owner-view', ['id', 'uid', 'nickname', 'page-flags'], ['nickname' => $user_info['screen_name'], 'blocked' => false]);
                }
        } else {
                if ($r_json) {
@@ -83,10 +72,10 @@ function wall_upload_post(App $a, $desktopmode = true)
        $can_post  = false;
        $visitor   = 0;
 
-       $page_owner_uid   = $r[0]['uid'];
-       $default_cid      = $r[0]['id'];
-       $page_owner_nick  = $r[0]['nickname'];
-       $community_page   = (($r[0]['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false);
+       $page_owner_uid   = $user['uid'];
+       $default_cid      = $user['id'];
+       $page_owner_nick  = $user['nickname'];
+       $community_page   = (($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false);
 
        if ((local_user()) && (local_user() == $page_owner_uid)) {
                $can_post = true;
@@ -110,7 +99,7 @@ function wall_upload_post(App $a, $desktopmode = true)
                        echo json_encode(['error' => DI::l10n()->t('Permission denied.')]);
                        exit();
                }
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                exit();
        }
 
@@ -170,27 +159,11 @@ function wall_upload_post(App $a, $desktopmode = true)
                        echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
                        exit();
                }
-               notice(DI::l10n()->t('Invalid request.').EOL);
+               notice(DI::l10n()->t('Invalid request.'));
                exit();
        }
 
-       // This is a special treatment for picture upload from Twidere
-       if (($filename == "octet-stream") && ($filetype != "")) {
-               $filename = $filetype;
-               $filetype = "";
-       }
-
-       if ($filetype == "") {
-               $filetype = Images::guessType($filename);
-       }
-
-       // If there is a temp name, then do a manual check
-       // This is more reliable than the provided value
-
-       $imagedata = getimagesize($src);
-       if ($imagedata) {
-               $filetype = $imagedata['mime'];
-       }
+       $filetype = Images::getMimeTypeBySource($src, $filename, $filetype);
 
        Logger::log("File upload src: " . $src . " - filename: " . $filename .
                " - size: " . $filesize . " - type: " . $filetype, Logger::DEBUG);