Renamed set_user_sesskey() to just sesskey(). SC#74

diff --git a/admin/user.php b/admin/user.php
index 876d986f7c36b6ce9275e07b10b8eba30555e513..8ef2ea16575103b39408563855f3d12d1924a359 100644 (file)
--- a/admin/user.php
+++ b/admin/user.php
@@ -67,7 +67,7 @@
         $USER->admin = true;
         $USER->teacher["$site->id"] = true;
         $USER->newadminuser = true;
-        set_user_sesskey(); // for added security, used to check script parameters
+        sesskey(); // for added security, used to check script parameters
 
         redirect("$CFG->wwwroot/user/edit.php?id=$user->id&course=$site->id");
         exit;

diff --git a/blocks/admin/block_admin.php b/blocks/admin/block_admin.php
index 87e25480a94015cd01e799ff318260cc1a765052..49213c8e3b9bd9cfe61a23486de9b463a4e415d9 100644 (file)
--- a/blocks/admin/block_admin.php
+++ b/blocks/admin/block_admin.php
@@ -48,7 +48,7 @@ class block_admin extends block_base {
         }
 
         if (iscreator()) {
-            $this->content->items[] = '<a href="'.$CFG->wwwroot.'/course/index.php?edit=on&amp;sesskey='.set_user_sesskey().'">'.get_string('courses').'</a>';
+            $this->content->items[] = '<a href="'.$CFG->wwwroot.'/course/index.php?edit=on&amp;sesskey='.sesskey().'">'.get_string('courses').'</a>';
             $this->content->icons[] = '<img src="'.$CFG->pixpath.'/i/course.gif" height="16" width="16" alt="" />';
         }
 

diff --git a/blocks/pagedemo.php b/blocks/pagedemo.php
index ada8efc7c61b356184f7c295a2d82f93f4cc6f7e..d0eb11916594dd386827daa9a7c1138b2417d341 100644 (file)
--- a/blocks/pagedemo.php
+++ b/blocks/pagedemo.php
@@ -165,7 +165,14 @@
     if(blocks_have_content($pageblocks[BLOCK_POS_CENTERUP]) || $editing) {
         blocks_print_group($PAGE, $pageblocks[BLOCK_POS_CENTERUP]);
     }
-    echo '<div style="padding: 10px; background: gold; text-align: center;">Content Here</div>';
+
+
+    echo '<div style="padding: 10px; background: gold; text-align: center;">';
+    $time = mktime(0, 0, 0, 1, 1, 2005, 0);
+    print_object(oldgetdate($time));
+    print_object(usergetdate($time));
+    echo 'Content Here</div>';
+
     echo '<p style="text-align: center; padding: 10px; background: black; color: white;">Center-down position:</p>';
     if(blocks_have_content($pageblocks[BLOCK_POS_CENTERDOWN]) || $editing) {
         blocks_print_group($PAGE, $pageblocks[BLOCK_POS_CENTERDOWN]);
@@ -185,4 +192,28 @@
 
     echo '</tr></table>';
     print_footer();
+
+function oldgetdate($date) {
+    $timezone = get_user_timezone(99);
+
+    if (abs($timezone) > 13) {
+        return getdate($date);
+    }
+    //There is no gmgetdate so I have to fake it...
+    $date = $date + (int)($timezone * HOURSECS);
+
+    $getdate['seconds'] = gmstrftime("%S", $date);      
+    $getdate['minutes'] = gmstrftime("%M", $date);
+    $getdate['hours']   = gmstrftime("%H", $date);
+    $getdate['mday']    = gmstrftime("%d", $date);
+    $getdate['wday']    = gmstrftime("%u", $date);
+    $getdate['mon']     = gmstrftime("%m", $date);
+    $getdate['year']    = gmstrftime("%Y", $date);
+    $getdate['yday']    = gmstrftime("%j", $date);
+    $getdate['weekday'] = gmstrftime("%A", $date);
+    $getdate['month']   = gmstrftime("%B", $date);
+    
+    return $getdate;
+}
+
 ?>

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index cbdf458cac50d849a1e52afad168dbc2d6c9733c..c99196702f1513a15631d924b00239c9cb2ddf2a 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -795,7 +795,7 @@ function get_user_timezone($tz = 99) {
 // Makes sure that $USER->sesskey exists, if $USER itself exists. It sets a new sesskey
 // if one does not already exist, but does not overwrite existing sesskeys. Returns the
 // sesskey string if $USER exists, or boolean false if not.
-function set_user_sesskey() {
+function sesskey() {
     global $USER;
 
     if(!isset($USER)) {
@@ -879,7 +879,7 @@ function require_login($courseid=0, $autologinguest=true) {
     }
 
     // Make sure the USER has a sesskey set up.  Used for checking script parameters.
-    set_user_sesskey();
+    sesskey();
 
     // Check that the user has agreed to a site policy if there is one
     if (!empty($CFG->sitepolicy)) {

diff --git a/login/index.php b/login/index.php
index 2bb37450723b90bf33ad0863ea842b51ffd401d3..8cf423548b8611f5f0118cdfea8016e41f9fd4a1 100644 (file)
--- a/login/index.php
+++ b/login/index.php
@@ -82,7 +82,7 @@
             }
             $USER->loggedin = true;
             $USER->site     = $CFG->wwwroot; // for added security, store the site in the session
-            set_user_sesskey();              // for added security, used to check script parameters
+            sesskey();                       // for added security, used to check script parameters
 
             if ($USER->username == "guest") {
                 $USER->lang       = $CFG->lang;               // Guest language always same as site