Merged fix for unclean oldname from renaming ... from stable.

diff --git a/files/index.php b/files/index.php
index d9a8410f71691b69023133e804e6be40acd1c57b..e0b3d2beca769a17b548ac62e116f2c7b9d33f38 100644 (file)
--- a/files/index.php
+++ b/files/index.php
@@ -210,7 +210,8 @@
         case "rename":
             if (!empty($name)) {
                 html_header($course, $wdir);
-                $name = clean_filename($name);
+                $name    = clean_filename($name);
+                $oldname = clean_filename($oldname);
                 if (file_exists($basedir.$wdir."/".$name)) {
                     echo "Error: $name already exists!";
                 } else if (!rename($basedir.$wdir."/".$oldname, $basedir.$wdir."/".$name)) {

diff --git a/lib/editor/coursefiles.php b/lib/editor/coursefiles.php
index aa4563281ae058f2515b894aca9acebdc06d6c8b..9f6bd9445b78fab3d0bb2c0f5b661d27a6384ffd 100644 (file)
--- a/lib/editor/coursefiles.php
+++ b/lib/editor/coursefiles.php
@@ -298,7 +298,8 @@
         case "rename":
             if (!empty($name)) {
                 html_header($course, $wdir);
-                $name = clean_filename($name);
+                $name    = clean_filename($name);
+                $oldname = clean_filename($oldname);
                 if (file_exists($basedir.$wdir."/".$name)) {
                     echo "Error: $name already exists!";
                 } else if (!rename($basedir.$wdir."/".$oldname, $basedir.$wdir."/".$name)) {

diff --git a/mod/resource/coursefiles.php b/mod/resource/coursefiles.php
index ceb50677c27aac0117bade6d39245ac5903c53fe..1e0cf8d202f34fe267d77383e74716c49d6b2a46 100644 (file)
--- a/mod/resource/coursefiles.php
+++ b/mod/resource/coursefiles.php
@@ -217,7 +217,8 @@
         case "rename":
             if (!empty($name)) {
                 html_header($course, $wdir);
-                $name = clean_filename($name);
+                $name    = clean_filename($name);
+                $oldname = clean_filename($oldname);
                 if (file_exists($basedir.$wdir."/".$name)) {
                     echo "Error: $name already exists!";
                 } else if (!rename($basedir.$wdir."/".$oldname, $basedir.$wdir."/".$name)) {

diff --git a/mod/scorm/coursefiles.php b/mod/scorm/coursefiles.php
index e944666d31045e4986cb67897f8050be5148923f..68130aca5468312ca41e55544075e24804556d95 100755 (executable)
--- a/mod/scorm/coursefiles.php
+++ b/mod/scorm/coursefiles.php
@@ -217,7 +217,8 @@
         case "rename":
             if (!empty($name)) {
                 html_header($course, $wdir);
-                $name = clean_filename($name);
+                $name    = clean_filename($name);
+                $oldname = clean_filename($oldname);
                 if (file_exists($basedir.$wdir."/".$name)) {
                     echo "Error: $name already exists!";
                 } else if (!rename($basedir.$wdir."/".$oldname, $basedir.$wdir."/".$name)) {