Merged sesskey fixes from STABLE

diff --git a/admin/config.html b/admin/config.html
index 54653e52ca008e47675e81a51a0dc7afd4c861d2..5a141074aa4424b117b909cb163c42382d5ab240 100644 (file)
--- a/admin/config.html
+++ b/admin/config.html
@@ -659,7 +659,8 @@
 
 <tr>
     <td colspan="3" align="center">
-    <input type="submit" value="<?php print_string("savechanges") ?>"></td>
+    <input type="hidden" name="sesskey" value="<?php p($sesskey) ?>" />
+    <input type="submit" value="<?php print_string("savechanges") ?>" /></td>
 </tr>
 </table>
 

diff --git a/admin/config.php b/admin/config.php
index 8d7072397955cffbb39923293ceee21e9801e128..f8b1f94082b0af8ba2443ddbb36bee2757f9a4d1 100644 (file)
--- a/admin/config.php
+++ b/admin/config.php
@@ -22,6 +22,12 @@
 
        if ($config = data_submitted($match)) {  
 
+        if (isset($USER)) {             // Additional identity check
+            if (!confirm_sesskey()) {
+                error(get_string('confirmsesskeybad', 'error'));
+            }
+        }
+
         validate_form($config, $err);
 
         if (count($err) == 0) {
@@ -82,6 +88,8 @@
         echo "<br />";
     }
 
+    $sesskey = isset($USER) ? $USER->sesskey : '';
+
     print_simple_box_start("center", "", "$THEME->cellheading");
        include("config.html");
     print_simple_box_end();
@@ -110,10 +118,9 @@
 
 function validate_form(&$form, &$err) {
 
-   // if (empty($form->fullname))
-   //     $err["fullname"] = get_string("missingsitename");
+    // Currently no checks are needed ...
 
-    return;
+    return true;
 }
 
 

diff --git a/admin/site.html b/admin/site.html
index 21c58ecf64d838377215ace70145657687f31ed0..b406720c434bce538341c38d791d3d910d0a09f3 100644 (file)
--- a/admin/site.html
+++ b/admin/site.html
@@ -1,4 +1,4 @@
-<form method="post" action="site.php" name="form" <?php echo $onsubmit ?>>
+<form method="post" action="site.php" name="form">
 <table cellpadding="9" cellspacing="0" >
 <tr valign="top">
     <td align="right"><p><?php print_string("fullsitename") ?>:</td>
@@ -111,10 +111,5 @@
 <input type="hidden" name="id" value="<?php p($form->id) ?>">
 <input type="hidden" name="category" value="<?php p($form->category) ?>">
 <input type="hidden" name="format" value="<?php p($form->format) ?>">
+<input type="hidden" name="sesskey" value="<?php p($sesskey) ?>">
 </form>
-
-<?php 
-   if ($usehtmleditor) { 
-       print_richedit_javascript("form", "summary", "no");
-   }
-?>

diff --git a/admin/site.php b/admin/site.php
index a55d73bb09540f68e34793f07fc8239fbd2e91e3..aa9bdd2ca77d2d251a0943923070b78ebaad77a5 100644 (file)
--- a/admin/site.php
+++ b/admin/site.php
@@ -14,6 +14,12 @@
 
        if ($form = data_submitted()) {
 
+        if (isset($USER)) {             // Additional identity check
+            if (!confirm_sesskey()) {
+                error(get_string('confirmsesskeybad', 'error'));
+            }
+        }
+
         validate_form($form, $err);
 
         if (count($err) == 0) {
@@ -108,17 +114,22 @@
         print_heading($strsitesettings);
     }
 
-    $defaultformat = FORMAT_HTML;
-    if ($usehtmleditor = can_use_richtext_editor()) {
-        $onsubmit = "onsubmit=\"copyrichtext(form.summary);\"";
-    } else {
-        $onsubmit = "";
+    if (!isset($USER)) {
+        $USER->htmleditor = true;
     }
+    $usehtmleditor = can_use_html_editor();
+    $defaultformat = FORMAT_HTML;
+
+    $sesskey = isset($USER) ? $USER->sesskey : '';
 
     print_simple_box_start("center", "", "$THEME->cellheading");
     include("site.html");
     print_simple_box_end();
 
+    if ($usehtmleditor) { 
+        use_html_editor();
+    }
+
     if (!$firsttime) {
         print_footer();
     }

diff --git a/admin/timezone.php b/admin/timezone.php
index 1fb3740f91b61549a4bc36e05be35485b645ab0f..028e6080e57eecf032379adb4cfd24e2a91848f5 100644 (file)
--- a/admin/timezone.php
+++ b/admin/timezone.php
@@ -17,7 +17,7 @@
 
     print_heading("");
 
-    if (isset($zone)) {
+    if (isset($zone) and confirm_sesskey()) {
         $db->debug = true;
         echo "<center>";
         execute_sql("UPDATE {$CFG->prefix}user SET timezone = '$zone'");
@@ -47,11 +47,12 @@
         }
     }
 
-    echo "<center><form action=\"timezone\".php method=\"get\">";
+    echo '<center><form action="timezone.php" method="get">';
     echo "$strusers ($strall): ";
     choose_from_menu ($timezones, "zone", $user->timezone, get_string("serverlocaltime"), "", "99");
+    echo "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\">";
     echo "<input type=\"submit\" value=\"$strsavechanges\">";
-    echo "</form>";
+    echo "</form></center>";
 
     print_footer();
 

diff --git a/admin/upgradelogs.php b/admin/upgradelogs.php
index 07771ba590008f9375920f9bf280b8f37260e43b..dc7fabdaf1412f32b0b1b18315256da32ece1573 100644 (file)
--- a/admin/upgradelogs.php
+++ b/admin/upgradelogs.php
@@ -33,10 +33,12 @@
 
     if (empty($_GET['confirm'])) {
         notice_yesno(get_string("upgradelogsinfo", "admin"), 
-                     "upgradelogs.php?confirm=true", 
+                     "upgradelogs.php?confirm=true&sesskey=$USER->sesskey", 
                      "index.php");
         print_footer();
         exit;
+    } else if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
     }
 
 

diff --git a/admin/user.php b/admin/user.php
index 751634483550b291cc0cdb8627afdecf109ed903..4af033c8bea98fa33fa73f09de284c2803035f7b 100644 (file)
--- a/admin/user.php
+++ b/admin/user.php
@@ -119,7 +119,7 @@
                          "<a href=\"users.php\">$strusers</a> -> $stredituser");
         }
 
-        if ($confirmuser) {
+        if ($confirmuser and confirm_sesskey()) {
             if (!$user = get_record("user", "id", "$confirmuser")) {
                 error("No such user!");
             }
@@ -309,7 +309,7 @@
                     $strlastaccess = get_string("never");
                 }
                 if ($user->confirmed == 0) {
-                    $confirmbutton = "<a href=\"user.php?confirmuser=$user->id\">" . get_string("confirm") . "</a>";
+                    $confirmbutton = "<a href=\"user.php?confirmuser=$user->id&sesskey=$USER->sesskey\">" . get_string("confirm") . "</a>";
                 } else {
                     $confirmbutton = "";
                 }