Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merged fix for unclean oldname from renaming ... from stable.
  • Loading branch information
moodler committed Sep 28, 2004
1 parent 7a5672c commit 8ef1e12
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion files/index.php
Expand Up @@ -210,7 +210,8 @@ function html_header($course, $wdir, $formfield=""){
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)) {
Expand Down
3 changes: 2 additions & 1 deletion lib/editor/coursefiles.php
Expand Up @@ -298,7 +298,8 @@ function reset_value() {
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)) {
Expand Down
3 changes: 2 additions & 1 deletion mod/resource/coursefiles.php
Expand Up @@ -217,7 +217,8 @@ function set_value(txt) {
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)) {
Expand Down
3 changes: 2 additions & 1 deletion mod/scorm/coursefiles.php
Expand Up @@ -217,7 +217,8 @@ function set_value(txt) {
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)) {
Expand Down

0 comments on commit 8ef1e12

Please sign in to comment.