Convert firstname lastname to fullname() calls, fixing bug 1726

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index 00f976a30bc4c2889898ebeedc69c87a48b5f5d6..0366e08fbc12577f4e960054b10947a288f58baa 100644 (file)
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -174,7 +174,7 @@ function workshop_cron () {
             }
             else {
                 $msg = get_string("mail1", "workshop", $submission->title).
-                    " $assessmentowner->firstname $assessmentowner->lastname.\n";
+                    " ".fullname($assessmentowner)."\n";
             }
             // "The comments and grade can be seen in the workshop assignment '$workshop->name'
             $msg .= get_string("mail2", "workshop", $workshop->name)."\n\n";
@@ -363,7 +363,7 @@ function workshop_cron () {
                     $msg = get_string("mail4", "workshop", $submission->title)." a $course->student.\n";
                     }
                 else {
-                    $msg = get_string("mail4", "workshop", $submission->title)." $assessmentowner->firstname $assessmentowner->lastname.\n";
+                    $msg = get_string("mail4", "workshop", $submission->title)." ".fullname($assessmentowner)."\n";
                     }
                 // "The new comment can be seen in the workshop assignment '$workshop->name'
                 $msg .= get_string("mail5", "workshop", $workshop->name)."\n\n";
@@ -410,7 +410,7 @@ function workshop_cron () {
                     }
                 else {
                     $msg = get_string("mail4", "workshop", $submission->title).
-                        " $submissionowner->firstname $submissionowner->lastname.\n";
+                        " ".fullname($submissionowner)."\n";
                     }
                 // "The new comment can be seen in the workshop assignment '$workshop->name'
                 $msg .= get_string("mail5", "workshop", $workshop->name)."\n\n";
