diff --git a/course/lib.php b/course/lib.php
index 173c8568044..523189e32e4 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -320,15 +320,14 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate="today"
                 $selectedactivity = "$mod->cm";
             }
         }
-
-        if (isadmin() && !$course->category) {
-            $activities["site_errors"] = get_string("siteerrors");
-            if ($modid === "site_errors") {
-            $selectedactivity = "site_errors";
-            }
-        }
     }
 
+    if (isadmin() && !$course->category) {
+        $activities["site_errors"] = get_string("siteerrors");
+        if ($modid === "site_errors") {
+            $selectedactivity = "site_errors";
+        }
+    }
 
     $strftimedate = get_string("strftimedate");
     $strftimedaydate = get_string("strftimedaydate");
@@ -398,6 +397,9 @@ function make_log_url($module, $url) {
         case "admin":
             return "/$module/$url";
             break;
+        case "upload":
+            return "$url";
+            break;
         case "library":
         case "":
             return "/";
@@ -448,7 +450,7 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
     }
 
     if ('site_errors' === $modid) {
-        $joins[] = "l.action='error'";
+        $joins[] = "l.action='error' OR l.action='infected'";
     } else if ($modid) {
         $joins[] = "l.cmid = '$modid'";
     }
diff --git a/lib/uploadlib.php b/lib/uploadlib.php
index f08fc807faf..6463abd9b26 100644
--- a/lib/uploadlib.php
+++ b/lib/uploadlib.php
@@ -607,7 +607,7 @@ function clam_log_upload($newfilepath,$course=null) {
     if ($course) {
         $courseid = $course->id;
     }
-    add_to_log($courseid,"upload","upload","",$newfilepath);
+    add_to_log($courseid,"upload","upload",$_SERVER['HTTP_REFERER'],$newfilepath);
 }
 
 /**
@@ -618,7 +618,7 @@ function clam_log_upload($newfilepath,$course=null) {
  */
 function clam_log_infected($oldfilepath='',$newfilepath='',$userid=0) {
 
-    add_to_log(0,"upload","infected","",$oldfilepath,0,$userid);
+    add_to_log(0,"upload","infected",$_SERVER['HTTP_REFERER'],$oldfilepath,0,$userid);
     
     $user = get_record('user','id',$userid);
     
diff --git a/lib/weblib.php b/lib/weblib.php
index ab07ea10b78..09aa1470e47 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -336,6 +336,10 @@ function link_to_popup_window ($url, $name="popup", $linkname="click here",
     }
     $fullscreen = 0;
 
+    if (!(strpos($url,$CFG->wwwroot) === false)) { // some log url entries contain _SERVER[HTTP_REFERRER] in which case wwwroot is already there.
+        $url = substr($url,strlen($CFG->wwwroot)+1);
+    }
+
     $link = "<a target=\"$name\" title=\"$title\" href=\"$CFG->wwwroot$url\" ".
            "onclick=\"return openpopup('$url', '$name', '$options', $fullscreen);\">$linkname</a>\n";
     if ($return) {