Skip to content

Commit

Permalink
Fixed firstname lastname to call to fullname function
Browse files Browse the repository at this point in the history
  • Loading branch information
mjollnir_ committed Sep 29, 2004
1 parent 02f58f8 commit 92e754e
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion admin/handlevirus.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

$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);
Expand Down
4 changes: 1 addition & 3 deletions course/enrol.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion course/outline_rep.php
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions lib/uploadlib.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions userpix/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}

Expand Down

0 comments on commit 92e754e

Please sign in to comment.