@@ -668,7 +668,7 @@ function workshop_print_recent_activity($course, $isteacher, $timestart) {
                     if (instance_is_visible("workshop",$tempmod)) {
                         $date = userdate($log->time, $strftimerecent);
                         if (isteacher($course->id, $log->userid)) {
-                            echo "<p><font size=1>$date - $log->firstname $log->lastname<br />";
+                            echo "<p><font size=1>$date - ".fullname($log)."<br />";
                             }
                         else { // don't break anonymous rule
                             echo "<p><font size=1>$date - A $course->student<br />";
@@ -709,7 +709,7 @@ function workshop_print_recent_activity($course, $isteacher, $timestart) {
                     if (instance_is_visible("workshop",$tempmod)) {
                         $date = userdate($log->time, $strftimerecent);
                         if (isteacher($course->id, $log->userid)) {
-                            echo "<p><font size=1>$date - $log->firstname $log->lastname<br />";
+                            echo "<p><font size=1>$date - ".fullname($log)."<br />";
                             }
                         else { // don't break anonymous rule
                             echo "<p><font size=1>$date - A $course->student<br />";
@@ -819,7 +819,7 @@ function workshop_print_recent_activity($course, $isteacher, $timestart) {
                     //Obtain the visible property from the instance
                     if (instance_is_visible("workshop",$tempmod)) {
                         $date = userdate($log->time, $strftimerecent);
-                        echo "<p><font size=1>$date - $log->firstname $log->lastname<br />";
+                        echo "<p><font size=1>$date - ".fullname($log)."<br />";
                         echo "\"<a href=\"$CFG->wwwroot/mod/workshop/$log->url\">";
                         echo "$log->name";
                         echo "</a>\"</font></p>";

diff --git a/mod/workshop/locallib.php b/mod/workshop/locallib.php
index 6322832f57654aa06433adc7f36f2940f16b8d6e..9f54ad6b74f8210b7daa789c868d8c6ec559f1e0 100644 (file)
--- a/mod/workshop/locallib.php
+++ b/mod/workshop/locallib.php
@@ -1223,7 +1223,7 @@ function workshop_list_submissions_for_admin($workshop, $order) {
                         $action ="";
                     }
                 }
-                $table->data[] = array("$user->firstname $user->lastname", $title, $action);
+                $table->data[] = array(fullname($user), $title, $action);
             }
         }
         if (isset($table->data)) {
@@ -1279,7 +1279,7 @@ function workshop_list_submissions_for_admin($workshop, $order) {
             }
             $action .= " | <a href=\"submissions.php?action=adminconfirmdelete&a=$workshop->id&sid=$submission->id\">".
                 get_string("delete", "workshop")."</a>";
-            $table->data[] = array("$user->firstname $user->lastname", $submission->title.
+            $table->data[] = array(fullname($user), $submission->title.
                 " ".workshop_print_submission_assessments($workshop, $submission, "teacher").
                 " ".workshop_print_submission_assessments($workshop, $submission, "student"), $action);
         }
@@ -1449,7 +1449,7 @@ function workshop_list_unassessed_student_submissions($workshop, $user) {
                     $action = "<A HREF=\"assessments.php?action=assesssubmission&a=$workshop->id&sid=$submission->id\">".
                         get_string("edit", "workshop")."</A>";
                     $table->data[] = array(workshop_print_submission_title($workshop, $submission), 
-                        $submissionowner->firstname." ".$submissionowner->lastname, $action, $comment);
+                        fullname($submissionowner), $action, $comment);
                     }
                 }
             else { // no assessment
@@ -1457,7 +1457,7 @@ function workshop_list_unassessed_student_submissions($workshop, $user) {
                 $action = "<A HREF=\"assessments.php?action=assesssubmission&a=$workshop->id&sid=$submission->id\">".
                     get_string("assess", "workshop")."</A>";
                 $table->data[] = array(workshop_print_submission_title($workshop, $submission), 
-                    $submissionowner->firstname." ".$submissionowner->lastname, $action, $comment);
+                    fullname($submissionowner), $action, $comment);
                 }
             }
         if (isset($table->data)) {
@@ -1541,8 +1541,7 @@ function workshop_list_ungraded_assessments($workshop, $stype) {
                 $submissionowner = get_record("user", "id", $submission->userid);
                 $assessor = get_record("user", "id", $assessment->userid);
                 $table->data[] = array(workshop_print_submission_title($workshop, $submission), 
-                    $submissionowner->firstname." ".$submissionowner->lastname, 
-                    $assessor->firstname." ".$assessor->lastname, userdate($assessment->timecreated), $action);
+                    fullname($submissionowner), fullname($assessor), userdate($assessment->timecreated), $action);
                 }
             }
         if (isset($table->data)) {
@@ -2151,7 +2150,7 @@ function workshop_print_assessments_by_user_for_admin($workshop, $user) {
 
     if ($assessments =workshop_get_user_assessments($workshop, $user)) {
         foreach ($assessments as $assessment) {
-            echo "<p><center><b>".get_string("assessmentby", "workshop", $user->firstname." ".$user->lastname)."</b></center></p>\n";
+            echo "<p><center><b>".get_string("assessmentby", "workshop", fullname($user))."</b></center></p>\n";
             workshop_print_assessment($workshop, $assessment);
             echo "<p align=\"right\"><a href=\"assessments.php?action=adminconfirmdelete&a=$workshop->id&aid=$assessment->id\">".
                 get_string("delete", "workshop")."</a></p><hr>\n";
@@ -2168,7 +2167,7 @@ function workshop_print_assessments_for_admin($workshop, $submission) {
             if (!$user = get_record("user", "id", $assessment->userid)) {
                 error (" workshop_print_assessments_for_admin: unable to get user record");
                 }
-            echo "<p><center><b>".get_string("assessmentby", "workshop", $user->firstname." ".$user->lastname)."</b></center></p>\n";
+            echo "<p><center><b>".get_string("assessmentby", "workshop", fullname($user))."</b></center></p>\n";
             workshop_print_assessment($workshop, $assessment);
             echo "<p align=\"right\"><a href=\"assessments.php?action=adminconfirmdelete&a=$workshop->id&aid=$assessment->id\">".
                 get_string("delete", "workshop")."</a></p><hr>\n";
@@ -2235,7 +2234,7 @@ function workshop_print_feedback($course, $submission) {
     echo "\n<TD ROWSPAN=3 BGCOLOR=\"$THEME->body\" WIDTH=35 VALIGN=TOP>";
     print_user_picture($teacher->id, $course->id, $teacher->picture);
     echo "</TD>";
-    echo "<TD NOWRAP WIDTH=100% BGCOLOR=\"$THEME->cellheading\">$teacher->firstname $teacher->lastname";
+    echo "<TD NOWRAP WIDTH=100% BGCOLOR=\"$THEME->cellheading\">".fullname($teacher);
     echo "&nbsp;&nbsp;<FONT SIZE=2><I>".userdate($submission->timemarked)."</I>";
     echo "</TR>";
 
@@ -2298,8 +2297,8 @@ function workshop_print_league_table($workshop) {
                         $submission->peergrade) / ($workshop->teacherweight + $workshop->peerweight), 1)) ;
                 }
             else {
-                $table->data[] = array(workshop_print_submission_title($workshop, $submission), $user->firstname." ".
-                    $user->lastname, workshop_print_submission_assessments($workshop, $submission, "teacher"),
+                $table->data[] = array(workshop_print_submission_title($workshop, $submission), fullname($user),
+                    workshop_print_submission_assessments($workshop, $submission, "teacher"),
                     workshop_print_submission_assessments($workshop, $submission, "student"),
                     number_format(($workshop->teacherweight * $submission->teachergrade + $workshop->peerweight *
                         $submission->peergrade) / ($workshop->teacherweight + $workshop->peerweight), 1)) ;

diff --git a/mod/workshop/submissions.php b/mod/workshop/submissions.php
index ccd4229afa4e4ebe93ababd58593cc3e060503f8..69e9d8d592149de60c62299d23a15e88c6b3cbcb 100644 (file)
--- a/mod/workshop/submissions.php
+++ b/mod/workshop/submissions.php
@@ -543,7 +543,7 @@
             } else {
                 $numtext = "$nsubmissions[$userid] <$ndropped[$userid]>";
             } 
-            $table->data[] = array($n, "$user->firstname $user->lastname", 
+            $table->data[] = array($n, fullname($user), 
                     number_format($error * 100 / $varguess, 2)."%", $vargoodtext, 
                     $numtext);
             $n++;
@@ -603,7 +603,7 @@
                     $finalgrade = ($assessmentgrade * $WORKSHOP_FWEIGHTS[$workshop->gradingweight] +
                         $submissiongrade) / ($WORKSHOP_FWEIGHTS[$workshop->gradingweight] + 1.0);
                                if ($n) {
-                        $table->data[] = array("$user->firstname $user->lastname", 
+                        $table->data[] = array(fullname($user), 
                             workshop_print_submission_title($workshop, $submission),
                             workshop_print_user_assessments($workshop, $user),
                             number_format($assessmentgrade, 2),
@@ -612,7 +612,7 @@
                             number_format($submissiongrade, 2),
                             number_format($finalgrade, 2));
                     } else {
-                                   $table->data[] = array("$user->firstname $user->lastname", 
+                                   $table->data[] = array(fullname($user), 
                             workshop_print_submission_title($workshop, $submission),
                             workshop_print_user_assessments($workshop, $user),
                             number_format($assessmentgrade, 2),  
@@ -635,7 +635,7 @@
                 // no submissions
                 $finalgrade = ($assessmentgrade * $WORKSHOP_FWEIGHTS[$workshop->gradingweight]) /
                     ($WORKSHOP_FWEIGHTS[$workshop->gradingweight] + 1.0);
-                       $table->data[] = array("$user->firstname $user->lastname", 
+                       $table->data[] = array(fullname($user),
                             "-", workshop_print_user_assessments($workshop, $user),
                             number_format($assessmentgrade, 2), "-", "-",
                             get_string("nosubmission", "workshop"), 
@@ -839,7 +839,7 @@
                                                        $grade = 0;
                                                        }
                                                // display the grades...
-                                               echo "<TR><TD>$user->firstname $user->lastname</TD>\n";
+                                               echo "<TR><TD>".fullname($user)."</TD>\n";
                                                echo "<TD>".workshop_print_submission_title($workshop, $submission)."</TD>\n";
                                                if ($useteachersgrades) {
                                                        echo "<TD>$teachergrade</TD>\n";
@@ -1066,7 +1066,7 @@
                                ($WORKSHOP_FWEIGHTS[$biasweight] * $usebiasgrades) +
                                ($WORKSHOP_FWEIGHTS[$reliabilityweight] * $usereliabilitygrades) +
                                ($WORKSHOP_FWEIGHTS[$gradingweight] * $usegradinggrades)));
-                       echo "<TR><TD>$user->firstname $user->lastname</TD>";
+                       echo "<TR><TD>".fullname($user)."</TD>";
                        if ($useteachersgrades) {
                                echo "<TD>$teachergrade</TD>";
                                }
@@ -1198,7 +1198,7 @@
                foreach ($users as $user) {
                        if ($submissions = workshop_get_user_submissions($workshop, $user)) {
                                foreach ($submissions as $submission) {
-                                       echo "<tr><td>$user->firstname $user->lastname</td>";
+                                       echo "<tr><td>".fullname($user)".</td>";
                                        echo "<td>".workshop_print_submission_title($workshop, $submission)."</td>\n";
                                        if ($useteachersgrades) {
                                                echo "<td align=\"center\">".workshop_print_submission_assessments($workshop, $submission, "teacher")."</td>";