MDL-16613 sesskey cleanup

diff --git a/admin/auth_config.php b/admin/auth_config.php
index 902d78906f05a883aa058218b77d9dcf9237bd12..b38b3593cf9f21ce8719fa89fbcaeac97d13d877 100644 (file)
--- a/admin/auth_config.php
+++ b/admin/auth_config.php
@@ -63,7 +63,7 @@ admin_externalpage_print_header();
 // choose an authentication method
 echo "<form $CFG->frametarget id=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n";
 echo "<div>\n";
-echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />\n";
+echo "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />\n";
 echo "<input type=\"hidden\" name=\"auth\" value=\"".$auth."\" />\n";
 
 // auth plugin description

diff --git a/admin/blocks.php b/admin/blocks.php
index 6195cb75743a93459afb8acd45e279953627573a..9074bfefb1609db5042fc938d4eff89753606444 100644 (file)
--- a/admin/blocks.php
+++ b/admin/blocks.php
@@ -163,7 +163,7 @@
         $blockobject = $blockobjects[$blockid];
         $block       = $blocks[$blockid];
 
-        $delete = '<a href="blocks.php?delete='.$blockid.'&amp;sesskey='.$USER->sesskey.'">'.$strdelete.'</a>';
+        $delete = '<a href="blocks.php?delete='.$blockid.'&amp;sesskey='.sesskey().'">'.$strdelete.'</a>';
 
         $settings = ''; // By default, no configuration
         if ($blockobject->has_config()) {
@@ -190,19 +190,19 @@
         $class = ''; // Nothing fancy, by default
 
         if ($blocks[$blockid]->visible) {
-            $visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.$USER->sesskey.'" title="'.$strhide.'">'.
+            $visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strhide.'">'.
                        '<img src="'.$CFG->pixpath.'/i/hide.gif" class="icon" alt="'.$strhide.'" /></a>';
         } else {
-            $visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.$USER->sesskey.'" title="'.$strshow.'">'.
+            $visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strshow.'">'.
                        '<img src="'.$CFG->pixpath.'/i/show.gif" class="icon" alt="'.$strshow.'" /></a>';
             $class = ' class="dimmed_text"'; // Leading space required!
         }
         if ($blockobject->instance_allow_multiple()) {
             if($blocks[$blockid]->multiple) {
-                $multiple = '<span style="white-space: nowrap;">'.get_string('yes').' (<a href="blocks.php?multiple='.$blockid.'&amp;sesskey='.$USER->sesskey.'">'.get_string('change', 'admin').'</a>)</span>';
+                $multiple = '<span style="white-space: nowrap;">'.get_string('yes').' (<a href="blocks.php?multiple='.$blockid.'&amp;sesskey='.sesskey().'">'.get_string('change', 'admin').'</a>)</span>';
             }
             else {
-                $multiple = '<span style="white-space: nowrap;">'.get_string('no').' (<a href="blocks.php?multiple='.$blockid.'&amp;sesskey='.$USER->sesskey.'">'.get_string('change', 'admin').'</a>)</span>';
+                $multiple = '<span style="white-space: nowrap;">'.get_string('no').' (<a href="blocks.php?multiple='.$blockid.'&amp;sesskey='.sesskey().'">'.get_string('change', 'admin').'</a>)</span>';
             }
         }
         else {
@@ -239,7 +239,7 @@
         foreach ($incompatible as $block) {
             $table->add_data(array(
                 $block->name,
-                '<a href="blocks.php?delete='.$block->id.'&amp;sesskey='.$USER->sesskey.'">'.$strdelete.'</a>',
+                '<a href="blocks.php?delete='.$block->id.'&amp;sesskey='.sesskey().'">'.$strdelete.'</a>',
             ));
         }
         $table->print_html();

diff --git a/admin/enrol.php b/admin/enrol.php
index 707e183b655e154380865cc95068c08aa393c802..5f210ad6edef0f954c001a464234d1c920ab4b77 100644 (file)
--- a/admin/enrol.php
+++ b/admin/enrol.php
@@ -64,7 +64,7 @@
 
     echo "<form $CFG->frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol.php\">";
     echo "<div>";
-    echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />";
+    echo "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />";
 
     $table = new stdClass();
     $table->head = array(get_string('name'), get_string('enable'), get_string('default'), $str->settings);

diff --git a/admin/enrol_config.php b/admin/enrol_config.php
index 0ed836f7337549f9c857afee9d62bf42a9330af4..76b83013fa5a513b5991992b01e8e56e4533962b 100644 (file)
--- a/admin/enrol_config.php
+++ b/admin/enrol_config.php
@@ -45,7 +45,7 @@
 
     echo "<form $CFG->frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">";
     echo "<div>";
-    echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />";
+    echo "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />";
     echo "<input type=\"hidden\" name=\"enrol\" value=\"".$enrol."\" />";
 
 /// Print current enrolment type description

diff --git a/admin/environment.php b/admin/environment.php
index 74eb8f04c13c0fd068db449b09adb8c4c8e343de..8acd278680736e0bc02f6eccf9b089743218618d 100644 (file)
--- a/admin/environment.php
+++ b/admin/environment.php
@@ -55,7 +55,7 @@
     admin_externalpage_print_header();
 
 /// Print the component download link
-    echo '<div class="reportlink"><a href="environment.php?action=updatecomponent&amp;sesskey='.$USER->sesskey.'">'.$strupdate.'</a></div>';
+    echo '<div class="reportlink"><a href="environment.php?action=updatecomponent&amp;sesskey='.sesskey().'">'.$strupdate.'</a></div>';
 
     print_heading($strenvironment);
 

diff --git a/admin/lang.php b/admin/lang.php
index d0349f1d377de02bf47e3c67cc7d710dd931c19e..f20cc1225dfaf50d9d726239c148031d64dcec66 100644 (file)
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -670,7 +670,7 @@
             }
             if ($editable) {
                 $o .= '<tr><td>&nbsp;</td><td><br />';
-                $o .= '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+                $o .= '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
                 $o .= '<input type="hidden" name="currentfile" value="'.$currentfile.'" />';
                 $o .= '<input type="hidden" name="mode" value="compare" />';
                 $o .= '<input type="submit" name="update" tabindex="'.$missingcounter.'" value="'.get_string('savechanges').': '.$currentfile.'" />';
@@ -819,7 +819,7 @@
                 // generate an editor for the current help file in $saveto
                 echo '<fieldset><legend>'.$strsavetotitle.'</legend>';
                 echo "<form id=\"helpfileeditor\" action=\"lang.php\" method=\"post\">";
-                echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+                echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
                 echo '<input type="hidden" name="currentfile" value="'.$currentfile.'" />';
                 echo '<input type="hidden" name="mode" value="helpfiles" />';
                 echo "<div class='mdl-align'>\n";

diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php
index 0bd1c9b49132f6526e33cf9232aed78c2fa2dd09..a39433f5ab8614677315ba946e36cb5d8cec471e 100644 (file)
--- a/admin/mnet/access_control.php
+++ b/admin/mnet/access_control.php
@@ -169,14 +169,14 @@ if (!$acl) {
     foreach ($acl as $aclrecord) {
         if ($aclrecord->accessctrl == 'allow') {
             $accesscolumn = get_string('allow', 'mnet')
-                . " (<a href=\"?id={$aclrecord->id}&amp;action=acl&amp;accessctrl=deny&amp;sesskey={$USER->sesskey}\">"
+                . " (<a href=\"?id={$aclrecord->id}&amp;action=acl&amp;accessctrl=deny&amp;sesskey=".sesskey()."\">"
                 . get_string('deny', 'mnet') . "</a>)";
         } else {
             $accesscolumn = get_string('deny', 'mnet')
-                . " (<a href=\"?id={$aclrecord->id}&amp;action=acl&amp;accessctrl=allow&amp;sesskey={$USER->sesskey}\">"
+                . " (<a href=\"?id={$aclrecord->id}&amp;action=acl&amp;accessctrl=allow&amp;sesskey=".sesskey()."\">"
                 . get_string('allow', 'mnet') . "</a>)";
         }
-        $deletecolumn = "<a href=\"?id={$aclrecord->id}&amp;action=delete&amp;sesskey={$USER->sesskey}\">"
+        $deletecolumn = "<a href=\"?id={$aclrecord->id}&amp;action=delete&amp;sesskey=".sesskey()."\">"
                 . get_string('delete') . "</a>";
         $table->data[] = array ($aclrecord->username, $aclrecord->mnet_host_id, $accesscolumn, $deletecolumn);
     }

diff --git a/admin/mnet/delete.html b/admin/mnet/delete.html
index 66ed85813373b265372da1df333a735f666b6f3e..4ff22fad5519cf1ba63ff7949be402df0e771147 100644 (file)
--- a/admin/mnet/delete.html
+++ b/admin/mnet/delete.html
@@ -33,7 +33,7 @@ print_heading(get_string('mnetsettings', 'mnet'));
                 <tr valign="top">
                     <td width="80">
                         <form method="post" action="delete.php">
-                            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                            <input type="hidden" name="sesskey" value="<?php sesskey() ?>" />
                             <input type="hidden" name="hostid" value="<?php echo $mnet_peer->id; ?>" />
                             <input type="hidden" name="step" value="delete" />
                             <input type="submit" name="submit" value="<?php print_string('delete'); ?>"/>

diff --git a/admin/mnet/enr_courses.php b/admin/mnet/enr_courses.php
index 74b4a74b072eacc3ba0244b2fed3845c1ab24989..cd16a7dd0af073b98885cddb602cb35fded8888d 100644 (file)
--- a/admin/mnet/enr_courses.php
+++ b/admin/mnet/enr_courses.php
@@ -38,7 +38,7 @@
 
     foreach ($courses as $course) {
         $link = "$CFG->wwwroot/$CFG->admin/mnet/enr_course_enrol.php?"
-            . "host={$mnethost}&courseid={$course->id}&sesskey={$USER->sesskey}";
+            . "host={$mnethost}&courseid={$course->id}&sesskey=".sesskey();
         echo '<tr>'
                . "<td>$icon</td>"
                . "<td><a href=\"$link\">".format_string($course->fullname). "</a></td>"

diff --git a/admin/mnet/enr_hosts.php b/admin/mnet/enr_hosts.php
index 546f3cef19ef4a7dbcdfc6b6e4c72f7fd7dc22d9..23f47d0c817da6c9ba124b51371c7bd4410975bf 100644 (file)
--- a/admin/mnet/enr_hosts.php
+++ b/admin/mnet/enr_hosts.php
@@ -37,7 +37,7 @@
            . '</tr>';
     $hosts = $enrolment->list_remote_servers();
     foreach ($hosts as $host) {
-        $coursesurl = "$CFG->wwwroot/$CFG->admin/mnet/enr_courses.php?host={$host->id}&amp;sesskey={$USER->sesskey}";
+        $coursesurl = "$CFG->wwwroot/$CFG->admin/mnet/enr_courses.php?host={$host->id}&amp;sesskey=".sesskey();
         $coursecount = $DB->get_field_sql("SELECT COUNT(id) FROM {mnet_enrol_course} WHERE hostid=?", array($host->id));
         if (empty($coursecount)) {
             $coursecount = '?';

diff --git a/admin/mnet/index.php b/admin/mnet/index.php
index 6128163220ff1e56ada552ea57235fe40b157f16..948d13e7ea85f39a51386e4e639bb63372a9fd62 100644 (file)
--- a/admin/mnet/index.php
+++ b/admin/mnet/index.php
@@ -50,9 +50,9 @@
             $MNET->get_private_key();
             $SESSION->mnet_confirm_delete_key = md5(sha1($MNET->keypair['keypair_PEM'])).':'.time();
             notice_yesno(get_string("deletekeycheck", "mnet"),
-                                    "index.php?sesskey=$USER->sesskey&confirm=".md5($MNET->public_key),
+                                    "index.php?sesskey=".sesskey()."&confirm=".md5($MNET->public_key),
                                     "index.php",
-                                     array('sesskey' => $USER->sesskey),
+                                     array('sesskey' => sesskey()),
                                      NULL,
                                     'post',
                                     'get');
@@ -126,7 +126,7 @@
                 </tr>
                 <tr valign="top">
                     <td align="left" width="10" nowrap="nowrap"><?php print_string('expireyourkey', 'mnet'); ?></td>
-                    <td align="left"><input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                    <td align="left"><input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
                         <input type="hidden" name="deleteKey" value="" />
                         <input type="submit" name="submit" value="<?php print_string('delete'); ?>" />
                     </td>

diff --git a/admin/mnet/mnet_review.html b/admin/mnet/mnet_review.html
index 1243b097cc008b4c7dc50db8875e62b4526c14bd..44723b25d8d7c755ea0b8b7bb2a22e49b8e8cd61 100644 (file)
--- a/admin/mnet/mnet_review.html
+++ b/admin/mnet/mnet_review.html
@@ -23,7 +23,7 @@ print_simple_box_start("center", "");
 ?>
 <form method="post" action="peers.php">
 <div>
-<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+<input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
 <input type="hidden" name="step" value="commit" />
 <input type="hidden" name="last_connect_time" value="<?php echo $mnet_peer->last_connect_time; ?>" />
 <input type="hidden" name="id" value="<?php echo isset($mnet_peer->id)?  $mnet_peer->id : '0' ; ?>" />

diff --git a/admin/mnet/mnet_services.html b/admin/mnet/mnet_services.html
index 0fac12636b0fa66d8b0dc6526ed716b2f67d7d64..101537b241f6b263d3973e7791407ce26903aa9b 100644 (file)
--- a/admin/mnet/mnet_services.html
+++ b/admin/mnet/mnet_services.html
@@ -20,7 +20,7 @@ print_simple_box_start("center", "");
 
 <form method="post" action="mnet_services.php">
 <div>
-<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+<input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
 <input type="hidden" name="step" value="<?php echo $mnet_peer->nextstep; ?>" />
 <input type="hidden" name="hostid" value="<?php echo ($mnet_peer->id)?  $mnet_peer->id : '0' ; ?>" />
 <table cellpadding="9" cellspacing="0" >

diff --git a/admin/mnet/peers.html b/admin/mnet/peers.html
index 120d3e4179b20238f25f5df879d143f1964deca1..91d5e99cfc4d7dd596329484f68643fcfbbc8cdb 100644 (file)
--- a/admin/mnet/peers.html
+++ b/admin/mnet/peers.html
@@ -8,7 +8,7 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
 <div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
     <form  method="post" action="peers.php">
         <div>
-            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+            <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
             <input type="hidden" name="updateregisterall" value="1" />
             <table cellspacing="0" cellpadding="5" class="generaltable generalbox" >
                 <tr>
@@ -71,7 +71,7 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
             <tr>
                 <th class="header c4" colspan="4">
                     <?php print_string('addnewhost', 'mnet'); ?>
-                    <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                    <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
                     <input type="hidden" name="step" value="input" />
                 </th>
             </tr>

diff --git a/admin/mnet/trustedhosts.html b/admin/mnet/trustedhosts.html
index 26da1699bdb04b37bd2a756cc43d68bed3056b67..d849642b21088a9f44d98d6e648409f837a6334c 100644 (file)
--- a/admin/mnet/trustedhosts.html
+++ b/admin/mnet/trustedhosts.html
@@ -13,7 +13,7 @@ admin_externalpage_print_header();
         <td class="cell c1" colspan="2">
             <form  method="post" action="trustedhosts.php">
             <div>
-                <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
                 <textarea name="hostlist" cols="40" rows="20"><?php echo $trusted_hosts; ?></textarea><br />
                 <input type="submit" value="<?php print_string('savechanges'); ?>" />
             </div>
@@ -54,7 +54,7 @@ admin_externalpage_print_header();
         <td class="cell c1" colspan="2">
             <form  method="get" action="trustedhosts.php">
             <div>
-                <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
                 <input type="text" name="testipaddress" value="<?php echo $test_ip_address; ?>" />
                 <input type="submit" value="<?php print_string('go'); ?>" />
             </div>

diff --git a/admin/replace.php b/admin/replace.php
index cd1ffb74af1426f8ece56fdda784fde018dc5420..da9a99a95aa50f6199dcce458b2a6e93d798c8ce 100644 (file)
--- a/admin/replace.php
+++ b/admin/replace.php
@@ -21,7 +21,7 @@ if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Pr
     print_simple_box_start('center');
     echo '<div class="mdl-align">';
     echo '<form action="replace.php" method="post">';
-    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
     echo 'Search whole database for: <input type="text" name="search" /><br />';
     echo 'Replace with this string: <input type="text" name="replace" /><br />';
     echo '<input type="submit" value="Yes, do it now" /><br />';

diff --git a/admin/settings.php b/admin/settings.php
index 0edb1120cdffd7b99a05f6f8e5d65e2d134f8361..2cdef063f04406a12e1b6629625a247925399b82 100644 (file)
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -87,7 +87,7 @@ if (empty($SITE->fullname)) {
     echo '<form action="settings.php" method="post" id="adminsettings">';
     echo '<div class="settingsform clearfix">';
     echo '<input type="hidden" name="section" value="'.$PAGE->section.'" />';
-    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
     echo '<input type="hidden" name="return" value="'.$return.'" />';
 
     echo $page->output_html();
@@ -135,7 +135,7 @@ if (empty($SITE->fullname)) {
     echo '<form action="settings.php" method="post" id="adminsettings">';
     echo '<div class="settingsform clearfix">';
     echo '<input type="hidden" name="section" value="'.$PAGE->section.'" />';
-    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
     echo '<input type="hidden" name="return" value="'.$return.'" />';
     print_heading($page->visiblename);
 

diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php
index ccf8e06921b856ac88efffca72f202c1e191701f..31f958b4005a8082159ebf121877bdd92e72a9e2 100644 (file)
--- a/blocks/site_main_menu/block_site_main_menu.php
+++ b/blocks/site_main_menu/block_site_main_menu.php
@@ -88,7 +88,7 @@ class block_site_main_menu extends block_list {
 
         if ($ismoving) {
             $this->content->icons[] = '<img src="'.$CFG->pixpath.'/t/move.gif" class="iconsmall" alt="" />';
-            $this->content->items[] = $USER->activitycopyname.'&nbsp;(<a href="'.$CFG->wwwroot.'/course/mod.php?cancelcopy=true&amp;sesskey='.$USER->sesskey.'">'.$strcancel.'</a>)';
+            $this->content->items[] = $USER->activitycopyname.'&nbsp;(<a href="'.$CFG->wwwroot.'/course/mod.php?cancelcopy=true&amp;sesskey='.sesskey().'">'.$strcancel.'</a>)';
         }
 
         if (!empty($section->sequence)) {
@@ -116,7 +116,7 @@ class block_site_main_menu extends block_list {
                         if ($mod->id == $USER->activitycopy) {
                             continue;
                         }
-                        $this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?moveto='.$mod->id.'&amp;sesskey='.$USER->sesskey.'">'.
+                        $this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?moveto='.$mod->id.'&amp;sesskey='.sesskey().'">'.
                             '<img style="height:16px; width:80px; border:0px" src="'.$CFG->pixpath.'/movehere.gif" alt="'.$strmovehere.'" /></a>';
                         $this->content->icons[] = '';
                     }
@@ -148,7 +148,7 @@ class block_site_main_menu extends block_list {
         }
 
         if ($ismoving) {
-            $this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?movetosection='.$section->id.'&amp;sesskey='.$USER->sesskey.'">'.
+            $this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?movetosection='.$section->id.'&amp;sesskey='.sesskey().'">'.
                                       '<img style="height:16px; width:80px; border:0px" src="'.$CFG->pixpath.'/movehere.gif" alt="'.$strmovehere.'" /></a>';
             $this->content->icons[] = '';
         }

diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php
index 75058ca7c63e44b0b80333fcd675e879365befac..65d5c2c84e2fbb60425a4206d87d9f199e41afdd 100644 (file)
--- a/blocks/social_activities/block_social_activities.php
+++ b/blocks/social_activities/block_social_activities.php
@@ -94,7 +94,7 @@ class block_social_activities extends block_list {
 
         if ($ismoving) {
             $this->content->icons[] = '&nbsp;<img align="bottom" src="'.$CFG->pixpath.'/t/move.gif" class="iconsmall" alt="" />';
-            $this->content->items[] = $USER->activitycopyname.'&nbsp;(<a href="'.$CFG->wwwroot.'/course/mod.php?cancelcopy=true&amp;sesskey='.$USER->sesskey.'">'.$strcancel.'</a>)';
+            $this->content->items[] = $USER->activitycopyname.'&nbsp;(<a href="'.$CFG->wwwroot.'/course/mod.php?cancelcopy=true&amp;sesskey='.sesskey().'">'.$strcancel.'</a>)';
         }
 
         if (!empty($section) && !empty($section->sequence)) {
@@ -122,7 +122,7 @@ class block_social_activities extends block_list {
                         if ($mod->id == $USER->activitycopy) {
                             continue;
                         }
-                        $this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?moveto='.$mod->id.'&amp;sesskey='.$USER->sesskey.'">'.
+                        $this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?moveto='.$mod->id.'&amp;sesskey='.sesskey().'">'.
                             '<img style="height:16px; width:80px; border:0px" src="'.$CFG->pixpath.'/movehere.gif" alt="'.$strmovehere.'" /></a>';
                         $this->content->icons[] = '';
                     }
@@ -154,7 +154,7 @@ class block_social_activities extends block_list {
         }
 
         if ($ismoving) {
-            $this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?movetosection='.$section->id.'&amp;sesskey='.$USER->sesskey.'">'.
+            $this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?movetosection='.$section->id.'&amp;sesskey='.sesskey().'">'.
                                       '<img style="height:16px; width:80px; border:0px" src="'.$CFG->pixpath.'/movehere.gif" alt="'.$strmovehere.'" /></a>';
             $this->content->icons[] = '';
         }

diff --git a/course/category.php b/course/category.php
index 7473e75af597d835d9e668ea892b407f1312b133..3bc713f2e806cde07d68371681183551e38da8d3 100644 (file)
--- a/course/category.php
+++ b/course/category.php
@@ -328,11 +328,11 @@
                 if (has_capability('moodle/course:visibility', $coursecontext) && has_capability('moodle/course:viewhiddencourses', $coursecontext)) {
                     if (!empty($acourse->visible)) {
                         echo '<a title="'.$strhide.'" href="category.php?id='.$category->id.'&amp;page='.$page.
-                            '&amp;perpage='.$perpage.'&amp;hide='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
+                            '&amp;perpage='.$perpage.'&amp;hide='.$acourse->id.'&amp;sesskey='.sesskey().'">'.
                             '<img src="'.$CFG->pixpath.'/t/hide.gif" class="iconsmall" alt="'.$strhide.'" /></a> ';
                     } else {
                         echo '<a title="'.$strshow.'" href="category.php?id='.$category->id.'&amp;page='.$page.
-                            '&amp;perpage='.$perpage.'&amp;show='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
+                            '&amp;perpage='.$perpage.'&amp;show='.$acourse->id.'&amp;sesskey='.sesskey().'">'.
                             '<img src="'.$CFG->pixpath.'/t/show.gif" class="iconsmall" alt="'.$strshow.'" /></a> ';
                     }
                 } else {
@@ -357,7 +357,7 @@
                 if (has_capability('moodle/category:manage', $context)) {
                     if ($up) {
                         echo '<a title="'.$strmoveup.'" href="category.php?id='.$category->id.'&amp;page='.$page.
-                             '&amp;perpage='.$perpage.'&amp;moveup='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
+                             '&amp;perpage='.$perpage.'&amp;moveup='.$acourse->id.'&amp;sesskey='.sesskey().'">'.
                              '<img src="'.$CFG->pixpath.'/t/up.gif" class="iconsmall" alt="'.$strmoveup.'" /></a> ';
                     } else {
                         echo $spacer;
@@ -365,7 +365,7 @@
 
                     if ($down) {
                         echo '<a title="'.$strmovedown.'" href="category.php?id='.$category->id.'&amp;page='.$page.
-                             '&amp;perpage='.$perpage.'&amp;movedown='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
+                             '&amp;perpage='.$perpage.'&amp;movedown='.$acourse->id.'&amp;sesskey='.sesskey().'">'.
                              '<img src="'.$CFG->pixpath.'/t/down.gif" class="iconsmall" alt="'.$strmovedown.'" /></a> ';
                     } else {
                         echo $spacer;

diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index fe8cb39f5f18fce54789a57847b38ba67b160cc5..6e84af8e9c430858acfdf69c8df4ef22451eab4c 100644 (file)
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -115,7 +115,7 @@
         $stractivityclipboard = strip_tags(get_string('activityclipboard', '', $USER->activitycopyname));
         $strcancel= get_string('cancel');
         echo '<li class="clipboard">';
-        echo $stractivityclipboard.'&nbsp;&nbsp;(<a href="mod.php?cancelcopy=true&amp;sesskey='.$USER->sesskey.'">'.$strcancel.'</a>)';
+        echo $stractivityclipboard.'&nbsp;&nbsp;(<a href="mod.php?cancelcopy=true&amp;sesskey='.sesskey().'">'.$strcancel.'</a>)';
         echo "</li>\n";
     }
 
@@ -225,25 +225,25 @@
             if (isediting($course->id) && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
 
                if ($course->marker == $section) {  // Show the "light globe" on/off
-                           echo '<a href="view.php?id='.$course->id.'&amp;marker=0&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strmarkedthistopic.'">'.'<img src="'.$CFG->pixpath.'/i/marked.gif" alt="'.$strmarkedthistopic.'" /></a><br />';
+                           echo '<a href="view.php?id='.$course->id.'&amp;marker=0&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strmarkedthistopic.'">'.'<img src="'.$CFG->pixpath.'/i/marked.gif" alt="'.$strmarkedthistopic.'" /></a><br />';
                } else {
-                    echo '<a href="view.php?id='.$course->id.'&amp;marker='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strmarkthistopic.'">'.'<img src="'.$CFG->pixpath.'/i/marker.gif" alt="'.$strmarkthistopic.'" /></a><br />';
+                    echo '<a href="view.php?id='.$course->id.'&amp;marker='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strmarkthistopic.'">'.'<img src="'.$CFG->pixpath.'/i/marker.gif" alt="'.$strmarkthistopic.'" /></a><br />';
                }
 
                 if ($thissection->visible) {        // Show the hide/show eye
-                    echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopichide.'">'.
+                    echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strtopichide.'">'.
                          '<img src="'.$CFG->pixpath.'/i/hide.gif" class="icon hide" alt="'.$strtopichide.'" /></a><br />';
                 } else {
-                    echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopicshow.'">'.
+                    echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strtopicshow.'">'.
                          '<img src="'.$CFG->pixpath.'/i/show.gif" class="icon hide" alt="'.$strtopicshow.'" /></a><br />';
                 }
                 if ($section > 1) {                       // Add a arrow to move section up
-                    echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.$USER->sesskey.'#section-'.($section-1).'" title="'.$strmoveup.'">'.
+                    echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.sesskey().'#section-'.($section-1).'" title="'.$strmoveup.'">'.
                          '<img src="'.$CFG->pixpath.'/t/up.gif" class="icon up" alt="'.$strmoveup.'" /></a><br />';
                 }
 
                 if ($section < $course->numsections) {    // Add a arrow to move section down
-                    echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.$USER->sesskey.'#section-'.($section+1).'" title="'.$strmovedown.'">'.
+                    echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.sesskey().'#section-'.($section+1).'" title="'.$strmovedown.'">'.
                          '<img src="'.$CFG->pixpath.'/t/down.gif" class="icon down" alt="'.$strmovedown.'" /></a><br />';
                 }
             }

diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index d000213d231632a8ca225f84b45ff481ced2ca69..1f5621344f4c35cf53f5b8cbcf720b935764845f 100644 (file)
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -105,7 +105,7 @@
         $stractivityclipboard = strip_tags(get_string('activityclipboard', '', $USER->activitycopyname));
         $strcancel= get_string('cancel');
         echo '<li class="clipboard">';
-        echo $stractivityclipboard.'&nbsp;&nbsp;(<a href="mod.php?cancelcopy=true&amp;sesskey='.$USER->sesskey.'">'.$strcancel.'</a>)';
+        echo $stractivityclipboard.'&nbsp;&nbsp;(<a href="mod.php?cancelcopy=true&amp;sesskey='.sesskey().'">'.$strcancel.'</a>)';
         echo "</li>\n";
     }
 
@@ -220,19 +220,19 @@
 
             if (isediting($course->id) && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
                 if ($thissection->visible) {        // Show the hide/show eye
-                    echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strweekhide.'">'.
+                    echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strweekhide.'">'.
                          '<img src="'.$CFG->pixpath.'/i/hide.gif" class="icon hide" alt="'.$strweekhide.'" /></a><br />';
                 } else {
-                    echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strweekshow.'">'.
+                    echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strweekshow.'">'.
                          '<img src="'.$CFG->pixpath.'/i/show.gif" class="icon hide" alt="'.$strweekshow.'" /></a><br />';
                 }
                 if ($section > 1) {                       // Add a arrow to move section up
-                    echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.$USER->sesskey.'#section-'.($section-1).'" title="'.$strmoveup.'">'.
+                    echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.sesskey().'#section-'.($section-1).'" title="'.$strmoveup.'">'.
                          '<img src="'.$CFG->pixpath.'/t/up.gif" class="icon up" alt="'.$strmoveup.'" /></a><br />';
                 }
 
                 if ($section < $course->numsections) {    // Add a arrow to move section down
-                    echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.$USER->sesskey.'#section-'.($section+1).'" title="'.$strmovedown.'">'.
+                    echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.sesskey().'#section-'.($section+1).'" title="'.$strmovedown.'">'.
                          '<img src="'.$CFG->pixpath.'/t/down.gif" class="icon down" alt="'.$strmovedown.'" /></a><br />';
                 }
             }

diff --git a/course/lib.php b/course/lib.php
index 9046e262dd22e0fdd1c7cb8267efa991a2c4ac09..bd93ece8f0699915f5b43d12c6ed3e48a7388164 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1421,7 +1421,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
             echo '<li class="activity '.$mod->modname.'" id="module-'.$modnumber.'">';  // Unique ID
             if ($ismoving) {
                 echo '<a title="'.$strmovefull.'"'.
-                     ' href="'.$CFG->wwwroot.'/course/mod.php?moveto='.$mod->id.'&amp;sesskey='.$USER->sesskey.'">'.
+                     ' href="'.$CFG->wwwroot.'/course/mod.php?moveto='.$mod->id.'&amp;sesskey='.sesskey().'">'.
                      '<img class="movetarget" src="'.$CFG->pixpath.'/movehere.gif" '.
                      ' alt="'.$strmovehere.'" /></a><br />
                      ';
@@ -1636,7 +1636,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
 
     if ($ismoving) {
         echo '<li><a title="'.$strmovefull.'"'.
-             ' href="'.$CFG->wwwroot.'/course/mod.php?movetosection='.$section->id.'&amp;sesskey='.$USER->sesskey.'">'.
+             ' href="'.$CFG->wwwroot.'/course/mod.php?movetosection='.$section->id.'&amp;sesskey='.sesskey().'">'.
              '<img class="movetarget" src="'.$CFG->pixpath.'/movehere.gif" '.
              ' alt="'.$strmovehere.'" /></a></li>
              ';

diff --git a/course/report/participation/index.php b/course/report/participation/index.php
index 9ffc9fbacd59f3707f6ababb03487d36cf6ae321..a1cdaa641af35c0d7177d3bdca4f588ddf226636 100644 (file)
--- a/course/report/participation/index.php
+++ b/course/report/participation/index.php
@@ -287,7 +287,7 @@ function checknos() {
         echo '<div>'."\n";
         echo '<input type="hidden" name="id" value="'.$id.'" />'."\n";
         echo '<input type="hidden" name="returnto" value="'. format_string($_SERVER['REQUEST_URI']) .'" />'."\n";
-        echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />'."\n";
+        echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />'."\n";
 
         foreach ($users as $u) {
             $data = array('<a href="'.$CFG->wwwroot.'/user/view.php?id='.$u->userid.'&amp;course='.$course->id.'">'.fullname($u,true).'</a>'."\n",

diff --git a/enrol/authorize/uploadcsv.php b/enrol/authorize/uploadcsv.php
index 9b34d865ec33deb0a5ca464d8332788d62060384..625eb4b9feb76525af2450f55d6c5c7065b07a8b 100644 (file)
--- a/enrol/authorize/uploadcsv.php
+++ b/enrol/authorize/uploadcsv.php
@@ -42,7 +42,7 @@
     $maxuploadsize = get_max_upload_file_size();
     echo '<center><form method="post" enctype="multipart/form-data" action="uploadcsv.php"><div>
           <input type="hidden" name="MAX_FILE_SIZE" value="'.$maxuploadsize.'" />
-          <input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+          <input type="hidden" name="sesskey" value="'.sesskey().'" />';
           upload_print_form_fragment(1, array('csvfile'), array(get_string('file')));
     echo '<input type="submit" value="'.get_string('upload').'" />';
     echo '</div></form></center><br />';

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 8cd4178ebc18124482440d56bf366d1ea8dff2ca..8ac5a2397437b4e139ba464f809af48fc190a5ab 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -6103,7 +6103,7 @@ class admin_setting_managerepository extends admin_setting {
         foreach ($plugins as $p) {
             if (!in_array($p, $alreadyplugins)) {
                 $instancehtml .= '<li><a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/repository.php?sesskey='
-                    .$USER->sesskey.'&amp;new='.$p.'">'.get_string('add', 'repository')
+                    .sesskey().'&amp;new='.$p.'">'.get_string('add', 'repository')
                     .' "'.get_string('repositoryname', 'repository_'.$p).'" '
                     .'</a></li>';
                 $addable++;

diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php
index af1aacd09566a8feff389fd3000a9a21d855cb96..26df22db18852f2a26ca8a6769e148078de49c1b 100644 (file)
--- a/lib/ajax/ajaxlib.php
+++ b/lib/ajax/ajaxlib.php
@@ -201,7 +201,7 @@ class jsportal {
         $output .= "    main.portal.strings['deletecheck']='".get_string('deletecheck','','_var_')."';\n";
         $output .= "    main.portal.strings['resource']='".get_string('resource')."';\n";
         $output .= "    main.portal.strings['activity']='".get_string('activity')."';\n";
-        $output .= "    main.portal.strings['sesskey']='".$USER->sesskey."';\n";
+        $output .= "    main.portal.strings['sesskey']='".sesskey()."';\n";
         $output .= "    onloadobj.load();\n";
         $output .= "    main.process_blocks();\n";
         $output .= "</script>";

diff --git a/message/discussion.php b/message/discussion.php
index 0f9f13015c8126c6e17d65e4f26c93cd642d3e2f..6be0c0acbb2c8956b0c7335bbd178333846e3bba 100644 (file)
--- a/message/discussion.php
+++ b/message/discussion.php
@@ -180,7 +180,7 @@
     echo '<input type="hidden" name="start" value="'.$start.'" />';
     echo '<input type="hidden" name="noframesjs" value="'.$noframesjs.'" />';
     echo '<input type="hidden" name="last" value="'.time().'" />';
-    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
     echo '<input type="submit" value="'.get_string('sendmessage', 'message').'" />&nbsp;';
     echo '<input type="submit" name="refresh" value="'.get_string('refresh').'" />';
     echo '<input type="checkbox" name="newonly" id="newonly" '.($newonly?'checked="checked" ':'').'/><label for="newonly">'.get_string('newonlymsg', 'message').'</label>';

diff --git a/message/send.php b/message/send.php
index bb64513dc75423f11fb8d7d0a4fec9c13d0ca524..efc13d1609ef7b71b91f3c5d71f60b90b8fdd0d2 100644 (file)
--- a/message/send.php
+++ b/message/send.php
@@ -76,7 +76,7 @@ if (has_capability('moodle/site:sendmessage', get_context_instance(CONTEXT_SYSTE
     echo '<form id="editing" method="post" action="send.php">';
     echo '<div class="message-form">';
     echo '<input type="hidden" name="id" value="'.$user->id.'" />';
-    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
 
     $usehtmleditor = (can_use_html_editor() && get_user_preferences('message_usehtmleditor', 0));
     if ($usehtmleditor) {

diff --git a/mod/chat/gui_basic/index.php b/mod/chat/gui_basic/index.php
index a095ee54c9a455cd9c7e402251ca2e076418a3df..14d70c2b6f03bf9aa104029ad54f7ab074b3e5e1 100644 (file)
--- a/mod/chat/gui_basic/index.php
+++ b/mod/chat/gui_basic/index.php
@@ -125,7 +125,7 @@
     echo '<input type="hidden" name="id" value="'.$id.'" />';
     echo '<input type="hidden" name="groupid" value="'.$groupid.'" />';
     echo '<input type="hidden" name="last" value="'.time().'" />';
-    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
     echo '<input type="submit" value="'.get_string('submit').'" />&nbsp;';
     echo '<input type="submit" name="refresh" value="'.get_string('refresh').'" />';
     echo '<input type="checkbox" name="newonly" id="newonly" '.($newonly?'checked="checked" ':'').'/><label for="newonly">'.get_string('newonlymsg', 'message').'</label>';

diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php
index 5de1f22e17ae4512830bfcd6ef53e21babcc6fed..88818e718c167899730f41810f5f14b8679f06e6 100644 (file)
--- a/mod/feedback/complete_guest.php
+++ b/mod/feedback/complete_guest.php
@@ -284,7 +284,7 @@
                 echo '<tr><td colspan="3" align="center">
                         <input type="hidden" name="anonymous" value="0" />
                         <input type="hidden" name="anonymous_response" value="'.FEEDBACK_ANONYMOUS_YES.'" />
-                        <input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />
+                        <input type="hidden" name="sesskey" value="'.sesskey().'" />
                         &nbsp;
                       </td></tr>';
                 //check, if there exists required-elements

diff --git a/mod/feedback/mapcourse.php b/mod/feedback/mapcourse.php
index 6c1943fc58ea0ff00450ec4bcbc2e0f26dcb8436..dd02aba9c3311b82db3be971c639559af51f9736 100644 (file)
--- a/mod/feedback/mapcourse.php
+++ b/mod/feedback/mapcourse.php
@@ -96,7 +96,7 @@
     print_box_start('generalbox boxaligncenter boxwidthwide');
     echo '<form method="post">';
     echo '<input type="hidden" name="id" value="'.$id.'" />';
-    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
     
     $sql = "select c.id, c.shortname
               from {course} c

diff --git a/mod/feedback/view.php b/mod/feedback/view.php
index af85ce099819274ae24b4dea6ff95a6b7c30dd33..1641e893f1b54ccea122ff25ba5077b3a334a7ee 100644 (file)
--- a/mod/feedback/view.php
+++ b/mod/feedback/view.php
@@ -145,7 +145,7 @@
             print_box_start('generalbox boxaligncenter boxwidthwide');
             echo '<div class="mdl-align">';
             echo '<form action="mapcourse.php" method="get">';
-            echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+            echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
             echo '<input type="hidden" name="id" value="'.$id.'" />';
             echo '<button type="submit">'.get_string('mapcourses', 'feedback').'</button>';
             helpbutton('mapcourse', '', 'feedback', true, true);

diff --git a/mod/hotpot/index.php b/mod/hotpot/index.php
index 5b06c525498e2283cdf07f0897bd64e417754c31..8e51480e57355f7d9d3151e2f69fa1585c03079e 100644 (file)
--- a/mod/hotpot/index.php
+++ b/mod/hotpot/index.php
@@ -20,7 +20,7 @@
 
     // Moodle 1.4+ requires sesskey to be passed in forms
     if (isset($USER->sesskey)) {
-        $sesskey = '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+        $sesskey = '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
     } else {
         $sesskey = '';
     }

diff --git a/mod/lesson/action/addbranchtable.php b/mod/lesson/action/addbranchtable.php
index 88e9e2026f21e9f1fea9e7619ddf72ffe1c189ac..ae518e9172fe8b3781aae5eaabd81b7c37ff61a7 100644 (file)
--- a/mod/lesson/action/addbranchtable.php
+++ b/mod/lesson/action/addbranchtable.php
@@ -42,7 +42,7 @@
     <input type="hidden" name="action" value="insertpage" />
     <input type="hidden" name="pageid" value="<?PHP echo $pageid ?>" />
     <input type="hidden" name="qtype" value="<?PHP echo LESSON_BRANCHTABLE ?>" />
-    <input type="hidden" name="sesskey" value="<?PHP echo $USER->sesskey ?>" />
+    <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
     <table class="generalbox boxaligncenter" cellpadding="5" border="1">
     <tr valign="top">
     <td><strong><label for="title"><?php print_string("pagetitle", "lesson"); ?>:</label></strong><br />

diff --git a/mod/lesson/action/addpage.php b/mod/lesson/action/addpage.php
index c45f2927385f3ea7477f1bbabddf3c5e564e5c01..10229e1f3ec0f2c6a5aee5d730e2662a79b930cf 100644 (file)
--- a/mod/lesson/action/addpage.php
+++ b/mod/lesson/action/addpage.php
@@ -51,7 +51,7 @@
     <input type="hidden" name="id" value="<?php echo $cm->id ?>" />
     <input type="hidden" name="action" value="insertpage" />
     <input type="hidden" name="pageid" value="<?php echo $pageid ?>" />
-    <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+    <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
       <?php
         echo '<b>'.get_string("questiontype", "lesson").":</b> \n";
         echo helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson")."<br />";

diff --git a/mod/lesson/action/editpage.php b/mod/lesson/action/editpage.php
index 244d0983b7662d190202f44fb4b4b75d0a21e37b..9c9966b7475fa161a7f8aba29f5d64d862091974 100644 (file)
--- a/mod/lesson/action/editpage.php
+++ b/mod/lesson/action/editpage.php
@@ -58,7 +58,7 @@
     <input type="hidden" name="id" value="<?php echo $cm->id ?>" />
     <input type="hidden" name="action" value="updatepage" />
     <input type="hidden" name="pageid" value="<?php echo $pageid ?>" />
-    <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />        
+    <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />        
     <input type="hidden" name="redirect" value="<?php echo $redirect ?>" />        
     <input type="hidden" name="redisplay" value="0" />
     <center>

diff --git a/mod/lesson/action/move.php b/mod/lesson/action/move.php
index 217528f0c5377a832c14859ba0982640352ae1f9..891571f41f440b0632ea642f33d2d92744899fdd 100644 (file)
--- a/mod/lesson/action/move.php
+++ b/mod/lesson/action/move.php
@@ -17,7 +17,7 @@
     }
 
     echo "<center><table cellpadding=\"5\" border=\"1\">\n";
-    echo "<tr><td><a href=\"lesson.php?id=$cm->id&amp;sesskey=".$USER->sesskey."&amp;action=moveit&amp;pageid=$pageid&amp;after=0\"><small>".
+    echo "<tr><td><a href=\"lesson.php?id=$cm->id&amp;sesskey=".sesskey()."&amp;action=moveit&amp;pageid=$pageid&amp;after=0\"><small>".
         get_string("movepagehere", "lesson")."</small></a></td></tr>\n";
     while (true) {
         if ($page->id != $pageid) {
@@ -25,7 +25,7 @@
                 $title = "<< ".get_string("notitle", "lesson")."  >>";
             }
             echo "<tr><td><b>$title</b></td></tr>\n";
-            echo "<tr><td><a href=\"lesson.php?id=$cm->id&amp;sesskey=".$USER->sesskey."&amp;action=moveit&amp;pageid=$pageid&amp;after={$page->id}\"><small>".
+            echo "<tr><td><a href=\"lesson.php?id=$cm->id&amp;sesskey=".sesskey()."&amp;action=moveit&amp;pageid=$pageid&amp;after={$page->id}\"><small>".
                 get_string("movepagehere", "lesson")."</small></a></td></tr>\n";
         }
         if ($page->nextpageid) {

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 26b19893d4b9cc2e52f385e6b64bf33d64fe3452..4b91178349f77bfe5cca469d32a2f5c85b5d003b 100644 (file)
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -690,7 +690,7 @@ if($quiz_reordertool){
     echo '<form action="edit.php" method="post">';
     echo '<fieldset class="invisiblefieldset">';
     echo $thispageurl->hidden_params_out();
-    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
     //YUI does not submit the value of the submit button so
             //we need to add the value:
     echo '<input type="hidden" name="repaginate" value="'.$gostring.'" />';

diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index 858356479c3a360bd84ebb9961588b2a475a7e8d..520928eacc8b5d46fb9b039bb2325ed84a143079 100644 (file)
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -284,7 +284,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete=true,
         echo '<form method="post" action="edit.php" id="quizquestions"><div>';
 
         echo $pageurl->hidden_params_out();
-        echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+        echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
 
         echo $reordercontrolstop;
     }
@@ -447,7 +447,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete=true,
 <form method="post" action="edit.php"><div>
     <fieldset class="invisiblefieldset" style="display: block;">
     <label for="<?php echo "inputq$qnum" ?>"><?php echo $strgrade; ?></label>:<br />
-    <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+    <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
     <?php echo $pageurl->hidden_params_out(); ?>
     <input type="hidden" name="savechanges" value="save" />
         <?php
@@ -1326,7 +1326,7 @@ function quiz_question_list($contexts, $pageurl, $categoryandcontext,
 
     echo '<form method="post" action="edit.php">';
     echo '<fieldset class="invisiblefieldset" style="display: block;">';
-    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
     echo $pageurl->hidden_params_out();
     echo '<div class="categoryquestionscontainer">';
     echo '<table id="categoryquestions" style="width: 100%"><colgroup><col id="qaction"></col><col id="qname"></col><col id="qextraactions"></col></colgroup><tr>';

diff --git a/question/editlib.php b/question/editlib.php
index bf30d1dc530d8eb0e9fb97d2ca0f7fb1e7c7ff67..72721d301b630a2cb822e504d8bcef62be055e9f 100644 (file)
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -282,7 +282,7 @@ function question_list($contexts, $pageurl, $categoryandcontext, $cm = null,
 
     echo '<form method="post" action="edit.php">';
     echo '<fieldset class="invisiblefieldset" style="display: block;">';
-    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
     echo $pageurl->hidden_params_out();
     echo '<table id="categoryquestions" style="width: 100%"><tr>';
     echo "<th style=\"white-space:nowrap;\" class=\"header\" scope=\"col\">$straction</th>";
@@ -417,7 +417,7 @@ function question_sort_options($pageurl, $sortorder){
     // non-POSTed page to not break the back button
     $html .= '<form method="get" action="edit.php">';
     $html .= '<fieldset class="invisiblefieldset" style="display: block;">';
-    $html .= '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    $html .= '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
     $html .= $pageurl->hidden_params_out(array('qsortorder'));
     //choose_from_menu concatenates the form name with
     //"menu" so the label is for menuqsortorder

diff --git a/user/addnote.php b/user/addnote.php
index 7f9391e498615c3342a9ca0bcd98cf6ff6d47d8d..93b25581f3094f9a292d7d29b6b0ca266dcee0c5 100644 (file)
--- a/user/addnote.php
+++ b/user/addnote.php
@@ -59,7 +59,7 @@ print_heading($straddnote);
 echo '<form method="post" action="addnote.php">';
 echo '<fieldset class="invisiblefieldset">';
 echo '<input type="hidden" name="id" value="'.$course->id.'" />';
-echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
 echo '</fieldset>';
 $table->head  = array (get_string('fullname'),
     get_string('content', 'notes') . helpbutton('writing', get_string('helpwriting'), 'moodle', true, false, '', true),

diff --git a/user/extendenrol.php b/user/extendenrol.php
index ec5ddb2862e09c77fec007c12648d6fc96925572..c44f2fd2fe6d93a1f757e2ea0428b70ba157b180 100644 (file)
--- a/user/extendenrol.php
+++ b/user/extendenrol.php
@@ -115,7 +115,7 @@ $title = get_string('extendenrol');
 print_heading($title . helpbutton('extendenrol', $title, 'moodle', true, false, '', true));
 echo "<form method=\"post\" action=\"extendenrol.php\">\n";
 echo '<input type="hidden" name="id" value="'.$course->id.'" />';
-echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
 $table->head  = array (get_string('fullnameuser'), get_string('enrolmentstart'), get_string('enrolmentend'), get_string('extendperiod'), get_string('startingfrom'));
 $table->align = array ('left', 'center', 'center', 'center');
 $table->width = "600";

diff --git a/user/groupaddnote.php b/user/groupaddnote.php
index 800e9577710d3990f8bfc8944f65fe9e87cfe511..96c453bbe94a878ff5ad0191fa9c47abe28e7629 100644 (file)
--- a/user/groupaddnote.php
+++ b/user/groupaddnote.php
@@ -57,7 +57,7 @@ print_heading($straddnote);
 echo '<form method="post" action="groupaddnote.php" >';
 echo '<div style="width:100%;text-align:center;">';
 echo '<input type="hidden" name="id" value="'.$course->id.'" />';
-echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
 $state_names = note_get_state_names();
 
 // the first time list hack

diff --git a/user/groupextendenrol.php b/user/groupextendenrol.php
index 6f32af5ec129f4f631fc52ef5b0e3d7a3f7e94ff..8a64a5893fd0cead4c320acb9bd743a69a6f2597 100755 (executable)
--- a/user/groupextendenrol.php
+++ b/user/groupextendenrol.php
@@ -112,7 +112,7 @@ $title = get_string('groupextendenrol');
 print_heading($title . helpbutton('groupextendenrol', $title, 'moodle', true, false, '', true));
 echo '<form method="post" action="groupextendenrol.php">';
 echo '<input type="hidden" name="id" value="'.$course->id.'" />';
-echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
 $table->head  = array (get_string('fullnameuser'), get_string('enrolmentstart'), get_string('enrolmentend'));
 $table->align = array ('left', 'center', 'center', 'center');
 $table->width = "600";

diff --git a/user/index.php b/user/index.php
index 2082b4098057ef0d9cef423a5aa6acd8855f10d6..d567b97b6026c06cd26d895c56dc706105c14e79 100644 (file)
--- a/user/index.php
+++ b/user/index.php
@@ -665,7 +665,7 @@
             ';
         echo '<form action="action_redir.php" method="post" id="participantsform" onsubmit="return checksubmit(this);">';
         echo '<div>';
-        echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+        echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
         echo '<input type="hidden" name="returnto" value="'.s(me()).'" />';
     }