Rename removeTags to escapeTags

[friendica.git] / mod / wall_upload.php

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 8bf2966152957943c93655cde47df9eb42d9eac4..3358433da12450fd2b39a321f173d1ddcb83c547 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -10,18 +10,21 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
+use Friendica\Util\Strings;
 
 function wall_upload_post(App $a, $desktopmode = true)
 {
-       logger("wall upload: starting new upload", LOGGER_DEBUG);
+       Logger::log("wall upload: starting new upload", Logger::DEBUG);
 
        $r_json = (x($_GET, 'response') && $_GET['response'] == 'json');
-       $album = (x($_GET, 'album') ? notags(trim($_GET['album'])) : '');
+       $album = (x($_GET, 'album') ? Strings::escapeTags(trim($_GET['album'])) : '');
 
        if ($a->argc > 1) {
                if (!x($_FILES, 'media')) {
@@ -30,10 +33,10 @@ function wall_upload_post(App $a, $desktopmode = true)
                                INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
                                WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0
                                AND `contact`.`self` = 1 LIMIT 1",
-                               dbesc($nick)
+                               DBA::escape($nick)
                        );
 
-                       if (!DBM::is_result($r)) {
+                       if (!DBA::isResult($r)) {
                                if ($r_json) {
                                        echo json_encode(['error' => L10n::t('Invalid request.')]);
                                        killme();
@@ -46,7 +49,7 @@ function wall_upload_post(App $a, $desktopmode = true)
                                INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
                                WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0
                                AND `contact`.`self` = 1 LIMIT 1",
-                               dbesc($user_info['screen_name'])
+                               DBA::escape($user_info['screen_name'])
                        );
                }
        } else {
@@ -66,7 +69,7 @@ function wall_upload_post(App $a, $desktopmode = true)
        $page_owner_uid   = $r[0]['uid'];
        $default_cid      = $r[0]['id'];
        $page_owner_nick  = $r[0]['nickname'];
-       $community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+       $community_page   = (($r[0]['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false);
 
        if ((local_user()) && (local_user() == $page_owner_uid)) {
                $can_post = true;
@@ -89,7 +92,7 @@ function wall_upload_post(App $a, $desktopmode = true)
                                        intval($contact_id),
                                        intval($page_owner_uid)
                                );
-                               if (DBM::is_result($r)) {
+                               if (DBA::isResult($r)) {
                                        $can_post = true;
                                        $visitor = $contact_id;
                                }
@@ -185,13 +188,13 @@ function wall_upload_post(App $a, $desktopmode = true)
                $filetype = $imagedata['mime'];
        }
 
-       logger("File upload src: " . $src . " - filename: " . $filename .
-               " - size: " . $filesize . " - type: " . $filetype, LOGGER_DEBUG);
+       Logger::log("File upload src: " . $src . " - filename: " . $filename .
+               " - size: " . $filesize . " - type: " . $filetype, Logger::DEBUG);
 
        $maximagesize = Config::get('system', 'maximagesize');
 
        if (($maximagesize) && ($filesize > $maximagesize)) {
-               $msg = L10n::t('Image exceeds size limit of %s', formatBytes($maximagesize));
+               $msg = L10n::t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize));
                if ($r_json) {
                        echo json_encode(['error' => $msg]);
                } else {
@@ -224,7 +227,7 @@ function wall_upload_post(App $a, $desktopmode = true)
        }
        if ($max_length > 0) {
                $Image->scaleDown($max_length);
-               logger("File upload: Scaling picture to new size " . $max_length, LOGGER_DEBUG);
+               Logger::log("File upload: Scaling picture to new size " . $max_length, Logger::DEBUG);
        }
 
        $width = $Image->getWidth();
@@ -299,11 +302,11 @@ function wall_upload_post(App $a, $desktopmode = true)
                        echo json_encode(['picture' => $picture]);
                        killme();
                }
-               logger("upload done", LOGGER_DEBUG);
+               Logger::log("upload done", Logger::DEBUG);
                return $picture;
        }
 
-       logger("upload done", LOGGER_DEBUG);
+       Logger::log("upload done", Logger::DEBUG);
 
        if ($r_json) {
                echo json_encode(['ok' => true]);