1
0

Allow strict media directory selection by toggle filter

This commit is contained in:
Ian
2015-10-15 18:43:01 +02:00
parent d130dc729e
commit 7554623cff
4 changed files with 36 additions and 1 deletions

View File

@ -1450,6 +1450,14 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
$extraParems = serendipity_generateImageSelectorParems();
$rootDirStrict = false; // default
if (!isset($serendipity['COOKIE']['serendipity_toggle_dir'])) {
$serendipity['COOKIE']['serendipity_toggle_dir'] = 'no';
}
serendipity_restoreVar($serendipity['GET']['toggle_dir'], $serendipity['COOKIE']['serendipity_toggle_dir']);
if ($serendipity['GET']['toggle_dir'] == 'yes') {
$rootDirStrict = true;
}
$serendipity['GET']['only_path'] = serendipity_uploadSecure($limit_path . $serendipity['GET']['only_path'], true);
$serendipity['GET']['only_filename'] = serendipity_specialchars(str_replace(array('*', '?'), array('%', '_'), $serendipity['GET']['only_filename']));
@ -1601,7 +1609,8 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
(isset($serendipity['GET']['only_path']) ? $serendipity['GET']['only_path'] : ''),
(isset($serendipity['GET']['only_filename']) ? $serendipity['GET']['only_filename'] : ''),
(isset($serendipity['GET']['keywords']) ? $serendipity['GET']['keywords'] : ''),
(isset($serendipity['GET']['filter']) ? $serendipity['GET']['filter'] : '')
(isset($serendipity['GET']['filter']) ? $serendipity['GET']['filter'] : ''),
$rootDirStrict
);
$pages = ceil($totalImages / $perPage);