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) {
+function wall_upload_post(App $a, $desktopmode = true)
+{
+ Logger::log("wall upload: starting new upload", Logger::DEBUG);
- logger("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.')]);
+ echo json_encode(['error' => L10n::t('Invalid request.')]);
killme();
}
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.')]);
+ echo json_encode(['error' => L10n::t('Invalid request.')]);
killme();
}
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'] == Contact::PAGE_COMMUNITY) ? true : false);
if ((local_user()) && (local_user() == $page_owner_uid)) {
$can_post = true;
intval($contact_id),
intval($page_owner_uid)
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$can_post = true;
$visitor = $contact_id;
}
}
- if (! $can_post) {
+ if (!$can_post) {
if ($r_json) {
- echo json_encode(['error'=>L10n::t('Permission denied.')]);
+ echo json_encode(['error' => L10n::t('Permission denied.')]);
killme();
}
notice(L10n::t('Permission denied.') . EOL);
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.')]);
+ echo json_encode(['error' => L10n::t('Invalid request.')]);
}
killme();
}
$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')) {
- if (is_array($_FILES['media']['tmp_name'])) {
- $src = $_FILES['media']['tmp_name'][0];
- } else {
- $src = $_FILES['media']['tmp_name'];
+ } elseif (!empty($_FILES['media'])) {
+ if (!empty($_FILES['media']['tmp_name'])) {
+ if (is_array($_FILES['media']['tmp_name'])) {
+ $src = $_FILES['media']['tmp_name'][0];
+ } else {
+ $src = $_FILES['media']['tmp_name'];
+ }
}
- if (is_array($_FILES['media']['name'])) {
- $filename = basename($_FILES['media']['name'][0]);
- } else {
- $filename = basename($_FILES['media']['name']);
+ if (!empty($_FILES['media']['name'])) {
+ if (is_array($_FILES['media']['name'])) {
+ $filename = basename($_FILES['media']['name'][0]);
+ } else {
+ $filename = basename($_FILES['media']['name']);
+ }
}
- if (is_array($_FILES['media']['size'])) {
- $filesize = intval($_FILES['media']['size'][0]);
- } else {
- $filesize = intval($_FILES['media']['size']);
+ if (!empty($_FILES['media']['size'])) {
+ if (is_array($_FILES['media']['size'])) {
+ $filesize = intval($_FILES['media']['size'][0]);
+ } else {
+ $filesize = intval($_FILES['media']['size']);
+ }
}
- if (is_array($_FILES['media']['type'])) {
- $filetype = $_FILES['media']['type'][0];
- } else {
- $filetype = $_FILES['media']['type'];
+ if (!empty($_FILES['media']['type'])) {
+ if (is_array($_FILES['media']['type'])) {
+ $filetype = $_FILES['media']['type'][0];
+ } else {
+ $filetype = $_FILES['media']['type'];
+ }
}
}
- if ($src=="") {
+ if ($src == "") {
if ($r_json) {
- echo json_encode(['error'=>L10n::t('Invalid request.')]);
+ echo json_encode(['error' => L10n::t('Invalid request.')]);
killme();
}
notice(L10n::t('Invalid request.').EOL);
$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]);
+ echo json_encode(['error' => $msg]);
} else {
echo $msg. EOL;
}
$imagedata = @file_get_contents($src);
$Image = new Image($imagedata, $filetype);
- if (! $Image->isValid()) {
+ if (!$Image->isValid()) {
$msg = L10n::t('Unable to process image.');
if ($r_json) {
- echo json_encode(['error'=>$msg]);
+ echo json_encode(['error' => $msg]);
} else {
echo $msg. EOL;
}
@unlink($src);
$max_length = Config::get('system', 'max_image_length');
- if (! $max_length) {
+ if (!$max_length) {
$max_length = MAX_IMAGE_LENGTH;
}
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_new_resource();
+ $hash = Photo::newResource();
$smallest = 0;
// If we don't have an album name use the Wall Photos album
- if (! strlen($album)) {
+ if (!strlen($album)) {
$album = L10n::t('Wall Photos');
}
$r = Photo::store($Image, $page_owner_uid, $visitor, $hash, $filename, $album, 0, 0, $defperm);
- if (! $r) {
+ if (!$r) {
$msg = L10n::t('Image upload failed.');
if ($r_json) {
- echo json_encode(['error'=>$msg]);
+ echo json_encode(['error' => $msg]);
} else {
echo $msg. EOL;
}
);
if (!$r) {
if ($r_json) {
- echo json_encode(['error'=>'']);
+ echo json_encode(['error' => '']);
killme();
}
return false;
$picture["preview"] = System::baseUrl() . "/photo/{$hash}-{$smallest}." . $Image->getExt();
if ($r_json) {
- echo json_encode(['picture'=>$picture]);
+ echo json_encode(['picture' => $picture]);
killme();
}
+ Logger::log("upload done", Logger::DEBUG);
return $picture;
}
+ Logger::log("upload done", Logger::DEBUG);
if ($r_json) {
- echo json_encode(['ok'=>true]);
+ echo json_encode(['ok' => true]);
killme();
}
-/* mod Waitman Gobble NO WARRANTY */
- // if we get the signal then return the image url info in BBCODE
- if ($_REQUEST['hush']!='yeah') {
- echo "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . System::baseUrl() . "/photo/{$hash}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n";
- } else {
- $m = '[url='.System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash.'][img]'.System::baseUrl()."/photo/{$hash}-{$smallest}.".$Image->getExt()."[/img][/url]";
- return($m);
- }
-/* mod Waitman Gobble NO WARRANTY */
-
+ 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();
// NOTREACHED
}