X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_upload.php;h=89655981ea9a090f9f0cf993703459e72df612c2;hb=a16e8d97f6c2935d5a5e136362a698580db4c64a;hp=84e40d3b56e643542a8063ec5a75344c480bf790;hpb=2f28c2ebbfd8f66093d7081d40b1d48f65fcff20;p=friendica.git diff --git a/mod/wall_upload.php b/mod/wall_upload.php index 84e40d3b56..89655981ea 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -17,16 +17,17 @@ 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::log("wall upload: starting new upload", Logger::DEBUG); - $r_json = (x($_GET, 'response') && $_GET['response'] == 'json'); - $album = (x($_GET, 'album') ? notags(trim($_GET['album'])) : ''); + $r_json = (!empty($_GET['response']) && $_GET['response'] == 'json'); + $album = (!empty($_GET['album']) ? Strings::escapeTags(trim($_GET['album'])) : ''); if ($a->argc > 1) { - if (!x($_FILES, 'media')) { + if (empty($_FILES['media'])) { $nick = $a->argv[1]; $r = q("SELECT `user`.*, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid` @@ -109,7 +110,7 @@ function wall_upload_post(App $a, $desktopmode = true) killme(); } - if (!x($_FILES, 'userfile') && !x($_FILES, 'media')) { + if (empty($_FILES['userfile']) && empty($_FILES['media'])) { if ($r_json) { echo json_encode(['error' => L10n::t('Invalid request.')]); } @@ -120,13 +121,13 @@ function wall_upload_post(App $a, $desktopmode = true) $filename = ''; $filesize = 0; $filetype = ''; - if (x($_FILES, 'userfile')) { + if (!empty($_FILES['userfile'])) { $src = $_FILES['userfile']['tmp_name']; $filename = basename($_FILES['userfile']['name']); $filesize = intval($_FILES['userfile']['size']); $filetype = $_FILES['userfile']['type']; - } elseif (x($_FILES, 'media')) { + } elseif (!empty($_FILES['media'])) { if (!empty($_FILES['media']['tmp_name'])) { if (is_array($_FILES['media']['tmp_name'])) { $src = $_FILES['media']['tmp_name'][0]; @@ -193,7 +194,7 @@ function wall_upload_post(App $a, $desktopmode = true) $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 {