if (!DBA::isResult($r)) {
notice(DI::l10n()->t('Album not found.') . EOL);
- DI::baseUrl()->redirect($_SESSION['photo_return']);
+ DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname'] . '/album');
return; // NOTREACHED
}
// Check if the user has responded to a delete confirmation query
if (!empty($_REQUEST['canceled'])) {
- DI::baseUrl()->redirect($_SESSION['photo_return']);
+ DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname'] . '/album/' . $a->argv[3]);
}
// RENAME photo album
}
}
- DI::baseUrl()->redirect('photos/' . $a->argv[1]);
+ DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname'] . '/album');
}
if ($a->argc > 3 && $a->argv[2] === 'image') {
$desc = !empty($_POST['desc']) ? Strings::escapeTags(trim($_POST['desc'])) : '';
$rawtags = !empty($_POST['newtag']) ? Strings::escapeTags(trim($_POST['newtag'])) : '';
$item_id = !empty($_POST['item_id']) ? intval($_POST['item_id']) : 0;
- $albname = !empty($_POST['albname']) ? Strings::escapeTags(trim($_POST['albname'])) : '';
+ $albname = !empty($_POST['albname']) ? trim($_POST['albname']) : '';
$origaname = !empty($_POST['origaname']) ? Strings::escapeTags(trim($_POST['origaname'])) : '';
$aclFormatter = DI::aclFormatter();
Hook::callAll('photo_post_init', $_POST);
// Determine the album to use
- $album = !empty($_REQUEST['album']) ? Strings::escapeTags(trim($_REQUEST['album'])) : '';
- $newalbum = !empty($_REQUEST['newalbum']) ? Strings::escapeTags(trim($_REQUEST['newalbum'])) : '';
+ $album = trim($_REQUEST['album'] ?? '');
+ $newalbum = trim($_REQUEST['newalbum'] ?? '');
- Logger::log('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , Logger::DEBUG);
+ Logger::info('album= ' . $album . ' newalbum= ' . $newalbum);
if (!strlen($album)) {
if (strlen($newalbum)) {
return;
}
- if ($type == "") {
- $type = Images::guessType($filename);
- }
+ $type = Images::getMimeTypeBySource($src, $filename, $type);
Logger::log('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', Logger::DEBUG);