Use the new fullname function

diff --git a/admin/admin.php b/admin/admin.php
index 53e8a1a38f781887bb4a5dad3d8fd7365d2ffbec..dd2855d9e757daa3816722aeb9c875cef76011d9 100644 (file)
--- a/admin/admin.php
+++ b/admin/admin.php
@@ -97,7 +97,7 @@
 
         foreach ($admins as $admin) {
             $adminarray[] = $admin->id;
-            echo "<p align=right>$admin->firstname $admin->lastname,
+            echo "<p align=right>".fullname($admin, true).",
                      $admin->email &nbsp;&nbsp; ";
             if ($primaryadmin->id == $admin->id){
                 print_spacer(10, 9, false);
@@ -138,7 +138,7 @@
         foreach ($users as $user) {
             echo "<p align=left><a href=\"{$_SERVER['PHP_SELF']}?add=$user->id\"".
                    "title=\"$straddadmin\"><img src=\"../pix/t/left.gif\"".
-                   "border=0></a>&nbsp;&nbsp;$user->firstname $user->lastname, $user->email";
+                   "border=0></a>&nbsp;&nbsp;".fullname($user).", $user->email";
         }
     }
 

diff --git a/admin/creators.php b/admin/creators.php
index e288f20906fdcea9304bdf14e65f79c94980e7b4..f7f93dc4ef256590e72e7f602a0900eec2e95074 100755 (executable)
--- a/admin/creators.php
+++ b/admin/creators.php
@@ -94,8 +94,7 @@
         $creatorarray = array();
         foreach ($creators as $creator) {
             $creatorarray[] = $creator->id;
-            echo "<p align=right>$creator->firstname $creator->lastname,
-            $creator->email &nbsp;&nbsp; ";
+            echo "<p align=right>".fullname($creator, true).", $creator->email &nbsp;&nbsp; ";
                 echo "<a href=\"{$_SERVER['PHP_SELF']}?remove=$creator->id\"
                 title=\"$strremovecreator\"><img src=\"../pix/t/right.gif\"
                 border=0></a>";

diff --git a/admin/cron.php b/admin/cron.php
index 9e41abc860c59521d955b21499d77d8a00cf3477..cad92b3bbce252f2f0acbbc4100956bef35194d3 100644 (file)
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -70,7 +70,7 @@
         if ($users = get_users_unconfirmed($oneweek)) {
             foreach ($users as $user) {
                 if (delete_records("user", "id", $user->id)) {
-                    echo "Deleted unconfirmed user for $user->firstname $user->lastname ($user->id)\n";
+                    echo "Deleted unconfirmed user for ".fullname($user, true)." ($user->id)\n";
                 }
             }
         }

diff --git a/admin/user.php b/admin/user.php
index 1bd7f0c5c86f376d723c948eb2de2efc2069f671..b176fb42f7c38f324520bd877927920ff261a833 100644 (file)
--- a/admin/user.php
+++ b/admin/user.php
@@ -119,7 +119,8 @@
             }
 
             if ($confirm != md5($delete)) {
-                notice_yesno(get_string("deletecheckfull", "", "'$user->firstname $user->lastname'"),
+                $fullname = fullname($user, true);
+                notice_yesno(get_string("deletecheckfull", "", "'$fullname'"),
                      "user.php?delete=$delete&confirm=".md5($delete), "user.php");
 
                 exit;

diff --git a/course/format/social.php b/course/format/social.php
index 5aac35aeefbfbdd97b37648e5efa89ab899a14ed..469a68e20f7146d19a45c7c91f0e8d1ae722c167 100644 (file)
--- a/course/format/social.php
+++ b/course/format/social.php
@@ -14,7 +14,8 @@
       <?php 
       $moddata[]="<a title=\"".get_string("listofallpeople")."\" href=\"../user/index.php?id=$course->id\">".get_string("participants")."</a>";
       $modicon[]="<img src=\"$CFG->pixpath/i/users.gif\" height=16 width=16 alt=\"\">";
-      $editmyprofile = "<a title=\"$USER->firstname $USER->lastname\" href=\"../user/edit.php?id=$USER->id&course=$course->id\">".
+      $fullname = fullname($USER, true);
+      $editmyprofile = "<a title=\"$fullname\" href=\"../user/edit.php?id=$USER->id&course=$course->id\">".
                         get_string("editmyprofile")."</A>";
       if ($USER->description) {
           $moddata[]= $editmyprofile;

diff --git a/course/format/topics.php b/course/format/topics.php
index cd5ea8e27d6d72caf1f7ba2e786600e9143b0a38..7b56ccb661b084ec4634387b4d37bf0f2ee4ae1b 100644 (file)
--- a/course/format/topics.php
+++ b/course/format/topics.php
@@ -55,7 +55,8 @@
 /// Links to people
     $moddata[]="<a title=\"".get_string("listofallpeople")."\" href=\"../user/index.php?id=$course->id\">".get_string("participants")."</a>";
     $modicon[]="<img src=\"$CFG->pixpath/i/users.gif\" height=16 width=16 alt=\"\">";
-    $editmyprofile = "<a title=\"$USER->firstname $USER->lastname\" href=\"../user/edit.php?id=$USER->id&course=$course->id\">".get_string("editmyprofile")."</a>";
+    $fullname = fullname($USER, true);
+    $editmyprofile = "<a title=\"$fullname\" href=\"../user/edit.php?id=$USER->id&course=$course->id\">".get_string("editmyprofile")."</a>";
     if ($USER->description) {
         $moddata[]= $editmyprofile;
     } else {

diff --git a/course/format/weeks.php b/course/format/weeks.php
index 2932a6318ead2c2a59e1b9cbac9693dacc999572..b6cd11a91fa63b9357a7e1c81c7b338a48a10755 100644 (file)
--- a/course/format/weeks.php
+++ b/course/format/weeks.php
@@ -43,7 +43,8 @@
 /// Links to people
     $moddata[]="<a title=\"".get_string("listofallpeople")."\" href=\"../user/index.php?id=$course->id\">".get_string("participants")."</a>";
     $modicon[]="<img src=\"$CFG->pixpath/i/users.gif\" height=16 width=16 alt=\"\">";
-    $editmyprofile = "<a title=\"$USER->firstname $USER->lastname\" href=\"../user/edit.php?id=$USER->id&course=$course->id\">".get_string("editmyprofile")."</a>";
+    $fullname = fullname($USER, true);
+    $editmyprofile = "<a title=\"$fullname\" href=\"../user/edit.php?id=$USER->id&course=$course->id\">".get_string("editmyprofile")."</a>";
     if ($USER->description) {
         $moddata[]= $editmyprofile;
     } else {

diff --git a/user/edit.php b/user/edit.php
index b9c7fbc263217105dcea99e0dc535c2644a85dee..7cc890674e41946bb5ef2097b4997042c30eb3eb 100644 (file)
--- a/user/edit.php
+++ b/user/edit.php
@@ -116,7 +116,7 @@
         if ($newaccount) {
             $userfullname = $strnewuser;
         } else {
-            $userfullname = "$user->firstname $user->lastname";
+            $userfullname = fullname($user, isteacher($course->id));
         }
         if ($course->category) {
             print_header("$course->shortname: $streditmyprofile", "$course->fullname: $streditmyprofile",

diff --git a/user/lib.php b/user/lib.php
index 2c376be0e69c722b748bab4248e2f7b30fc3669d..9710e5a1f4300a3a82a7bf3942a4b22710103db1 100644 (file)
--- a/user/lib.php
+++ b/user/lib.php
@@ -180,7 +180,7 @@ function print_user($user, $course, $string, $countries) {
     echo "</a>";
     echo "</td><td width=100% bgcolor=#ffffff valign=top class=\"userinfoboxsummary\">";
     echo "<font size=-1>";
-    echo "<font size=3><b>$user->firstname $user->lastname</b></font>";
+    echo "<font size=3><b>".fullname($user, isteacher($course->id))."</b></font>";
     echo "<p>";
     if (!empty($user->role) and ($user->role <> $course->teacher)) {
         echo "$string->role: $user->role<br />";

diff --git a/user/view.php b/user/view.php
index dfb99f369a7a5d9ea3ea17a9df17d229bc505961..f9e5b35228bdf0f72ac32d9b2af613fc71995fc3 100644 (file)
--- a/user/view.php
+++ b/user/view.php
@@ -30,7 +30,7 @@
         $user->lastaccess = $teacher->timeaccess;
     }
 
-    $fullname = "$user->firstname $user->lastname";
+    $fullname = fullname($user, isteacher($course->id));
     $personalprofile = get_string("personalprofile");
     $participants = get_string("participants");