From 06e48947d36c1dce07a910e8d8c0c2a79c417b2d Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Thu, 30 Jul 2015 10:37:45 +1200 Subject: [PATCH] Fixes #110 use format string when printing course name. all other uses of att-name and course->fullname use functions that perform format_string() already. --- export.php | 2 +- manage.php | 2 +- preferences.php | 4 ++-- report.php | 2 +- sessions.php | 6 +++--- take.php | 2 +- tempedit.php | 2 +- tempmerge.php | 2 +- tempusers.php | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/export.php b/export.php index 534cadb..bbda671 100644 --- a/export.php +++ b/export.php @@ -180,7 +180,7 @@ if ($formdata = $mform->get_data()) { $output = $PAGE->get_renderer('mod_attendance'); $tabs = new attendance_tabs($att, attendance_tabs::TAB_EXPORT); echo $output->header(); -echo $output->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .$course->fullname); +echo $output->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .format_string($course->fullname)); echo $output->render($tabs); $mform->display(); diff --git a/manage.php b/manage.php index 0099d5e..830c61f 100644 --- a/manage.php +++ b/manage.php @@ -78,7 +78,7 @@ $sesstable = new attendance_manage_data($att); // Output starts here. echo $output->header(); -echo $output->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .$course->fullname); +echo $output->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .format_string($course->fullname)); echo $output->render($tabs); echo $output->render($filtercontrols); echo $output->render($sesstable); diff --git a/preferences.php b/preferences.php index 876f595..76d48ab 100644 --- a/preferences.php +++ b/preferences.php @@ -89,7 +89,7 @@ switch ($att->pageparams->action) { ($status->description ? $status->description : get_string('nodescription', 'attendance')); $params = array_merge($att->pageparams->get_significant_params(), array('confirm' => 1)); echo $OUTPUT->header(); - echo $OUTPUT->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .$course->fullname); + echo $OUTPUT->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .format_string($course->fullname)); echo $OUTPUT->confirm($message, $att->url_preferences($params), $att->url_preferences()); echo $OUTPUT->footer(); exit; @@ -130,7 +130,7 @@ $setselector = new attendance_set_selector($att, $maxstatusset); // Output starts here. echo $output->header(); -echo $output->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .$course->fullname); +echo $output->heading(get_string('attendanceforthecourse', 'attendance').' :: ' format_string($course->fullname)); echo $output->render($tabs); echo $output->render($setselector); echo $output->render($prefdata); diff --git a/report.php b/report.php index 915df34..46bd00c 100644 --- a/report.php +++ b/report.php @@ -73,7 +73,7 @@ $event->trigger(); // Output starts here. echo $output->header(); -echo $output->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .$course->fullname); +echo $output->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .format_string($course->fullname)); echo $output->render($tabs); echo $output->render($filtercontrols); echo $output->render($reportdata); diff --git a/sessions.php b/sessions.php index 2b93633..d1f537d 100644 --- a/sessions.php +++ b/sessions.php @@ -109,7 +109,7 @@ switch ($att->pageparams->action) { $params = array('action' => $att->pageparams->action, 'sessionid' => $sessionid, 'confirm' => 1, 'sesskey' => sesskey()); echo $OUTPUT->header(); - echo $OUTPUT->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .$course->fullname); + echo $OUTPUT->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .format_string($course->fullname)); echo $OUTPUT->confirm($message, $att->url_sessions($params), $att->url_manage()); echo $OUTPUT->footer(); exit; @@ -144,7 +144,7 @@ switch ($att->pageparams->action) { 'confirm' => 1, 'sesskey' => sesskey()); echo $OUTPUT->header(); - echo $OUTPUT->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .$course->fullname); + echo $OUTPUT->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .format_string($course->fullname)); echo $OUTPUT->confirm($message, $att->url_sessions($params), $att->url_manage()); echo $OUTPUT->footer(); exit; @@ -179,7 +179,7 @@ switch ($att->pageparams->action) { $output = $PAGE->get_renderer('mod_attendance'); $tabs = new attendance_tabs($att, attendance_tabs::TAB_ADD); echo $output->header(); -echo $output->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .$course->fullname); +echo $output->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .format_string($course->fullname)); echo $output->render($tabs); $mform->display(); diff --git a/take.php b/take.php index e5efed5..055dd27 100644 --- a/take.php +++ b/take.php @@ -70,7 +70,7 @@ $sesstable = new attendance_take_data($att); // Output starts here. echo $output->header(); -echo $output->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .$course->fullname); +echo $output->heading(get_string('attendanceforthecourse', 'attendance').' :: ' .format_string($course->fullname)); echo $output->render($tabs); echo $output->render($sesstable); diff --git a/tempedit.php b/tempedit.php index 15349df..618e6d1 100644 --- a/tempedit.php +++ b/tempedit.php @@ -108,7 +108,7 @@ if ($mform->is_cancelled()) { $tabs = new attendance_tabs($att, attendance_tabs::TAB_TEMPORARYUSERS); echo $output->header(); -echo $output->heading(get_string('tempusersedit', 'attendance').' : '.$course->fullname); +echo $output->heading(get_string('tempusersedit', 'attendance').' : '.format_string($course->fullname)); echo $output->render($tabs); $mform->display(); echo $output->footer($course); diff --git a/tempmerge.php b/tempmerge.php index 216d07a..1afe21f 100644 --- a/tempmerge.php +++ b/tempmerge.php @@ -98,7 +98,7 @@ $output = $PAGE->get_renderer('mod_attendance'); $tabs = new attendance_tabs($att, attendance_tabs::TAB_TEMPORARYUSERS); echo $output->header(); -echo $output->heading(get_string('tempusermerge', 'attendance').' : '.$course->fullname); +echo $output->heading(get_string('tempusermerge', 'attendance').' : '.format_string($course->fullname)); echo $output->render($tabs); $mform->display(); echo $output->footer($course); \ No newline at end of file diff --git a/tempusers.php b/tempusers.php index 8fc2a3d..a919fcc 100644 --- a/tempusers.php +++ b/tempusers.php @@ -81,7 +81,7 @@ if ($data = $mform->get_data()) { /// Output starts here echo $output->header(); -echo $output->heading(get_string('tempusers', 'attendance').' : '.$course->fullname); +echo $output->heading(get_string('tempusers', 'attendance').' : '.format_string($course->fullname)); echo $output->render($tabs); $mform->display();