Fixed firstname lastname to call to fullname function

diff --git a/admin/handlevirus.php b/admin/handlevirus.php
index 0b582b6aaa5b5292f01b07583c4d08bd18ca6f73..5d4b022b5cfe9ecf547a05e5aaa98d4e8d67c0cb 100644 (file)
--- a/admin/handlevirus.php
+++ b/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);

diff --git a/course/enrol.html b/course/enrol.html
index c194bcaac9a863c23994e2d613b55ffe8f38ecd5..41c6eba4dee013828ae391e6ea7d60083c97763f 100644 (file)
--- a/course/enrol.html
+++ b/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 {
 

diff --git a/course/outline_rep.php b/course/outline_rep.php
index 3f0e612a6220a46f123aa00fc03c8a11b8007c58..4872fc687414c803d34f80e42e792a4e92d51fcd 100644 (file)
--- a/course/outline_rep.php
+++ b/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");

diff --git a/lib/uploadlib.php b/lib/uploadlib.php
index b9deffb150626cc17118d4c5a71537465cc83a4c..1f9352c61f94e2c31cb2655dae8e77574dce9bd9 100644 (file)
--- a/lib/uploadlib.php
+++ b/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);

diff --git a/userpix/index.php b/userpix/index.php
index 900ff6d4927b978b20c69befc6280ce7ee5e7474..90762aa7daba80bf0e8ac9e0881c6e9e49f61e12 100644 (file)
--- a/userpix/index.php
+++ b/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";
     }