From 8ef1e12f74eff9377e8a9b62f12e5ef6880c28d2 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Tue, 28 Sep 2004 08:05:18 +0000
Subject: [PATCH] Merged fix for unclean oldname from renaming ... from stable.

---
 files/index.php              | 3 ++-
 lib/editor/coursefiles.php   | 3 ++-
 mod/resource/coursefiles.php | 3 ++-
 mod/scorm/coursefiles.php    | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/files/index.php b/files/index.php
index d9a8410f716..e0b3d2beca7 100644
--- 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 aa4563281ae..9f6bd9445b7 100644
--- 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 ceb50677c27..1e0cf8d202f 100644
--- 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 e944666d310..68130aca546 100755
--- 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)) {