From d7143408df911641624925752e325cfa68296462 Mon Sep 17 00:00:00 2001 From: gustav_delius Date: Sun, 25 Jan 2004 20:34:54 +0000 Subject: [PATCH] replaced incorrectly closed html tags, see bug 365 --- mod/choice/mod.html | 4 +- mod/exercise/submissions.php | 661 ++++++++++++++++++----------------- mod/forum/lib.php | 2 +- mod/forum/post.html | 2 +- mod/glossary/edit.html | 2 +- mod/glossary/formats.php | 12 +- mod/glossary/import.html | 4 +- mod/glossary/lib.php | 6 +- mod/glossary/mod.html | 4 +- mod/glossary/print.php | 2 +- mod/journal/lib.php | 2 +- mod/journal/view.php | 2 +- mod/quiz/description.html | 2 +- mod/quiz/editmultianswer.php | 2 +- mod/quiz/lib.php | 2 +- mod/quiz/match.html | 4 +- mod/quiz/multichoice.html | 2 +- mod/quiz/numerical.html | 2 +- mod/quiz/randomsamatch.html | 2 +- mod/quiz/shortanswer.html | 2 +- mod/quiz/truefalse.html | 2 +- mod/resource/details.php | 2 +- mod/resource/mod.html | 4 +- mod/survey/details.php | 6 +- mod/survey/lib.php | 2 +- 25 files changed, 370 insertions(+), 367 deletions(-) diff --git a/mod/choice/mod.html b/mod/choice/mod.html index 0dce24aad3b..169ef37c89f 100644 --- a/mod/choice/mod.html +++ b/mod/choice/mod.html @@ -138,7 +138,7 @@ require("$CFG->dirroot/mod/choice/lib.php"); choose_from_menu($CHOICE_PUBLISH, "publish", "$form->publish", ""); ?> -
+
@@ -149,7 +149,7 @@ $options[1] = get_string("yes"); choose_from_menu($options, "showunanswered", "$form->showunanswered", ""); ?> -
+
diff --git a/mod/exercise/submissions.php b/mod/exercise/submissions.php index 39c4ff0776e..54dd4f02de0 100644 --- a/mod/exercise/submissions.php +++ b/mod/exercise/submissions.php @@ -1,21 +1,21 @@ course)) { - error("Course is misconfigured"); - } + if (! $course = get_record("course", "id", $cm->course)) { + error("Course is misconfigured"); + } - if (! $exercise = get_record("exercise", "id", $cm->instance)) { - error("Course module is incorrect"); - } + if (! $exercise = get_record("exercise", "id", $cm->instance)) { + error("Course module is incorrect"); + } require_login($course->id); @@ -48,219 +48,219 @@ $strexercise = get_string("modulename", "exercise"); $strsubmissions = get_string("submissions", "exercise"); - // ... print the header and... + // ... print the header and... print_header("$course->shortname: $exercise->name", "$course->fullname", "$navigation id>$strexercises -> id\">$exercise->name -> $strsubmissions", "", "", true); - //...get the action! - require_variable($action); - + //...get the action! + require_variable($action); + - /******************* admin amend title ************************************/ - if ($action == 'adminamendtitle' ) { + /******************* admin amend title ************************************/ + if ($action == 'adminamendtitle' ) { - if (!isteacher($course->id)) { - error("Only teachers can look at this page"); - } - if (empty($_GET['sid'])) { - error("Admin Amend Title: submission id missing"); - } - - $submission = get_record("exercise_submissions", "id", $_GET['sid']); - print_heading(get_string("amendtitle", "exercise")); - ?> -
- - - -
- - id)) { + error("Only teachers can look at this page"); + } + if (empty($_GET['sid'])) { + error("Admin Amend Title: submission id missing"); + } + + $submission = get_record("exercise_submissions", "id", $_GET['sid']); + print_heading(get_string("amendtitle", "exercise")); + ?> + + + + +
+
+ \n"; - echo " \n"; - echo "

". get_string("title", "exercise").":

\n"; - echo " title\">\n"; - echo "
\n"; - echo "\n"; - echo "
\n"; + // now get the comment + echo "\n"; + echo "

". get_string("title", "exercise").":

