Modify sesskey behaviour. SC#73

diff --git a/course/mod.php b/course/mod.php
index 5f3be7994abced00ed87e5ce6bc71c9dc95c4927..e87056ef9573ee8fe3811087f7ac90a8dd233cad 100644 (file)
--- a/course/mod.php
+++ b/course/mod.php
@@ -25,15 +25,7 @@
     }
 
 
-    if (isset($_POST["course"])) {    // add or update form submitted
-
-        //It caller is correct, $SESSION->sesskey must exist and coincide
-        if (empty($SESSION->sesskey) or !confirm_sesskey($SESSION->sesskey)) {
-            error(get_string('confirmsesskeybad', 'error'));
-        }
-
-        //Unset this, check done
-        unset($SESSION->sesskey);
+    if (isset($_POST["course"]) and confirm_sesskey()) {    // add or update form submitted
 
         if (!$course = get_record("course", "id", $mod->course)) {
             error("This course doesn't exist");
@@ -421,7 +413,7 @@
         $form->modulename   = $module->name;
         $form->fullmodulename  = $fullmodulename;
         $form->instancename = $instance->name;
-        $SESSION->sesskey = !empty($USER->id) ? $USER->sesskey : '';
+        $form->sesskey      = !empty($USER->id) ? $USER->sesskey : '';
 
         $strdeletecheck = get_string("deletecheck", "", "$form->fullmodulename");
         $strdeletecheckfull = get_string("deletecheckfull", "", "$form->fullmodulename '$form->instancename'");
@@ -475,7 +467,7 @@
         $form->modulename   = $module->name;
         $form->instance     = $cm->instance;
         $form->mode         = "update";
-        $SESSION->sesskey = !empty($USER->id) ? $USER->sesskey : '';
+        $form->sesskey      = !empty($USER->id) ? $USER->sesskey : '';
 
         $sectionname    = get_string("name$course->format");
         $fullmodulename = strtolower(get_string("modulename", $module->name));
@@ -527,7 +519,7 @@
         $form->modulename   = $module->name;
         $form->instance     = $cm->instance;
         $form->mode         = "add";
-        $SESSION->sesskey = !empty($USER->id) ? $USER->sesskey : '';
+        $form->sesskey      = !empty($USER->id) ? $USER->sesskey : '';
 
         $sectionname    = get_string("name$course->format");
         $fullmodulename = strtolower(get_string("modulename", $module->name));
@@ -566,7 +558,7 @@
         $form->instance   = "";
         $form->coursemodule = "";
         $form->mode       = "add";
-        $SESSION->sesskey = !empty($USER->id) ? $USER->sesskey : '';
+        $form->sesskey    = !empty($USER->id) ? $USER->sesskey : '';
         if (isset($_GET['type'])) {
             $form->type = $_GET['type'];
         }

diff --git a/course/mod_delete.html b/course/mod_delete.html
index 5bad6f3230938ad60aaa924e04e903208b14826a..8670c0784d2a6e3e80a4b9a9f6944a2cbcb7ca7f 100644 (file)
--- a/course/mod_delete.html
+++ b/course/mod_delete.html
@@ -3,6 +3,7 @@
 <input type="hidden" name="mode"         value="delete" />
 <input type="hidden" name="section"      value="<?php p($form->section) ?>" />
 <input type="hidden" name="course"       value="<?php p($form->course) ?>" />
+<input type="hidden" name="sesskey"      value="<?php p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule" value="<?php p($form->coursemodule) ?>" />
 <input type="hidden" name="modulename"   value="<?php p($form->modulename) ?>" />
 <input type="hidden" name="instance"     value="<?php p($form->instance) ?>" />

diff --git a/mod/assignment/mod.html b/mod/assignment/mod.html
index a69c7295a456b28a24b572798b4845fdba6eef60..3f48b5a0e0ea951e3b58911aa20e1bc05be133e5 100644 (file)
--- a/mod/assignment/mod.html
+++ b/mod/assignment/mod.html
@@ -129,6 +129,7 @@
 <br />
 <center>
 <input type="hidden" name="course"        value="<?php p($form->course) ?>" />
+<input type="hidden" name="sesskey"       value="<?php p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule"  value="<?php p($form->coursemodule) ?>" />
 <input type="hidden" name="section"       value="<?php p($form->section) ?>" />
 <input type="hidden" name="module"        value="<?php p($form->module) ?>" />

diff --git a/mod/attendance/mod.html b/mod/attendance/mod.html
index de03351dc5f330ce26561cfba6d43ab27ee44984..0fc773b285965d3c5665d493659bdef5c954ec55 100755 (executable)
--- a/mod/attendance/mod.html
+++ b/mod/attendance/mod.html
@@ -201,6 +201,7 @@ if ($form->hours >1) {
 ?>
 <!-- These hidden variables are always the same -->
 <input type="hidden" name="course"        value="<?php p($form->course) ?>" />
+<input type="hidden" name="sesskey"       value="<?php p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule"  value="<?php p($form->coursemodule) ?>" />
 <input type="hidden" name="section"       value="<?php p($form->section) ?>" />
 <input type="hidden" name="module"        value="<?php p($form->module) ?>" />

diff --git a/mod/chat/mod.html b/mod/chat/mod.html
index 43885d7ab90849f1c3366dcaaa20b6ab9f7cb853..34d10732ea3290321df65911a887c15c7db3d426 100644 (file)
--- a/mod/chat/mod.html
+++ b/mod/chat/mod.html
@@ -96,8 +96,9 @@
 </table>
 <center>
 <input type="hidden" name="course"     value="<?php  p($form->course) ?>" />
+<input type="hidden" name="sesskey"    value="<?php  p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule"  value="<?php  p($form->coursemodule) ?>" />
-<input type="hidden" name="section"       value="<?php  p($form->section) ?>" />
+<input type="hidden" name="section"    value="<?php  p($form->section) ?>" />
 <input type="hidden" name="module"     value="<?php  p($form->module) ?>" />
 <input type="hidden" name="modulename" value="<?php  p($form->modulename) ?>" />
 <input type="hidden" name="instance"   value="<?php  p($form->instance) ?>" />

diff --git a/mod/choice/mod.html b/mod/choice/mod.html
index a60a1fd6970ce60d270a4195e8cd66cd630dcca4..b4fab5289ac3c0e2842bb7eda5754e181e0ba3b8 100644 (file)
--- a/mod/choice/mod.html
+++ b/mod/choice/mod.html
@@ -262,8 +262,9 @@
 
 <center>
 <input type="hidden" name="course"     value="<?php p($form->course) ?>" />
+<input type="hidden" name="sesskey"    value="<?php p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule"  value="<?php p($form->coursemodule) ?>" />
-<input type="hidden" name="section"       value="<?php p($form->section) ?>" />
+<input type="hidden" name="section"    value="<?php p($form->section) ?>" />
 <input type="hidden" name="module"     value="<?php p($form->module) ?>" />
 <input type="hidden" name="modulename" value="<?php p($form->modulename) ?>" />
 <input type="hidden" name="instance"   value="<?php p($form->instance) ?>" />

diff --git a/mod/dialogue/mod.html b/mod/dialogue/mod.html
index 94c82bb9bb6987d4bb841f10d97c9cab50f7eb3c..c37949c3f1f9cd1b1d6b0a4b03992b94850343a4 100644 (file)
--- a/mod/dialogue/mod.html
+++ b/mod/dialogue/mod.html
@@ -96,8 +96,9 @@ print_heading_with_help(get_string("furtherinformation", "dialogue"), "info", "d
 </table>
 <center>
 <input type="hidden" name="course"     value="<?php p($form->course) ?>" />
+<input type="hidden" name="sesskey"    value="<?php p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule"  value="<?php p($form->coursemodule) ?>" />
-<input type="hidden" name="section"       value="<?php p($form->section) ?>" />
+<input type="hidden" name="section"    value="<?php p($form->section) ?>" />
 <input type="hidden" name="module"     value="<?php p($form->module) ?>" />
 <input type="hidden" name="modulename" value="<?php p($form->modulename) ?>" />
 <input type="hidden" name="instance"   value="<?php p($form->instance) ?>" />

diff --git a/mod/exercise/mod.html b/mod/exercise/mod.html
index 578ccb1de843c4e0cbb673a683fb0f3a0af39df3..2661f87ca45b2c1d38887666e7456378c5404257 100644 (file)
--- a/mod/exercise/mod.html
+++ b/mod/exercise/mod.html
@@ -214,8 +214,9 @@
 
 <center>
 <input type="hidden" name="course"     value="<?php  p($form->course) ?>" />
+<input type="hidden" name="sesskey"    value="<?php  p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule"  value="<?php  p($form->coursemodule) ?>" />
-<input type="hidden" name="section"       value="<?php  p($form->section) ?>" />
+<input type="hidden" name="section"    value="<?php  p($form->section) ?>" />
 <input type="hidden" name="module"     value="<?php  p($form->module) ?>" />
 <input type="hidden" name="modulename" value="<?php  p($form->modulename) ?>" />
 <input type="hidden" name="instance"   value="<?php  p($form->instance) ?>" />

diff --git a/mod/forum/mod.html b/mod/forum/mod.html
index cff981a64a50b56144be1950f9d6fc88d5014233..eb4d30f5652a1ebb8893666a0697249c3a34c370 100644 (file)
--- a/mod/forum/mod.html
+++ b/mod/forum/mod.html
@@ -268,8 +268,9 @@
 </table>
 <center>
 <input type="hidden" name="course"     value="<?php  p($form->course) ?>" />
+<input type="hidden" name="sesskey"    value="<?php  p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule"  value="<?php  p($form->coursemodule) ?>" />
-<input type="hidden" name="section"       value="<?php  p($form->section) ?>" />
+<input type="hidden" name="section"    value="<?php  p($form->section) ?>" />
 <input type="hidden" name="module"     value="<?php  p($form->module) ?>" />
 <input type="hidden" name="modulename" value="<?php  p($form->modulename) ?>" />
 <input type="hidden" name="instance"   value="<?php  p($form->instance) ?>" />

diff --git a/mod/glossary/mod.html b/mod/glossary/mod.html
index 1bf1609c8f8f8827486bbbe6b3e3c7794a3cf941..bd0baea6c98f569b8c21180b619e61f170f471f9 100644 (file)
--- a/mod/glossary/mod.html
+++ b/mod/glossary/mod.html
@@ -504,6 +504,7 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
 </table>
 <!-- These hidden variables are always the same -->
 <input type="hidden" name="course"        value="<?php p($form->course) ?>" />
+<input type="hidden" name="sesskey"       value="<?php p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule"  value="<?php p($form->coursemodule) ?>" />
 <input type="hidden" name="section"       value="<?php p($form->section) ?>" />
 <input type="hidden" name="module"        value="<?php p($form->module) ?>" />

diff --git a/mod/journal/mod.html b/mod/journal/mod.html
index 3acf866d7c7352b65a78375e6a510ffc14086189..20a418717abb8e035e63e25610ff2f3d50efe82c 100644 (file)
--- a/mod/journal/mod.html
+++ b/mod/journal/mod.html
@@ -95,8 +95,9 @@
 </table>
 <center>
 <input type="hidden" name="course"     value="<?php p($form->course) ?>" />
+<input type="hidden" name="sesskey"    value="<?php p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule"  value="<?php p($form->coursemodule) ?>" />
-<input type="hidden" name="section"       value="<?php p($form->section) ?>" />
+<input type="hidden" name="section"    value="<?php p($form->section) ?>" />
 <input type="hidden" name="module"     value="<?php p($form->module) ?>" />
 <input type="hidden" name="modulename" value="<?php p($form->modulename) ?>" />
 <input type="hidden" name="instance"   value="<?php p($form->instance) ?>" />

diff --git a/mod/label/mod.html b/mod/label/mod.html
index 741acef60b8ec99f880f9fa33d09dacaa5c73d4d..863cfd9bc930e2d2df7e0a294bd81982d7c6c45e 100644 (file)
--- a/mod/label/mod.html
+++ b/mod/label/mod.html
@@ -32,6 +32,7 @@
 </table>
 <!-- these hidden variables are always the same -->
 <input type="hidden" name="course"        value="<?php  p($form->course) ?>" />
+<input type="hidden" name="sesskey"       value="<?php  p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule"  value="<?php  p($form->coursemodule) ?>" />
 <input type="hidden" name="section"       value="<?php  p($form->section) ?>" />
 <input type="hidden" name="module"        value="<?php  p($form->module) ?>" />

diff --git a/mod/lesson/mod.html b/mod/lesson/mod.html
index 9564959353c6842cda5727e7e6ff8b81e851c3ed..0bf9e5b0a753f3e907e40891748bcd8bf86bfa78 100644 (file)
--- a/mod/lesson/mod.html
+++ b/mod/lesson/mod.html
@@ -444,6 +444,7 @@ if ($form->mode == "add") {
 </table>
 <!-- These hidden variables are always the same -->
 <input type="hidden" name="course"        value="<?php  p($form->course) ?>" />
+<input type="hidden" name="sesskey"       value="<?php  p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule"  value="<?php  p($form->coursemodule) ?>" />
 <input type="hidden" name="section"       value="<?php  p($form->section) ?>" />
 <input type="hidden" name="module"        value="<?php  p($form->module) ?>" />

diff --git a/mod/quiz/mod.html b/mod/quiz/mod.html
index d8fb9ca39e2322dd1bf638f4ff1b2ea716110fb0..6853ca59abb95ee0b1d7519aa4ada1f051bec1be 100644 (file)
--- a/mod/quiz/mod.html
+++ b/mod/quiz/mod.html
@@ -546,6 +546,7 @@
 
 <!-- these hidden variables are always the same -->
 <input type="hidden" name="course"        value="<?php p($form->course) ?>" />
+<input type="hidden" name="sesskey"       value="<?php p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule"  value="<?php p($form->coursemodule) ?>" />
 <input type="hidden" name="section"       value="<?php p($form->section) ?>" />
 <input type="hidden" name="module"        value="<?php p($form->module) ?>" />
@@ -564,4 +565,4 @@
 
 <script language="javascript" type="text/javascript">
     showhide('optionsettings', true);
-</script> 
\ No newline at end of file
+</script> 

diff --git a/mod/resource/type/common.html b/mod/resource/type/common.html
index 8b8eb8af3902fbde009a79e94dffab92859620d6..34da88273a3179ff94879823a139bf9b0fc4cf60 100644 (file)
--- a/mod/resource/type/common.html
+++ b/mod/resource/type/common.html
@@ -2,6 +2,7 @@
 
 <input type="hidden" name="type"         value="<?php p($form->type) ?>" />
 <input type="hidden" name="course"       value="<?php p($form->course) ?>" />
+<input type="hidden" name="sesskey"      value="<?php p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule" value="<?php p($form->coursemodule) ?>" />
 <input type="hidden" name="section"      value="<?php p($form->section) ?>" />
 <input type="hidden" name="module"       value="<?php p($form->module) ?>" />

diff --git a/mod/scorm/mod.html b/mod/scorm/mod.html
index c66a63d0bc561f73d0f207bf756b80baba845fb9..b36e9389bc04ee875ebf37e9f7cf279d6bbb1381 100755 (executable)
--- a/mod/scorm/mod.html
+++ b/mod/scorm/mod.html
@@ -56,6 +56,7 @@
        </tr>
     </table>
     <input type="hidden" name="course" value="<?php p($form->course) ?>" />
+    <input type="hidden" name="sesskey"        value="<?php p($form->sesskey) ?>" />
     <input type="hidden" name="coursemodule"   value="<?php p($form->coursemodule) ?>" />
     <input type="hidden" name="datadir"        value="<?php p($form->datadir) ?>" />
     <input type="hidden" name="launch" value="<?php p($form->launch) ?>" />

diff --git a/mod/survey/details.php b/mod/survey/details.php
index b93dd358374100f8afaec7a40dfca4b58359bf3a..04b923568c4920bc624c66651d14bcb0f66ff145 100644 (file)
--- a/mod/survey/details.php
+++ b/mod/survey/details.php
@@ -58,8 +58,9 @@
         <input type="hidden" name="template"   value="<?php p($form->template) ?>" />
 
         <input type="hidden" name="course"     value="<?php p($form->course) ?>" />
+        <input type="hidden" name="sesskey"    value="<?php p($form->sesskey) ?>" />
         <input type="hidden" name="coursemodule"     value="<?php p($form->coursemodule) ?>" />
-        <input type="hidden" name="section"       value="<?php p($form->section) ?>" />
+        <input type="hidden" name="section"    value="<?php p($form->section) ?>" />
         <input type="hidden" name="module"     value="<?php p($form->module) ?>" />
         <input type="hidden" name="modulename" value="<?php p($form->modulename) ?>" />
         <input type="hidden" name="instance"   value="<?php p($form->instance) ?>" />

diff --git a/mod/survey/mod.html b/mod/survey/mod.html
index d6c1666761f555bf63ee4752822b7b4feb91f6d4..834c5540bd5ddd948a25f4c5070de9b704d692bc 100644 (file)
--- a/mod/survey/mod.html
+++ b/mod/survey/mod.html
@@ -41,6 +41,7 @@
 <input type="hidden" name="destination"   value="<?php echo "$CFG->wwwroot/course/mod.php" ?>" />
 
 <input type="hidden" name="course"     value="<?php p($form->course) ?>" />
+<input type="hidden" name="sesskey"    value="<?php p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule"  value="<?php p($form->coursemodule) ?>" />
 <input type="hidden" name="section"       value="<?php p($form->section) ?>" />
 <input type="hidden" name="module"     value="<?php p($form->module) ?>" />

diff --git a/mod/wiki/mod.html b/mod/wiki/mod.html
index 17a98a2e439c0561eadadc1652bca6e85a99d267..1bef67c68ae6227f98173ddf3eb9b1d2401bee92 100644 (file)
--- a/mod/wiki/mod.html
+++ b/mod/wiki/mod.html
@@ -207,6 +207,7 @@
 </table>
 <!-- These hidden variables are always the same -->
 <input type="hidden" name="course"        value="<?php  p($form->course) ?>" />
+<input type="hidden" name="sesskey"       value="<?php  p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule"  value="<?php  p($form->coursemodule) ?>" />
 <input type="hidden" name="section"       value="<?php  p($form->section) ?>" />
 <input type="hidden" name="module"        value="<?php  p($form->module) ?>" />

diff --git a/mod/workshop/mod.html b/mod/workshop/mod.html
index aa46cf92dae555bc2c8e585ceb062e84d501672b..2a2a624fbef59e16f30773ca1a3b2be37e2076e0 100644 (file)
--- a/mod/workshop/mod.html
+++ b/mod/workshop/mod.html
@@ -424,8 +424,9 @@
 <br />
 <center>
 <input type="hidden" name="course"     value="<?php  p($form->course) ?>" />
+<input type="hidden" name="sesskey"    value="<?php  p($form->sesskey) ?>" />
 <input type="hidden" name="coursemodule"  value="<?php  p($form->coursemodule) ?>" />
-<input type="hidden" name="section"       value="<?php  p($form->section) ?>" />
+<input type="hidden" name="section"    value="<?php  p($form->section) ?>" />
 <input type="hidden" name="module"     value="<?php  p($form->module) ?>" />
 <input type="hidden" name="modulename" value="<?php  p($form->modulename) ?>" />
 <input type="hidden" name="instance"   value="<?php  p($form->instance) ?>" />