stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-19 19:09:13 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve the way server add deals with wacky directory names. Fixes #1857.

Browse Source
This commit is contained in:
Bharat Mediratta
2012-05-11 15:58:33 -07:00
parent 4fcfe75cbb
commit ca037dc955
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/server_add/controllers/admin_server_add.php
View File

@@ -35,12 +35,12 @@ class Admin_Server_Add_Controller extends Admin_Controller {
$form = $this->_get_admin_form();
$paths = unserialize(module::get_var("server_add", "authorized_paths", "a:0:{}"));
if ($form->validate()) {
if (is_link($form->add_path->path->value)) {
$path = html_entity_decode($form->add_path->path->value);
if (is_link($path)) {
$form->add_path->path->add_error("is_symlink", 1);
} else if (!is_readable($form->add_path->path->value)) {
} else if (!is_readable($path)) {
$form->add_path->path->add_error("not_readable", 1);
} else {
$path = $form->add_path->path->value;
$paths[$path] = 1;
module::set_var("server_add", "authorized_paths", serialize($paths));
message::success(t("Added path %path", array("path" => $path)));
@@ -75,7 +75,7 @@ class Admin_Server_Add_Controller extends Admin_Controller {
$path_prefix = Input::instance()->get("q");
foreach (glob("{$path_prefix}*") as $file) {
if (is_dir($file) && !is_link($file)) {
$directories[] = $file;
$directories[] = html::clean($file);
}
}