Fixed firstname lastname to call to fullname function

admin/handlevirus.php

@@ -45,7 +45,7 @@ while(!feof($fd)) {
 
     $a->action = $action;
     $a->course = $course->fullname;
-    $a->user = $user->firstname.' '.$user->lastname;
+    $a->user = fullname($user);
 
     notify_user($user,$subject,$a);
     notify_admins($user,$subject,$a);

course/enrol.html

@@ -10,9 +10,7 @@
 
           if ($teacher) {
 
-              $teachername = "<a href=\"../user/view.php?id=$teacher->id&course=$site->id\">".
-
-                             "$teacher->firstname $teacher->lastname</a>.";
+              $teachername = "<a href=\"../user/view.php?id=$teacher->id&course=$site->id\">".fullname($teacher)."</a>.";
 
           } else {
 

course/outline_rep.php

@@ -36,7 +36,7 @@
                   $stractivityreport");
     } else {
         print_header("$course->shortname: $stractivityreport ($mode)", "$course->fullname",
-                 "<a href=\"../user/view.php?id=$user->id&amp;course=$course->id\">$user->firstname $user->lastname</a> -> 
+                 "<a href=\"../user/view.php?id=$user->id&amp;course=$course->id\">".fullname($user)."</a> -> 
                   $stractivityreport -> $strmode");
     }
     print_heading("$course->fullname");

lib/uploadlib.php

@@ -612,7 +612,7 @@ function clam_scan_file(&$file, $course) {
         else {
             $info->course = 'No course';
         }
-        $info->user = $USER->firstname .' '. $USER->lastname;
+        $info->user = fullname($USER);
         $notice = get_string('virusfound', 'moodle', $info);
         $notice .= "\n\n". implode("\n", $output);
         $notice .= "\n\n". clam_handle_infected_file($fullpath); 
@@ -730,7 +730,7 @@ function clam_log_infected($oldfilepath='', $newfilepath='', $userid=0) {
     $user = get_record('user', 'id', $userid);
     
     $errorstr = 'Clam AV has found a file that is infected with a virus. It was uploaded by '
-        . ((empty($user) ? ' an unknown user ' : $user->firstname . ' '. $user->lastname))
+        . ((empty($user) ? ' an unknown user ' : fullname($user)))
         . ((empty($oldfilepath)) ? '. The infected file was caught on upload ('.$oldfilepath.')' 
            : '. The original file path of the infected file was '. $oldfilepath)
         . ((empty($newfilepath)) ? '. The file has been deleted ' : '. The file has been moved to a quarantine directory and the new path is '. $newfilepath);

userpix/index.php

@@ -26,9 +26,9 @@
     
     foreach ($users as $user) {
        echo "<a href=\"$CFG->wwwroot/user/view.php?id=$user->id&amp;course=1\"".
-            "title=\"$user->firstname $user->lastname\">";
+            "title=\"".fullname($user)."\">";
        echo "<img border=0 src=\"$CFG->wwwroot/user/pix.php/$user->id/f1.jpg\" ".
-            "width=100 height=100 alt=\"$user->firstname $user->lastname\" />";
+            "width=100 height=100 alt=\"".fullname($user)."\" />";
        echo "</a> \n";
     }