Robustness fixes

diff --git a/lib/datalib.php b/lib/datalib.php
index 6b788d99a7182132ec2c219d96e306ac5e708179..3a0508518405df49fac4c172c98e25bf44032bcd 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -863,6 +863,8 @@ function add_to_log($course, $module, $action, $url="", $info="") {
         return;
     }
 
+    $userid = empty($USER->id) ? "" : $USER->id;
+
     $timenow = time();
     $info = addslashes($info);
 
@@ -875,7 +877,7 @@ function add_to_log($course, $module, $action, $url="", $info="") {
                                         url,
                                         info)
                              VALUES ('$timenow',
-                                        '$USER->id',
+                                        '$userid',
                                         '$course',
                                         '$REMOTE_ADDR',
                                         '$module',

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index eb8d96074800006a3059915a7d826dfd19490f74..c2b21adf645a88b5bc40bfeef564cf9d63696530 100644 (file)
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -52,7 +52,7 @@
         error("Discussion no longer exists", "$CFG->wwwroot/mod/forum/view.php?f=$forum->id");
     }
 
-    if (!$navtail) {
+    if (empty($navtail)) {
         $navtail = "<A HREF=\"discuss.php?d=$discussion->id\">$discussion->name</A> -> $post->subject";
     }
 

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index f47664f90a2eca355e4f23bdec80f69eacb672a1..93244cf527422b62302e17587e3aa6f9a161f3e1 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1333,7 +1333,11 @@ function forum_print_user_discussions($courseid, $userid) {
             }
             $inforum = get_string("inforum", "forum", "<A HREF=\"$CFG->wwwroot/mod/forum/view.php?f=$discussion->forumid\">$discussion->forumname</A>");
             $discussion->subject .= " ($inforum)";
-            $ownpost = ($discussion->userid == $USER->id);
+            if (!empty($USER->id)) {
+                $ownpost = ($discussion->userid == $USER->id);
+            } else {
+                $ownpost = false;
+            }
             forum_print_post($discussion, $courseid, $ownpost, $reply=0, $link=1, $assessed=false);
             echo "<BR>\n";
         }
@@ -1505,7 +1509,11 @@ function forum_print_discussion($course, $forum, $discussion, $post, $mode) {
 
     global $USER;
 
-    $ownpost = ($USER->id == $post->userid);
+    if (!empty($USER->id)) {
+        $ownpost = ($USER->id == $post->userid);
+    } else {
+        $ownpost = false;
+    }
     $reply   = forum_user_can_post($forum);
 
     forum_print_post($post, $course->id, $ownpost, $reply, $link=false, $rate=false);
@@ -1513,7 +1521,7 @@ function forum_print_discussion($course, $forum, $discussion, $post, $mode) {
     forum_print_mode_form($discussion->id, $mode);
 
     $ratingform = false;
-    if ($forum->assessed && $USER->id) {
+    if ($forum->assessed and !empty($USER->id)) {
         $unrated = forum_count_unrated_posts($discussion->id, $USER->id);
         if ($unrated > 0) {
             $ratingform = true;
@@ -1609,7 +1617,11 @@ function forum_print_posts_nested($parent, $course, $assessed, $reply) {
     if ($posts = forum_get_child_posts($parent)) {
         foreach ($posts as $post) {
 
-            $ownpost = ($USER->id == $post->userid);
+            if (empty($USER->id)) {
+                $ownpost = false;
+            } else {
+                $ownpost = ($USER->id == $post->userid);
+            }
 
             echo "<UL>";
             forum_print_post($post, $course, $ownpost, $reply, $link, $assessed);

diff --git a/mod/forum/view.php b/mod/forum/view.php
index 0d616090dcf66f5de76305043785cf3472567f77..24f6517dad0e6768681fcf3a76de02eebc25e5f5 100644 (file)
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -6,6 +6,7 @@
     optional_variable($id);      // Course Module ID
     optional_variable($f);       // Forum ID
     optional_variable($mode);    // Display mode (for single forum)
+    optional_variable($search, "");    // search string
 
 
     $strforums = get_string("modulenameplural", "forum");

diff --git a/user/view.php b/user/view.php
index f90da796db7f49c27db3b7b3d19768e3ec2c7b09..0a6d88a164ada13ee282c049c8e642692e87577f 100644 (file)
--- a/user/view.php
+++ b/user/view.php
@@ -61,7 +61,12 @@
     echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=0 CELLSPACING=0><TR><TD NOWRAP>";
     echo "<H3>$fullname</H3>";
     echo "</TD><TD align=right>";
-    if (($id == $USER->id and !isguest()) or isadmin()) {
+    if (empty($USER->id)) {
+       $currentuser = false;
+    } else {
+       $currentuser = ($user->id == $USER->id);
+    }
+    if (($currentuser and !isguest()) or isadmin()) {
         echo "<P><FORM ACTION=edit.php METHOD=GET>";
         echo "<INPUT type=hidden name=id value=\"$id\">";
         echo "<INPUT type=hidden name=course value=\"$course->id\">";
@@ -128,7 +133,7 @@
 
 //  Print other functions
     echo "<CENTER><TABLE ALIGN=CENTER><TR>";
-    if ($user->id == $USER->id and !isguest()) {
+    if ($currentuser and !isguest()) {
         if ($CFG->auth == "email" or $CFG->auth == "none") {
             echo "<TD NOWRAP><P><FORM ACTION=\"$CFG->wwwroot/login/change_password.php\" METHOD=GET>";
             echo "<INPUT type=hidden name=id value=\"$course->id\">";