Use fullname function for names

diff --git a/course/loginas.php b/course/loginas.php
index 24aa7fd828a3b0c0fe2fe4a056bb2f6e4b6e0b12..b71342315e5de785ff3b2748fed7e73cadab4576 100644 (file)
--- a/course/loginas.php
+++ b/course/loginas.php
@@ -38,7 +38,7 @@
 
     // Login as this student and return to course home page.
 
-    $teacher_name = "$USER->firstname $USER->lastname";
+    $teacher_name = fullname($USER, true);
     $teacher_id   = "$USER->id";
 
     $USER = get_user_info_from_db("id", $user);
@@ -47,7 +47,7 @@
     $USER->realuser = $teacher_id;
 
     set_moodle_cookie($USER->username);
-    $student_name = "$USER->firstname $USER->lastname";
+    $student_name = fullname($USER, true);
 
     add_to_log($course->id, "course", "loginas", "../user/view.php?id=$course->id&user=$user", "$teacher_name -> $student_name");
 

diff --git a/login/change_password.php b/login/change_password.php
index 5dea6482f141ddc809da15cb6d73e3318422733f..21a5cde598523fa72cd2bf015bdb547a9f9ddb3c 100644 (file)
--- a/login/change_password.php
+++ b/login/change_password.php
@@ -43,10 +43,11 @@
             $strpasswordchanged = get_string("passwordchanged");
 
             if ($course->id) {
+                $fullname = fullname($USER, true);
                    print_header($strpasswordchanged, $strpasswordchanged,
                              "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> ->
                               <A HREF=\"$CFG->wwwroot/user/index.php?id=$course->id\">".get_string("participants")."</A> ->
-                              <A HREF=\"$CFG->wwwroot/user/view.php?id=$USER->id&course=$course->id\">$USER->firstname $USER->lastname</A> -> $strpasswordchanged", $focus);
+                              <A HREF=\"$CFG->wwwroot/user/view.php?id=$USER->id&course=$course->id\">$fullname</A> -> $strpasswordchanged", $focus);
                            notice($strpasswordchanged, "$CFG->wwwroot/user/view.php?id=$USER->id&course=$id");
             } else {
                            print_header($strpasswordchanged, $strpasswordchanged, $strpasswordchanged, "");
@@ -76,10 +77,11 @@
 
     $strchangepassword = get_string("changepassword");
     if (!empty($course->id)) {
+        $fullname = fullname($USER, true);
            print_header($strchangepassword, $strchangepassword,
                      "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> ->
                       <A HREF=\"$CFG->wwwroot/user/index.php?id=$course->id\">".get_string("participants")."</A> ->
-                      <A HREF=\"$CFG->wwwroot/user/view.php?id=$USER->id&course=$course->id\">$USER->firstname $USER->lastname</A> -> $strchangepassword", $focus);
+                      <A HREF=\"$CFG->wwwroot/user/view.php?id=$USER->id&course=$course->id\">$fullname</A> -> $strchangepassword", $focus);
     } else {
            print_header($strchangepassword, $strchangepassword, $strchangepassword, $focus);
     }