\n"; + echo " \n"; + echo " title\">\n"; + echo " \n"; + echo "\n"; + echo "\n"; - } - + } + - /******************* admin clear late (flag) ************************************/ - elseif ($action == 'adminclearlate' ) { + /******************* admin clear late (flag) ************************************/ + elseif ($action == 'adminclearlate' ) { - if (!isteacher($course->id)) { - error("Only teachers can look at this page"); - } - if (empty($_GET['sid'])) { - error("Admin clear late flag: submission id missing"); - } - - if (!$submission = get_record("exercise_submissions", "id", $_GET['sid'])) { - error("Admin clear late flag: can not get submission record"); - } - if (set_field("exercise_submissions", "late", 0, "id", $_GET['sid'])) { - print_heading(get_string("clearlateflag", "exercise")." ".get_string("ok")); - } + if (!isteacher($course->id)) { + error("Only teachers can look at this page"); + } + if (empty($_GET['sid'])) { + error("Admin clear late flag: submission id missing"); + } + + if (!$submission = get_record("exercise_submissions", "id", $_GET['sid'])) { + error("Admin clear late flag: can not get submission record"); + } + if (set_field("exercise_submissions", "late", 0, "id", $_GET['sid'])) { + print_heading(get_string("clearlateflag", "exercise")." ".get_string("ok")); + } add_to_log($course->id, "exercise", "late flag cleared", "view.php?id=$cm->id", "submission $submission->id"); - - print_continue("submissions.php?id=$cm->id&action=adminlist"); - } - + + print_continue("submissions.php?id=$cm->id&action=adminlist"); + } + - /******************* admin confirm delete ************************************/ - elseif ($action == 'adminconfirmdelete' ) { + /******************* admin confirm delete ************************************/ + elseif ($action == 'adminconfirmdelete' ) { - if (!isteacher($course->id)) { - error("Only teachers can look at this page"); - } - if (empty($_GET['sid'])) { - error("Admin confirm delete: submission id missing"); - } - if (!$submission = get_record("exercise_submissions", "id", $_GET['sid'])) { - error("Admin delete: can not get submission record"); - } + if (!isteacher($course->id)) { + error("Only teachers can look at this page"); + } + if (empty($_GET['sid'])) { + error("Admin confirm delete: submission id missing"); + } + if (!$submission = get_record("exercise_submissions", "id", $_GET['sid'])) { + error("Admin delete: can not get submission record"); + } if (isteacher($course->id, $submission->userid)) { if (!isteacheredit($course->id)) { error("Only teacher with editing permissions can delete teacher submissions."); } } - notice_yesno(get_string("confirmdeletionofthisitem","exercise", get_string("submission", "exercise")), - "submissions.php?action=admindelete&id=$cm->id&sid=$_GET[sid]", "submissions.php?id=$cm->id&action=adminlist"); - } - + notice_yesno(get_string("confirmdeletionofthisitem","exercise", get_string("submission", "exercise")), + "submissions.php?action=admindelete&id=$cm->id&sid=$_GET[sid]", "submissions.php?id=$cm->id&action=adminlist"); + } + - /******************* admin delete ************************************/ - elseif ($action == 'admindelete' ) { + /******************* admin delete ************************************/ + elseif ($action == 'admindelete' ) { - if (!isteacher($course->id)) { - error("Only teachers can look at this page"); - } - if (empty($_GET['sid'])) { - error("Admin delete: submission id missing"); - } - - if (!$submission = get_record("exercise_submissions", "id", $_GET['sid'])) { - error("Admin delete: can not get submission record"); - } - print_string("deleting", "exercise"); - // first get any assessments... - if ($assessments = exercise_get_assessments($submission)) { - foreach($assessments as $assessment) { - // ...and all the associated records... - delete_records("exercise_grades", "assessmentid", $assessment->id); - echo "."; - } - // ...now delete the assessments... - delete_records("exercise_assessments", "submissionid", $submission->id); - } - // ...and the submission record... - delete_records("exercise_submissions", "id", $submission->id); - // ..and finally the submitted file - exercise_delete_submitted_files($exercise, $submission); + if (!isteacher($course->id)) { + error("Only teachers can look at this page"); + } + if (empty($_GET['sid'])) { + error("Admin delete: submission id missing"); + } + + if (!$submission = get_record("exercise_submissions", "id", $_GET['sid'])) { + error("Admin delete: can not get submission record"); + } + print_string("deleting", "exercise"); + // first get any assessments... + if ($assessments = exercise_get_assessments($submission)) { + foreach($assessments as $assessment) { + // ...and all the associated records... + delete_records("exercise_grades", "assessmentid", $assessment->id); + echo "."; + } + // ...now delete the assessments... + delete_records("exercise_assessments", "submissionid", $submission->id); + } + // ...and the submission record... + delete_records("exercise_submissions", "id", $submission->id); + // ..and finally the submitted file + exercise_delete_submitted_files($exercise, $submission); add_to_log($course->id, "exercise", "delete", "view.php?id=$cm->id", "submission $submission->id"); - - print_continue("submissions.php?id=$cm->id&action=adminlist"); - } - + + print_continue("submissions.php?id=$cm->id&action=adminlist"); + } + - /******************* admin (confirm) late flag ************************************/ - elseif ($action == 'adminlateflag' ) { + /******************* admin (confirm) late flag ************************************/ + elseif ($action == 'adminlateflag' ) { - if (!isteacher($course->id)) { - error("Only teachers can look at this page"); - } - if (empty($_GET['sid'])) { - error("Admin confirm late flag: submission id missing"); - } - if (!$submission = get_record("exercise_submissions", "id", $_GET['sid'])) { - error("Admin confirm late flag: can not get submission record"); - } + if (!isteacher($course->id)) { + error("Only teachers can look at this page"); + } + if (empty($_GET['sid'])) { + error("Admin confirm late flag: submission id missing"); + } + if (!$submission = get_record("exercise_submissions", "id", $_GET['sid'])) { + error("Admin confirm late flag: can not get submission record"); + } - notice_yesno(get_string("clearlateflag","exercise")."?", - "submissions.php?action=adminclearlate&id=$cm->id&sid=$_GET[sid]", + notice_yesno(get_string("clearlateflag","exercise")."?", + "submissions.php?action=adminclearlate&id=$cm->id&sid=$_GET[sid]", "submissions.php?id=$cm->id&action=adminlist"); - } - + } + - /******************* list all submissions ************************************/ - elseif ($action == 'adminlist' ) { + /******************* list all submissions ************************************/ + elseif ($action == 'adminlist' ) { - if (!isteacher($course->id)) { - error("Only teachers can look at this page"); - } - + if (!isteacher($course->id)) { + error("Only teachers can look at this page"); + } + echo "

Exercise Version-> $module->version

"; - exercise_list_submissions_for_admin($exercise); - print_continue("view.php?id=$cm->id"); - - } - + exercise_list_submissions_for_admin($exercise); + print_continue("view.php?id=$cm->id"); + + } + - /******************* admin update title ************************************/ - elseif ($action == 'adminupdatetitle' ) { + /******************* admin update title ************************************/ + elseif ($action == 'adminupdatetitle' ) { - if (!isteacher($course->id)) { - error("Only teachers can look at this page"); - } - if (empty($_POST['sid'])) { - error("Admin Update Title: submission id missing"); - } - - if (set_field("exercise_submissions", "title", $_POST['title'], "id", $_POST['sid'])) { - print_heading(get_string("amendtitle", "exercise")." ".get_string("ok")); - } - print_continue("submissions.php?id=$cm->id&action=adminlist"); - } - + if (!isteacher($course->id)) { + error("Only teachers can look at this page"); + } + if (empty($_POST['sid'])) { + error("Admin Update Title: submission id missing"); + } + + if (set_field("exercise_submissions", "title", $_POST['title'], "id", $_POST['sid'])) { + print_heading(get_string("amendtitle", "exercise")." ".get_string("ok")); + } + print_continue("submissions.php?id=$cm->id&action=adminlist"); + } + - /*************** display final grades (by teacher) ***************************/ - elseif ($action == 'displayfinalgrades') { - // Get all the students - if (!$users = get_course_students($course->id, "u.firstname, u.lastname")) { - print_heading(get_string("nostudentsyet")); - print_footer($course); - exit; - } - - // get the final weights from the database - $teacherweight = get_field("exercise","teacherweight", "id", $exercise->id); - $gradingweight = get_field("exercise","gradingweight", "id", $exercise->id); - // show the final grades as stored in the tables... - print_heading_with_help(get_string("displayoffinalgrades", "exercise"), "finalgrades", "exercise"); - echo "
\n"; - echo ""; - echo ""; - echo ""; - echo ""; - echo "\n"; - // now the weights - echo ""; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - foreach ($users as $user) { - // first get user's own assessment reord, it should contain their grading grade - if ($ownassessments = exercise_get_user_assessments($exercise, $user)) { - foreach ($ownassessments as $ownassessment) { - break; // there should only be one - } - } - else { - $ownassessment->gradinggrade = 0; - } - if ($submissions = exercise_get_user_submissions($exercise, $user)) { - foreach ($submissions as $submission) { - if ($assessments = exercise_get_assessments($submission)) { - foreach ($assessments as $assessment) { // (normally there should only be one + /*************** display final grades (by teacher) ***************************/ + elseif ($action == 'displayfinalgrades') { + // Get all the students + if (!$users = get_course_students($course->id, "u.firstname, u.lastname")) { + print_heading(get_string("nostudentsyet")); + print_footer($course); + exit; + } + + // get the final weights from the database + $teacherweight = get_field("exercise","teacherweight", "id", $exercise->id); + $gradingweight = get_field("exercise","gradingweight", "id", $exercise->id); + // show the final grades as stored in the tables... + print_heading_with_help(get_string("displayoffinalgrades", "exercise"), "finalgrades", "exercise"); + echo "
cellheading2\">".$course->student."cellheading2\">".get_string("submission", "exercise")."cellheading2\" align=\"center\">".get_string("gradeforassessment", "exercise")."cellheading2\" align=\"center\">".get_string("gradeforsubmission", "exercise")."cellheading2\" align=\"center\">".get_string("overallgrade", "exercise")."
cellheading2\">".get_string("weights", "exercise")."cellheading2\"> cellheading2\" align=\"center\">$EXERCISE_FWEIGHTS[$gradingweight]cellheading2\" align=\"center\">$EXERCISE_FWEIGHTS[$teacherweight]cellheading2\"> 
\n"; + echo ""; + echo ""; + echo ""; + echo ""; + echo "\n"; + // now the weights + echo ""; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + foreach ($users as $user) { + // first get user's own assessment reord, it should contain their grading grade + if ($ownassessments = exercise_get_user_assessments($exercise, $user)) { + foreach ($ownassessments as $ownassessment) { + break; // there should only be one + } + } + else { + $ownassessment->gradinggrade = 0; + } + if ($submissions = exercise_get_user_submissions($exercise, $user)) { + foreach ($submissions as $submission) { + if ($assessments = exercise_get_assessments($submission)) { + foreach ($assessments as $assessment) { // (normally there should only be one $grade = number_format($assessment->grade * $exercise->grade / 100.0, 1); $overallgrade = number_format(((($assessment->grade * $EXERCISE_FWEIGHTS[$teacherweight] / 100.0) + @@ -271,154 +271,157 @@ $grade = "(".$grade.")"; $overallgrade = "(".$overallgrade.")"; } - echo "\n"; - echo "\n"; - echo ""; - echo ""; - echo "\n"; - } - } - } - } - } - echo "
cellheading2\">".$course->student."cellheading2\">".get_string("submission", "exercise")."cellheading2\" align=\"center\">".get_string("gradeforassessment", "exercise")."cellheading2\" align=\"center\">".get_string("gradeforsubmission", "exercise")."cellheading2\" align=\"center\">".get_string("overallgrade", "exercise")."
cellheading2\">".get_string("weights", "exercise")."cellheading2\"> cellheading2\" align=\"center\">$EXERCISE_FWEIGHTS[$gradingweight]cellheading2\" align=\"center\">$EXERCISE_FWEIGHTS[$teacherweight]cellheading2\"> 
$user->firstname $user->lastname".exercise_print_submission_title($exercise, $submission)."".number_format($ownassessment->gradinggrade * $exercise->grade / COMMENTSCALE, 1)."$grade$overallgrade

\n"; - if ($exercise->showleaguetable) { + echo "$user->firstname $user->lastname\n"; + echo "".exercise_print_submission_title($exercise, $submission)."\n"; + echo "".number_format($ownassessment->gradinggrade * $exercise->grade / COMMENTSCALE, 1).""; + echo "$grade"; + echo "$overallgrade\n"; + } + } + } + } + } + echo "
\n"; + if ($exercise->showleaguetable) { exercise_print_league_table($exercise); - echo "
\n"; + echo "
\n"; } print_string("allgradeshaveamaximumof", "exercise", $exercise->grade)."\n"; - print_continue("view.php?id=$cm->id"); - } + print_continue("view.php?id=$cm->id"); + } - /******************* list for assessment student (submissions) ************************************/ - elseif ($action == 'listforassessmentstudent' ) { - if (!$users = get_course_students($course->id)) { - print_heading(get_string("nostudentsyet")); - print_footer($course); - exit; - } - if (!isteacher($course->id)) { - error("Only teachers can look at this page"); - } - exercise_list_unassessed_student_submissions($exercise, $USER); - print_continue("view.php?id=$cm->id"); - - } - + /******************* list for assessment student (submissions) ************************************/ + elseif ($action == 'listforassessmentstudent' ) { + if (!$users = get_course_students($course->id)) { + print_heading(get_string("nostudentsyet")); + print_footer($course); + exit; + } + if (!isteacher($course->id)) { + error("Only teachers can look at this page"); + } + exercise_list_unassessed_student_submissions($exercise, $USER); + print_continue("view.php?id=$cm->id"); + + } + - /******************* list for assessment teacher (submissions) ************************************/ - elseif ($action == 'listforassessmentteacher' ) { - if (!$users = get_course_students($course->id)) { - print_heading(get_string("nostudentsyet")); - print_footer($course); - exit; - } - exercise_list_unassessed_teacher_submissions($exercise, $USER); - print_continue("view.php?id=$cm->id"); - - } - + /******************* list for assessment teacher (submissions) ************************************/ + elseif ($action == 'listforassessmentteacher' ) { + if (!$users = get_course_students($course->id)) { + print_heading(get_string("nostudentsyet")); + print_footer($course); + exit; + } + exercise_list_unassessed_teacher_submissions($exercise, $USER); + print_continue("view.php?id=$cm->id"); + + } + - /****************** save league table entries and anonimity setting (by teacher) **************/ - elseif ($action == 'saveleaguetable') { + /****************** save league table entries and anonimity setting (by teacher) **************/ + elseif ($action == 'saveleaguetable') { - $form = (object)$_POST; - - if (!isteacher($course->id)) { - error("Only teachers can look at this page"); - } + $form = (object)$_POST; + + if (!isteacher($course->id)) { + error("Only teachers can look at this page"); + } - // save the number of league table entries from the form... - if ($form->nentries == 'All') { + // save the number of league table entries from the form... + if ($form->nentries == 'All') { $nentries = 99; } else { $nentries = $form->nentries; } - // ...and save it - set_field("exercise", "showleaguetable", $nentries, "id", "$exercise->id"); - - // ...and save the anonimity setting - set_field("exercise", "anonymous", $form->anonymous, "id", "$exercise->id"); - - redirect("submissions.php?id=$cm->id&action=adminlist", get_string("entriessaved", "exercise")); - } - - /*************** save weights (by teacher) ***************************/ - elseif ($action == 'saveweights') { + // ...and save it + set_field("exercise", "showleaguetable", $nentries, "id", "$exercise->id"); + + // ...and save the anonimity setting + set_field("exercise", "anonymous", $form->anonymous, "id", "$exercise->id"); + + redirect("submissions.php?id=$cm->id&action=adminlist", get_string("entriessaved", "exercise")); + } + + /*************** save weights (by teacher) ***************************/ + elseif ($action == 'saveweights') { - $form = (object)$_POST; - - if (!isteacher($course->id)) { - error("Only teachers can look at this page"); - } + $form = (object)$_POST; + + if (!isteacher($course->id)) { + error("Only teachers can look at this page"); + } - // save the weights from the form... - if (isset($form->teacherweight)) { - $teacherweight = $form->teacherweight; - // ...and save them - set_field("exercise", "teacherweight", $teacherweight, "id", "$exercise->id"); - } - - if (isset($form->gradingweight)) { - $gradingweight = $form->gradingweight; - // ...and save them - set_field("exercise", "gradingweight", $gradingweight, "id", "$exercise->id"); - } - - redirect("submissions.php?id=$cm->id&action=adminlist", get_string("weightssaved", "exercise")); - } - - - /******************* user confirm delete ************************************/ - elseif ($action == 'userconfirmdelete' ) { + // save the weights from the form... + if (isset($form->teacherweight)) { + $teacherweight = $form->teacherweight; + // ...and save them + set_field("exercise", "teacherweight", $teacherweight, "id", "$exercise->id"); + } + + if (isset($form->gradingweight)) { + $gradingweight = $form->gradingweight; + // ...and save them + set_field("exercise", "gradingweight", $gradingweight, "id", "$exercise->id"); + } + + redirect("submissions.php?id=$cm->id&action=adminlist", get_string("weightssaved", "exercise")); + } + + + /******************* user confirm delete ************************************/ + elseif ($action == 'userconfirmdelete' ) { - if (empty($_GET['sid'])) { - error("User Confirm Delete: submission id missing"); - } - - notice_yesno(get_string("confirmdeletionofthisitem","exercise", get_string("submission", "exercise")), - "submissions.php?action=userdelete&id=$cm->id&sid=$_GET[sid]", "view.php?id=$cm->id"); - } - + if (empty($_GET['sid'])) { + error("User Confirm Delete: submission id missing"); + } + + notice_yesno(get_string("confirmdeletionofthisitem","exercise", get_string("submission", "exercise")), + "submissions.php?action=userdelete&id=$cm->id&sid=$_GET[sid]", "view.php?id=$cm->id"); + } + - /******************* user delete ************************************/ - elseif ($action == 'userdelete' ) { + /******************* user delete ************************************/ + elseif ($action == 'userdelete' ) { - if (empty($_GET['sid'])) { - error("User Delete: submission id missing"); - } - - if (!$submission = get_record("exercise_submissions", "id", $_GET['sid'])) { - error("User Delete: can not get submission record"); - } - print_string("deleting", "exercise"); - // first get any assessments... - if ($assessments = exercise_get_assessments($submission)) { - foreach($assessments as $assessment) { - // ...and all the associated records... - delete_records("exercise_grades", "assessmentid", $assessment->id); - echo "."; - } - // ...now delete the assessments... - delete_records("exercise_assessments", "submissionid", $submission->id); - } - // ...and the submission record... - delete_records("exercise_submissions", "id", $submission->id); - // ..and finally the submitted file - exercise_delete_submitted_files($exercise, $submission); + if (empty($_GET['sid'])) { + error("User Delete: submission id missing"); + } + + if (!$submission = get_record("exercise_submissions", "id", $_GET['sid'])) { + error("User Delete: can not get submission record"); + } + print_string("deleting", "exercise"); + // first get any assessments... + if ($assessments = exercise_get_assessments($submission)) { + foreach($assessments as $assessment) { + // ...and all the associated records... + delete_records("exercise_grades", "assessmentid", $assessment->id); + echo "."; + } + // ...now delete the assessments... + delete_records("exercise_assessments", "submissionid", $submission->id); + } + // ...and the submission record... + delete_records("exercise_submissions", "id", $submission->id); + // ..and finally the submitted file + exercise_delete_submitted_files($exercise, $submission); add_to_log($course->id, "exercise", "delete", "view.php?id=$cm->id", "submission $submission->id"); - - print_continue("view.php?id=$cm->id"); - } - + + print_continue("view.php?id=$cm->id"); + } + - /*************** no man's land **************************************/ - else { - error("Fatal Error: Unknown Action: ".$action."\n"); - } + /*************** no man's land **************************************/ - print_footer($course); + else { + + error("Fatal Error: Unknown Action: ".$action."\n"); + + } + + + print_footer($course); ?> - diff --git a/mod/forum/lib.php b/mod/forum/lib.php index de751a5a51a..a44cd72c970 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -1192,7 +1192,7 @@ function forum_print_post(&$post, $courseid, $ownpost=false, $reply=false, $link echo "cellheading2\" class=\"forumpostheadertopic\" width=\"100%\">"; } echo "

"; - echo "$post->subject
"; + echo "$post->subject
"; echo ""; $fullname = fullname($post, $isteacher); diff --git a/mod/forum/post.html b/mod/forum/post.html index a496b727f75..5a85c18c44e 100644 --- a/mod/forum/post.html +++ b/mod/forum/post.html @@ -84,7 +84,7 @@ -

:
() 

+

:
() 

maxbytes, $course->maxbytes, $forum->maxbytes); ?> diff --git a/mod/glossary/edit.html b/mod/glossary/edit.html index f3f879121d2..02f5f94e09a 100644 --- a/mod/glossary/edit.html +++ b/mod/glossary/edit.html @@ -144,7 +144,7 @@ if (isset($errors)) { -

:
() 

+

:
() 

diff --git a/mod/glossary/formats.php b/mod/glossary/formats.php index 323a00b61f5..b1e9a2ccc82 100644 --- a/mod/glossary/formats.php +++ b/mod/glossary/formats.php @@ -120,7 +120,7 @@ -

+

@@ -157,7 +157,7 @@ -

+

@@ -194,7 +194,7 @@ -

+

@@ -231,7 +231,7 @@ -

+

@@ -256,7 +256,7 @@ -

+

@@ -277,7 +277,7 @@ -

+

diff --git a/mod/glossary/import.html b/mod/glossary/import.html index 157422ee1a9..59464d4b269 100644 --- a/mod/glossary/import.html +++ b/mod/glossary/import.html @@ -4,7 +4,7 @@

:

-
+
"> - \ No newline at end of file + \ No newline at end of file diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 6308183a2e6..a8b42340b57 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -1199,7 +1199,7 @@ function glossary_print_alphabet_menu($cm, $glossary, $mode, $hook, $sortkey='', function glossary_print_author_menu($cm, $glossary,$mode, $hook, $sortkey = '', $sortorder = '') { if ($glossary->showalphabet and $glossary->displayformat != GLOSSARY_FORMAT_CONTINUOUS) { - echo '
' . get_string("explainalphabet","glossary") . '
'; + echo '
' . get_string("explainalphabet","glossary") . '
'; } glossary_print_sorting_links($cm, $mode, $sortkey,$sortorder); @@ -1398,7 +1398,7 @@ global $CFG; } echo "
$sort: $sbtagwwwroot/mod/glossary/view.php?id=$cm->id&sortkey=$sorder$sneworder&mode=$mode\">$ssort$sicon$sendbtag | ". - "$fbtagwwwroot/mod/glossary/view.php?id=$cm->id&sortkey=$forder$fneworder&mode=$mode\">$fsort$ficon$fendbtag
"; + "$fbtagwwwroot/mod/glossary/view.php?id=$cm->id&sortkey=$forder$fneworder&mode=$mode\">$fsort$ficon$fendbtag
"; } function glossary_sort_entries ( $entry0, $entry1 ) { @@ -1427,7 +1427,7 @@ function glossary_print_comment($course, $cm, $glossary, $entry, $comment) { echo ""; echo "cellheading\" class=\"forumpostheader\" width=\"100%\">"; echo "

"; - echo "wwwroot/user/view.php?id=$user->id&course=$course->id\">$fullname
"; + echo "wwwroot/user/view.php?id=$user->id&course=$course->id\">$fullname
"; echo "".get_string("lastedited").": ".userdate($comment->timemodified).""; echo "

"; diff --git a/mod/glossary/mod.html b/mod/glossary/mod.html index 74abde94079..6cf3cafd1fa 100644 --- a/mod/glossary/mod.html +++ b/mod/glossary/mod.html @@ -61,9 +61,9 @@ if (!isset($form->showspecial)) { "; + echo "
"; helpbutton("writing", get_string("helpwriting"), "moodle", true, true); - echo "
"; + echo "
"; helpbutton("text", get_string("helptext"), "moodle", true, true); ?>
diff --git a/mod/glossary/print.php b/mod/glossary/print.php index 36c14d5f827..fa8fe7082ad 100644 --- a/mod/glossary/print.php +++ b/mod/glossary/print.php @@ -117,7 +117,7 @@ $site = get_record("course","id",1); echo '

' . userdate(time()) . '

'; echo '' . $site->fullname . '
'; - echo get_string("course") . ': ' . $course->fullname . '
'; + echo get_string("course") . ': ' . $course->fullname . '
'; echo get_string("modulename","glossary") . ': ' . $glossary->name . '

'; if ( $allentries ) { foreach ($allentries as $entry) { diff --git a/mod/journal/lib.php b/mod/journal/lib.php index 0d2494bb385..1e120b248b5 100644 --- a/mod/journal/lib.php +++ b/mod/journal/lib.php @@ -209,7 +209,7 @@ function journal_print_recent_activity($course, $isteacher, $timestart) { print_headline(get_string("newjournalentries", "journal").":"); foreach ($journals as $journal) { $date = userdate($journal->time, $strftimerecent); - echo "

$date - ".fullname($journal)."
"; + echo "

$date - ".fullname($journal)."
"; echo "\"wwwroot/mod/journal/$journal->url\">"; echo "$journal->name"; echo "\"

"; diff --git a/mod/journal/view.php b/mod/journal/view.php index 2fbc904254c..bbb625e2401 100644 --- a/mod/journal/view.php +++ b/mod/journal/view.php @@ -47,7 +47,7 @@ print_simple_box( text_to_html($journal->intro, $journal->introformat) , "center"); - echo "
"; + echo "
"; $timenow = time(); diff --git a/mod/quiz/description.html b/mod/quiz/description.html index 9910a419782..050d12f3214 100644 --- a/mod/quiz/description.html +++ b/mod/quiz/description.html @@ -19,7 +19,7 @@ "; + echo "
"; } print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext); if ($usehtmleditor) { diff --git a/mod/quiz/editmultianswer.php b/mod/quiz/editmultianswer.php index b8c485f4f88..104db5896c0 100644 --- a/mod/quiz/editmultianswer.php +++ b/mod/quiz/editmultianswer.php @@ -162,7 +162,7 @@ formerr($err["questiontext"]); - echo "
"; + echo "
"; } diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php index 22b1786f4f9..de862aecbff 100644 --- a/mod/quiz/lib.php +++ b/mod/quiz/lib.php @@ -805,7 +805,7 @@ function quiz_print_question($number, $question, $grade, $quizid, if ($randomanswers[$responseanswer[$key]] == $correct[$key]) { echo ''; choose_from_menu($randomanswers, "q$realquestion->id"."r$randomquestion->id", $responseanswer[$key]); - echo '
'; + echo '
'; } else { choose_from_menu($randomanswers, "q$realquestion->id"."r$randomquestion->id", $responseanswer[$key]); quiz_print_correctanswer($correct[$key]); diff --git a/mod/quiz/match.html b/mod/quiz/match.html index 7f329347c35..69ecfcf011c 100644 --- a/mod/quiz/match.html +++ b/mod/quiz/match.html @@ -19,7 +19,7 @@ "; + echo "
"; } print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext); if ($usehtmleditor) { @@ -56,7 +56,7 @@

:

-
+
   diff --git a/mod/quiz/multichoice.html b/mod/quiz/multichoice.html index a865a1454f1..379ab092dac 100644 --- a/mod/quiz/multichoice.html +++ b/mod/quiz/multichoice.html @@ -19,7 +19,7 @@ "; + echo "
"; } print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext); if ($usehtmleditor) { diff --git a/mod/quiz/numerical.html b/mod/quiz/numerical.html index 3b8f5c09def..393f126c4f7 100644 --- a/mod/quiz/numerical.html +++ b/mod/quiz/numerical.html @@ -19,7 +19,7 @@ "; + echo "
"; } print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext); if ($usehtmleditor) { diff --git a/mod/quiz/randomsamatch.html b/mod/quiz/randomsamatch.html index 2406a7ebce6..5cb2c4bd7ac 100644 --- a/mod/quiz/randomsamatch.html +++ b/mod/quiz/randomsamatch.html @@ -25,7 +25,7 @@ "; + echo "
"; } if (empty($question->questiontext)) { $question->questiontext = get_string("randomsamatchintro", "quiz"); diff --git a/mod/quiz/shortanswer.html b/mod/quiz/shortanswer.html index 867f1984741..1f799b37403 100644 --- a/mod/quiz/shortanswer.html +++ b/mod/quiz/shortanswer.html @@ -19,7 +19,7 @@ "; + echo "
"; } print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext); if ($usehtmleditor) { diff --git a/mod/quiz/truefalse.html b/mod/quiz/truefalse.html index 59cf5358f72..9ccef4b1748 100644 --- a/mod/quiz/truefalse.html +++ b/mod/quiz/truefalse.html @@ -19,7 +19,7 @@ "; + echo "
"; } print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext); if ($usehtmleditor) { diff --git a/mod/resource/details.php b/mod/resource/details.php index cd3c7173102..a67694472b0 100644 --- a/mod/resource/details.php +++ b/mod/resource/details.php @@ -371,7 +371,7 @@ ?> -

:


+

:




diff --git a/mod/resource/mod.html b/mod/resource/mod.html index 67d60d5af50..1ae7bb196b3 100644 --- a/mod/resource/mod.html +++ b/mod/resource/mod.html @@ -45,9 +45,9 @@ "; + echo "
"; helpbutton("writing", get_string("helpwriting"), "moodle", true, true); - echo "
"; + echo "
"; helpbutton("text", get_string("helptext"), "moodle", true, true); ?>
diff --git a/mod/survey/details.php b/mod/survey/details.php index 96477a20475..1ac72bffd03 100644 --- a/mod/survey/details.php +++ b/mod/survey/details.php @@ -35,9 +35,9 @@

:


-
-
-
+
+
+
diff --git a/mod/survey/lib.php b/mod/survey/lib.php index c0b2319e2b2..64ab2da2306 100644 --- a/mod/survey/lib.php +++ b/mod/survey/lib.php @@ -134,7 +134,7 @@ function survey_print_recent_activity($course, $isteacher, $timestart) { print_headline(get_string("newsurveyresponses", "survey").":"); foreach ($surveys as $survey) { $date = userdate($survey->time, $strftimerecent); - echo "

$date - ".fullname($survey)."
"; + echo "

$date - ".fullname($survey)."
"; echo "\"wwwroot/mod/survey/$survey->url\">"; echo "$survey->name"; echo "\"

";