From 2a3d9720d186ec0ff98bd202015410f4af7fd14e Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Sat, 15 Feb 2014 22:56:10 +0200
Subject: [PATCH] Monstra automatically rename files Issue #231

---
 plugins/box/filesmanager/filesmanager.admin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/box/filesmanager/filesmanager.admin.php b/plugins/box/filesmanager/filesmanager.admin.php
index 1140136..7157ce4 100755
--- a/plugins/box/filesmanager/filesmanager.admin.php
+++ b/plugins/box/filesmanager/filesmanager.admin.php
@@ -115,7 +115,7 @@ class FilesmanagerAdmin extends Backend
                 }
 
                 $ext = ($rename_type === 'file') ? '.'. File::ext($rename_from) : '';
-                $rename_to = $files_path . Security::safeName($rename_to).$ext;
+                $rename_to = $files_path . Security::safeName($rename_to, null, false).$ext;
 
                 if (is_dir($rename_to)) {
                     Notification::set('error', __('Directory exists', 'filesmanager'));
@@ -148,7 +148,7 @@ class FilesmanagerAdmin extends Backend
                 $error = false;
                 if ($_FILES['file']) {
                     if ( ! in_array(File::ext($_FILES['file']['name']), $forbidden_types)) {
-                        $filepath = $files_path.Security::safeName(basename($_FILES['file']['name'], File::ext($_FILES['file']['name'])), '-', true).'.'.File::ext($_FILES['file']['name']);
+                        $filepath = $files_path.Security::safeName(basename($_FILES['file']['name'], File::ext($_FILES['file']['name'])), null, false).'.'.File::ext($_FILES['file']['name']);
                         $uploaded = move_uploaded_file($_FILES['file']['tmp_name'], $filepath);
                         if ($uploaded !== false && is_file($filepath)) {
                             Notification::set('success', __('File was uploaded', 'filesmanager'));
@@ -180,7 +180,7 @@ class FilesmanagerAdmin extends Backend
             
             if (Security::check(Request::post('csrf'))) {
                 
-                $abs_path = $files_path . Security::safeName(Request::post('directory_name'));
+                $abs_path = $files_path . Security::safeName(Request::post('directory_name'), null, false);
                 
                 $error = false;