Now assignment->name works under filterall.

This commit is contained in:
stronk7
2005-03-26 18:14:46 +00:00
parent e88b32089d
commit 2500b88bab
6 changed files with 17 additions and 17 deletions
+2 -2
View File
@@ -77,10 +77,10 @@
$due = userdate($assignment->timedue);
if (!$assignment->visible) {
//Show dimmed if the mod is hidden
$link = "<a class=\"dimmed\" href=\"view.php?id=$assignment->coursemodule\">$assignment->name</a>";
$link = "<a class=\"dimmed\" href=\"view.php?id=$assignment->coursemodule\">".format_string($assignment->name,true)."</a>";
} else {
//Show normal if the mod is visible
$link = "<a href=\"view.php?id=$assignment->coursemodule\">$assignment->name</a>";
$link = "<a href=\"view.php?id=$assignment->coursemodule\">".format_string($assignment->name,true)."</a>";
}
$printsection = "";
+7 -7
View File
@@ -255,11 +255,11 @@ function assignment_cron () {
unset($assignmentinfo);
$assignmentinfo->teacher = fullname($teacher);
$assignmentinfo->assignment = "$submission->name";
$assignmentinfo->assignment = format_string($submission->name,true);
$assignmentinfo->url = "$CFG->wwwroot/mod/assignment/view.php?id=$mod->id";
$postsubject = "$course->shortname: $strassignments: $submission->name";
$posttext = "$course->shortname -> $strassignments -> $submission->name\n";
$postsubject = "$course->shortname: $strassignments: ".format_string($submission->name,true);
$posttext = "$course->shortname -> $strassignments -> ".format_string($submission->name,true)."\n";
$posttext .= "---------------------------------------------------------------------\n";
$posttext .= get_string("assignmentmail", "assignment", $assignmentinfo);
$posttext .= "---------------------------------------------------------------------\n";
@@ -268,7 +268,7 @@ function assignment_cron () {
$posthtml = "<p><font face=\"sans-serif\">".
"<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
"<a href=\"$CFG->wwwroot/mod/assignment/index.php?id=$course->id\">$strassignments</a> ->".
"<a href=\"$CFG->wwwroot/mod/assignment/view.php?id=$mod->id\">$submission->name</a></font></p>";
"<a href=\"$CFG->wwwroot/mod/assignment/view.php?id=$mod->id\">".format_string($submission->name,true)."</a></font></p>";
$posthtml .= "<hr /><font face=\"sans-serif\">";
$posthtml .= "<p>".get_string("assignmentmailhtml", "assignment", $assignmentinfo)."</p>";
$posthtml .= "</font><hr />";
@@ -859,11 +859,11 @@ function assignment_email_teachers($course, $cm, $assignment, $submission) {
foreach ($teachers as $teacher) {
unset($info);
$info->username = fullname($user);
$info->assignment = $assignment->name;
$info->assignment = format_string($assignment->name,true);
$info->url = "$CFG->wwwroot/mod/assignment/submissions.php?id=$assignment->id";
$postsubject = "$strsubmitted: $info->username -> $assignment->name";
$posttext = "$course->shortname -> $strassignments -> $assignment->name\n";
$posttext = "$course->shortname -> $strassignments -> ".format_string($assignment->name,true)."\n";
$posttext .= "---------------------------------------------------------------------\n";
$posttext .= get_string("emailteachermail", "assignment", $info);
$posttext .= "\n---------------------------------------------------------------------\n";
@@ -872,7 +872,7 @@ function assignment_email_teachers($course, $cm, $assignment, $submission) {
$posthtml = "<p><font face=\"sans-serif\">".
"<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
"<a href=\"$CFG->wwwroot/mod/assignment/index.php?id=$course->id\">$strassignments</a> ->".
"<a href=\"$CFG->wwwroot/mod/assignment/view.php?id=$cm->id\">$assignment->name</a></font></p>";
"<a href=\"$CFG->wwwroot/mod/assignment/view.php?id=$cm->id\">".format_string($assignment->name,true)."</a></font></p>";
$posthtml .= "<hr /><font face=\"sans-serif\">";
$posthtml .= "<p>".get_string("emailteachermailhtml", "assignment", $info)."</p>";
$posthtml .= "</font><hr />";
+1 -1
View File
@@ -63,7 +63,7 @@
$newid = insert_record ("assignment",$assignment);
//Do some output
echo "<li>".get_string("modulename","assignment")." \"".$assignment->name."\"</li>";
echo "<li>".get_string("modulename","assignment")." \"".format_string(stripslashes($assignment->name),true)."\"</li>";
backup_flush(300);
if ($newid) {
+2 -2
View File
@@ -32,9 +32,9 @@
$strsubmissions = get_string("submissions", "assignment");
$strsaveallfeedback = get_string("saveallfeedback", "assignment");
print_header_simple($assignment->name, "",
print_header_simple(format_string($assignment->name), "",
"<a href=\"index.php?id=$course->id\">$strassignments</a> ->
<a href=\"view.php?a=$assignment->id\">$assignment->name</a> -> $strsubmissions",
<a href=\"view.php?a=$assignment->id\">".format_string($assignment->name,true)."</a> -> $strsubmissions",
"", "", true, update_module_button($cm->id, $course->id, $strassignment), navmenu($course, $cm));
/// Check to see if groups are being used in this assignment
+2 -2
View File
@@ -23,9 +23,9 @@
$strassignment = get_string("modulename", "assignment");
$strupload = get_string("upload");
print_header_simple("$assignment->name : $strupload", "",
print_header_simple(format_string($assignment->name)." : $strupload", "",
"<a href=index.php?id=$course->id>$strassignments</a> ->
<a href=\"view.php?a=$assignment->id\">$assignment->name</a> -> $strupload",
<a href=\"view.php?a=$assignment->id\">".format_string($assignment->name,true)."</a> -> $strupload",
"", "", true);
if ($submission = get_record("assignment_submissions", "assignment", $assignment->id, "userid", $USER->id)) {
+3 -3
View File
@@ -38,8 +38,8 @@
$strassignments = get_string("modulenameplural", "assignment");
$strassignment = get_string("modulename", "assignment");
print_header_simple($assignment->name, "",
"<a href=\"index.php?id=$course->id\">$strassignments</a> -> $assignment->name",
print_header_simple(format_string($assignment->name), "",
"<a href=\"index.php?id=$course->id\">$strassignments</a> -> ".format_string($assignment->name,true),
"", "", true, update_module_button($cm->id, $course->id, $strassignment), navmenu($course, $cm));
if (isteacher($course->id)) {
@@ -65,7 +65,7 @@
}
print_simple_box_start('center', '70%', '', 5, 'generalbox', 'intro');
print_heading($assignment->name, "center");
print_heading(format_string($assignment->name), "center");
$timedifference = $assignment->timedue - time();
if ($timedifference < 31536000) { // Don't bother showing dates over a year in the future