*/
use Friendica\App;
+use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Session;
use Friendica\Core\System;
-use Friendica\Core\Config;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
use Friendica\Model\Photo;
+use Friendica\Model\User;
use Friendica\Object\Image;
+use Friendica\Util\Images;
+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'])) : '');
+ $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`
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();
+ exit();
}
return;
}
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 {
if ($r_json) {
echo json_encode(['error' => L10n::t('Invalid request.')]);
- killme();
+ exit();
}
return;
}
$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'] == User::PAGE_FLAGS_COMMUNITY) ? true : false);
if ((local_user()) && (local_user() == $page_owner_uid)) {
$can_post = true;
- } else {
- if ($community_page && remote_user()) {
- $contact_id = 0;
- if (is_array($_SESSION['remote'])) {
- foreach ($_SESSION['remote'] as $v) {
- if ($v['uid'] == $page_owner_uid) {
- $contact_id = $v['cid'];
- break;
- }
- }
- }
-
- if ($contact_id) {
- $r = q("SELECT `uid` FROM `contact`
- WHERE `blocked` = 0 AND `pending` = 0
- AND `id` = %d AND `uid` = %d LIMIT 1",
- intval($contact_id),
- intval($page_owner_uid)
- );
- if (DBM::is_result($r)) {
- $can_post = true;
- $visitor = $contact_id;
- }
- }
+ } elseif ($community_page && !empty(Session::getRemoteContactID($page_owner_uid))) {
+ $contact_id = Session::getRemoteContactID($page_owner_uid);
+
+ $r = q("SELECT `uid` FROM `contact`
+ WHERE `blocked` = 0 AND `pending` = 0
+ AND `id` = %d AND `uid` = %d LIMIT 1",
+ intval($contact_id),
+ intval($page_owner_uid)
+ );
+ if (DBA::isResult($r)) {
+ $can_post = true;
+ $visitor = $contact_id;
}
}
-
if (!$can_post) {
if ($r_json) {
echo json_encode(['error' => L10n::t('Permission denied.')]);
- killme();
+ exit();
}
notice(L10n::t('Permission denied.') . EOL);
- killme();
+ exit();
}
- 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.')]);
}
- killme();
+ exit();
}
$src = '';
$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];
if ($src == "") {
if ($r_json) {
echo json_encode(['error' => L10n::t('Invalid request.')]);
- killme();
+ exit();
}
notice(L10n::t('Invalid request.').EOL);
- killme();
+ exit();
}
// This is a special treatment for picture upload from Twidere
}
if ($filetype == "") {
- $filetype = Image::guessType($filename);
+ $filetype = Images::guessType($filename);
}
// If there is a temp name, then do a manual check
$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 {
echo $msg. EOL;
}
@unlink($src);
- killme();
+ exit();
}
$imagedata = @file_get_contents($src);
echo $msg. EOL;
}
@unlink($src);
- killme();
+ exit();
}
$Image->orient($src);
}
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();
$height = $Image->getHeight();
- $hash = Photo::newResource();
+ $resource_id = Photo::newResource();
$smallest = 0;
$defperm = '<' . $default_cid . '>';
- $r = Photo::store($Image, $page_owner_uid, $visitor, $hash, $filename, $album, 0, 0, $defperm);
+ $r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 0, 0, $defperm);
if (!$r) {
$msg = L10n::t('Image upload failed.');
} else {
echo $msg. EOL;
}
- killme();
+ exit();
}
if ($width > 640 || $height > 640) {
$Image->scaleDown(640);
- $r = Photo::store($Image, $page_owner_uid, $visitor, $hash, $filename, $album, 1, 0, $defperm);
+ $r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 1, 0, $defperm);
if ($r) {
$smallest = 1;
}
if ($width > 320 || $height > 320) {
$Image->scaleDown(320);
- $r = Photo::store($Image, $page_owner_uid, $visitor, $hash, $filename, $album, 2, 0, $defperm);
+ $r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 2, 0, $defperm);
if ($r && ($smallest == 0)) {
$smallest = 2;
}
}
- $basename = basename($filename);
-
if (!$desktopmode) {
$r = q("SELECT `id`, `datasize`, `width`, `height`, `type` FROM `photo`
WHERE `resource-id` = '%s'
ORDER BY `width` DESC LIMIT 1",
- $hash
+ $resource_id
);
if (!$r) {
if ($r_json) {
echo json_encode(['error' => '']);
- killme();
+ exit();
}
return false;
}
$picture["width"] = $r[0]["width"];
$picture["height"] = $r[0]["height"];
$picture["type"] = $r[0]["type"];
- $picture["albumpage"] = System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $hash;
- $picture["picture"] = System::baseUrl() . "/photo/{$hash}-0." . $Image->getExt();
- $picture["preview"] = System::baseUrl() . "/photo/{$hash}-{$smallest}." . $Image->getExt();
+ $picture["albumpage"] = System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id;
+ $picture["picture"] = System::baseUrl() . "/photo/{$resource_id}-0." . $Image->getExt();
+ $picture["preview"] = System::baseUrl() . "/photo/{$resource_id}-{$smallest}." . $Image->getExt();
if ($r_json) {
echo json_encode(['picture' => $picture]);
- killme();
+ exit();
}
- 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]);
- killme();
+ exit();
}
- echo "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . System::baseUrl() . "/photo/{$hash}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n";
- killme();
+ echo "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id . '][img]' . System::baseUrl() . "/photo/{$resource_id}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n";
+ exit();
// NOTREACHED
}
projects / friendica.git / blobdiff