Permalink
Browse files

MDL-20901 fixed input validationand removed annoying redirect which m…

…ust not be clicked during course import
  • Loading branch information...
1 parent a8adf25 commit 4d93b2059f881095a431653f5329f75a558f07d4 @skodak skodak committed Nov 19, 2009
Showing with 6 additions and 4 deletions.
  1. +2 −0 backup/restore.php
  2. +1 −0 backup/restore_check.html
  3. +3 −4 backup/restorelib.php
View
@@ -154,6 +154,7 @@
if (!empty($SESSION->restore->importing)) {
// set up all the config stuff and skip asking the user about it.
restore_setup_for_check($SESSION->restore,$backup_unique_code);
+ require_sesskey();
include_once("restore_execute.html");
} else {
include_once("restore_form.html");
@@ -169,6 +170,7 @@
}
//Unset this for the future
unset($SESSION->cancontinue);
+ require_sesskey();
include_once("restore_execute.html");
}
print_simple_box_end();
@@ -355,6 +355,7 @@
$hidden["launch"] = "execute";
$hidden["file"] = $file;
$hidden["id"] = $id;
+ $hidden["sesskey"] = sesskey();
print_string('longtimewarning','admin');
View
@@ -7804,10 +7804,9 @@ function restore_precheck($id,$file,&$errorstr,$noredirect=false) {
}
else {
if (empty($noredirect)) {
- // in 2.0 we must not print "Continue" redirect link here, because ppl click on it and the execution gets interrupted on next page!!!
- // imo RESTORE_SILENTLY is an ugly hack :-P
- $sillystr = get_string('donotclickcontinue');
- redirect($CFG->wwwroot.'/backup/restore.php?backup_unique_code='.$backup_unique_code.'&launch=form&file='.$file.'&id='.$id, $sillystr, 0);
+ print_continue($CFG->wwwroot.'/backup/restore.php?backup_unique_code='.$backup_unique_code.'&launch=form&file='.$file.'&id='.$id.'&sesskey='.sesskey());
+ print_footer();
+ die;
} else {
return $backup_unique_code;

0 comments on commit 4d93b20

Please sign in to comment.