From: gustav_delius Date: Sun, 12 Sep 2004 17:34:35 +0000 (+0000) Subject: fixed capitalization and quoting of attribute values X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d1290cec392da97a1f42e51ebbd09cfab8323479;p=moodle.git fixed capitalization and quoting of attribute values --- diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php index f2b649708e..cf855cda44 100644 --- a/mod/quiz/attempt.php +++ b/mod/quiz/attempt.php @@ -1,4 +1,4 @@ -name", "", - "id>$strquizzes -> - id\">$quiz->name -> $strattemptnum", + "id\">$strquizzes -> + id\">$quiz->name -> $strattemptnum", "", "", true); echo ''; // for overlib diff --git a/mod/quiz/backuplib.php b/mod/quiz/backuplib.php index 4ee952bb5d..a8da7ee5f1 100644 --- a/mod/quiz/backuplib.php +++ b/mod/quiz/backuplib.php @@ -1,4 +1,4 @@ -$streditingquiz -> $streditcategories"); + "$streditingquiz -> $streditcategories"); /// Delete category if the user wants to delete it @@ -65,13 +65,13 @@ print_simple_box(get_string("categorymove", "quiz", $vars), "CENTER"); $categories = quiz_get_category_menu($course->id); unset($categories[$category->id]); - echo "

"; - echo "id\" />"; - echo "id\" />"; + echo "

"; + echo "id\" />"; + echo "id\" />"; choose_from_menu($categories, "confirm", "", ""); - echo ""; - echo ""; - echo "

"; + echo ""; + echo ""; + echo "

"; print_footer($course); exit; } @@ -82,10 +82,10 @@ /// Print heading - echo "

"; + echo "

"; echo $streditcategories; helpbutton("categories", $streditcategories, "quiz"); - echo "

"; + echo "

"; /// If data submitted, then process and store. @@ -151,31 +151,31 @@ $table->width = 200; $table->nowrap = true; - echo "
"; + echo ""; foreach ($categories as $category) { $count = count_records("quiz_questions", "category", $category->id); if ($category->id == $default) { $delete = ""; // Can't delete default category } else { - $delete = "id&delete=$category->id\">$strdelete"; + $delete = "id&delete=$category->id\">$strdelete"; } - $table->data[] = array ("id\" VALUE=\"$category->name\" SIZE=15 />", - "id\" VALUE=\"$category->info\" SIZE=50 />", + $table->data[] = array ("id\" value=\"$category->name\" size=\"15\" />", + "id\" value=\"$category->info\" size=\"50\" />", choose_from_menu ($publishoptions, "p$category->id", "$category->publish", "", "", "", true), "$count", $delete); } - $table->data[] = array ("", - "", + $table->data[] = array ("", + "", choose_from_menu ($publishoptions, "newpublish", "", "", "", "", true), "", "$stradd"); print_table($table); - echo "id\" />"; - echo "

"; - echo "

"; - echo "
"; - echo "
"; + echo "id\" />"; + echo "

"; + echo "

"; + echo "
"; + echo ""; print_footer(); diff --git a/mod/quiz/db/mysql.php b/mod/quiz/db/mysql.php index 1f64cc8089..91b6ce97d1 100644 --- a/mod/quiz/db/mysql.php +++ b/mod/quiz/db/mysql.php @@ -1,4 +1,4 @@ -cellheading"); echo "
"; - echo ""; + echo "
"; - echo ""; - echo ""; echo ""; echo "
"; + echo "
"; print_string("category", "quiz"); echo ":"; choose_from_menu($categories, "category", "$category->id", ""); echo "
"; + echo "
"; print_string("fileformat", "quiz"); echo ":"; choose_from_menu($fileformatnames, "format", "gift", ""); @@ -111,8 +111,8 @@ echo "
"; - echo " id\" />"; - echo " "; + echo " id\" />"; + echo " "; echo "
"; diff --git a/mod/quiz/format.php b/mod/quiz/format.php index a0bba390f7..131158d647 100644 --- a/mod/quiz/format.php +++ b/mod/quiz/format.php @@ -1,4 +1,4 @@ - 2 November 2003 diff --git a/mod/quiz/format/aon/format.php b/mod/quiz/format/aon/format.php index c9c39af137..a228c67629 100644 --- a/mod/quiz/format/aon/format.php +++ b/mod/quiz/format/aon/format.php @@ -1,4 +1,4 @@ -displayerrors) { - echo "

$text

Could not find a {"; + echo "

$text

Could not find a {"; } return false; } @@ -46,7 +46,7 @@ class quiz_file_format extends quiz_default_format { $answerfinish = strpos($text, "}"); if ($answerfinish === false) { if ($this->displayerrors) { - echo "

$text

Could not find a }"; + echo "

$text

Could not find a }"; } return false; } @@ -67,7 +67,7 @@ class quiz_file_format extends quiz_default_format { switch ($countanswers) { case 0: // invalid question if ($this->displayerrors) { - echo "

No answers found in $answertext"; + echo "

No answers found in $answertext"; } return false; diff --git a/mod/quiz/format/blackboard/format.php b/mod/quiz/format/blackboard/format.php index 0d4d40678d..16d350fbad 100644 --- a/mod/quiz/format/blackboard/format.php +++ b/mod/quiz/format/blackboard/format.php @@ -1,4 +1,4 @@ -cellheading"); if ($hostname_access_error) { notify("couldn't connect to ODBC Socket Server on " . $hostname_access_error); } echo ""; - echo ""; + echo "
"; - echo ""; - echo ""; - echo ""; echo ""; echo "
"; + echo "
"; echo "What is the hostname or IP address of the ODBC Socket Server:"; echo " "; echo " "; echo " id."\" />"; echo " format."\" />"; echo " 
"; + echo "
"; echo "What is the location of the database (.mdb file) on the Socket Server:"; echo " "; echo " 
"; + echo "
"; echo "What is the location of the system database (System.mda file) on the Socket Server:"; echo " "; echo " 
 "; - echo " "; + echo " "; echo "
"; echo "

"; @@ -112,8 +112,8 @@ class quiz_file_format { print_heading_with_help($strimportquestions, "import", "quiz"); print_simple_box_start("center", "", "$THEME->cellheading"); echo "
"; - echo ""; - echo "\n";// deleted jm } echo "\n"; @@ -1411,7 +1411,7 @@ function quiz_print_cat_question_list($categoryid, $quizselected=true) { if ($quizselected) { echo "\n"; } @@ -1795,11 +1795,11 @@ function quiz_print_recent_mod_activity($activity, $course, $detail=false) { echo " + +
"; + echo ""; + echo ""; echo ""; echo "
"; echo "Choose a category of questions to import:"; asort($question_categories); choose_from_menu($question_categories, "question_category","All Categories","All Categories", "", "allcategories"); @@ -127,7 +127,7 @@ class quiz_file_format { } echo " 
 "; - echo " "; + echo " "; echo "
"; echo ""; @@ -265,7 +265,7 @@ class quiz_file_format { function deletedatabase($filename) { if (! $this->fulldelete($filename)) { - echo "
Error: Could not delete: $filename"; + echo "
Error: Could not delete: $filename"; return false; } return true; diff --git a/mod/quiz/format/gift/format.php b/mod/quiz/format/gift/format.php index 6405fa2feb..2835d42276 100755 --- a/mod/quiz/format/gift/format.php +++ b/mod/quiz/format/gift/format.php @@ -126,7 +126,7 @@ class quiz_file_format extends quiz_default_format { $answerstart = strpos($text, "{"); if ($answerstart === false) { if ($this->displayerrors) { - echo "

$text

Could not find a {"; + echo "

$text

Could not find a {"; } return false; } @@ -134,7 +134,7 @@ class quiz_file_format extends quiz_default_format { $answerfinish = strpos($text, "}"); if ($answerfinish === false) { if ($this->displayerrors) { - echo "

$text

Could not find a }"; + echo "

$text

Could not find a }"; } return false; } @@ -193,7 +193,7 @@ class quiz_file_format extends quiz_default_format { if (!isset($question->qtype)) { if ($this->displayerrors) { - echo "

$text

Question type not set."; + echo "

$text

Question type not set."; } return false; } @@ -218,7 +218,7 @@ class quiz_file_format extends quiz_default_format { $countanswers = count($answers); if ($countanswers < 2) { if ($this->displayerrors) { - echo "

$text

Found tilde for multiple choice, + echo "

$text

Found tilde for multiple choice, but too few answers for Multiple Choice.
Found $countanswers answers in answertext."; } @@ -262,7 +262,7 @@ class quiz_file_format extends quiz_default_format { $countanswers = count($answers); if ($countanswers < 3) { if ($this->displayerrors) { - echo "

$text

Found markers for Matching format + echo "

$text

Found markers for Matching format (= and ->), but too few answers -- must be at least 3.
Found $countanswers answers in answertext."; } @@ -274,7 +274,7 @@ class quiz_file_format extends quiz_default_format { $answer = trim($answer); if (strpos($answer, "->") <= 0) { if ($this->displayerrors) { - echo "

$text

Error processing Matching question.
+ echo "

$text

Error processing Matching question.
Improperly formatted answer: $answer"; } return false; @@ -323,7 +323,7 @@ class quiz_file_format extends quiz_default_format { if (count($answers) == 0) { // invalid question if ($this->displayerrors) { - echo "

$text

Found equals=, but no answers in answertext"; + echo "

$text

Found equals=, but no answers in answertext"; } return false; break; @@ -364,7 +364,7 @@ class quiz_file_format extends quiz_default_format { if (count($answers) == 0) { // invalid question if ($this->displayerrors) { - echo "

$text

No answers found in answertext (Numerical answer)"; + echo "

$text

No answers found in answertext (Numerical answer)"; } return false; break; @@ -407,8 +407,8 @@ class quiz_file_format extends quiz_default_format { OR !is_numeric($question->max[$key]) OR !is_numeric($question->max[$key])) { if ($this->displayerrors) { - echo "

$text

For numerical questions, answer must be numbers. -

Answer: $answer

ErrorMargin: $errormargin ."; + echo "

$text

For numerical questions, answer must be numbers. +

Answer: $answer

ErrorMargin: $errormargin ."; } return false; break; @@ -423,7 +423,7 @@ class quiz_file_format extends quiz_default_format { default: if ($this->displayerrors) { - echo "

$text

No valid question type. Error in switch(question->qtype)"; + echo "

$text

No valid question type. Error in switch(question->qtype)"; } return false; break; diff --git a/mod/quiz/format/missingword/format.php b/mod/quiz/format/missingword/format.php index 7014b72bf7..ea81dcf58a 100644 --- a/mod/quiz/format/missingword/format.php +++ b/mod/quiz/format/missingword/format.php @@ -1,4 +1,4 @@ -displayerrors) { - echo "

$text

Could not find a {"; + echo "

$text

Could not find a {"; } return false; } @@ -51,7 +51,7 @@ class quiz_file_format extends quiz_default_format { $answerfinish = strpos($text, "}"); if ($answerfinish === false) { if ($this->displayerrors) { - echo "

$text

Could not find a }"; + echo "

$text

Could not find a }"; } return false; } @@ -79,7 +79,7 @@ class quiz_file_format extends quiz_default_format { switch ($countanswers) { case 0: // invalid question if ($this->displayerrors) { - echo "

No answers found in $answertext"; + echo "

No answers found in $answertext"; } return false; diff --git a/mod/quiz/format/multianswer/format.php b/mod/quiz/format/multianswer/format.php index 6ac834001f..25f5972dbd 100644 --- a/mod/quiz/format/multianswer/format.php +++ b/mod/quiz/format/multianswer/format.php @@ -1,4 +1,4 @@ -cellheading"); - echo "

"; - echo ""; + echo ""; + echo "
"; - echo ""; - echo ""; - echo ""; echo "
"; + echo "
"; print_string("category", "quiz"); echo ":"; // choose_from_menu($categories, "category", "$category->id", ""); echo quiz_get_category_coursename($category); echo "
"; + echo "
"; print_string("fileformat", "quiz"); echo ":"; choose_from_menu($fileformatnames, "format", "gift", ""); helpbutton("import", $strimportquestions, "quiz"); echo "
"; + echo "
"; print_string("upload"); echo ":"; echo " "; echo "
 "; - echo " id\" />"; - echo " "; + echo " id\" />"; + echo " "; echo "
"; diff --git a/mod/quiz/index.php b/mod/quiz/index.php index 1cd1c82753..5a2c48a9c5 100644 --- a/mod/quiz/index.php +++ b/mod/quiz/index.php @@ -1,4 +1,4 @@ -visible) { //Show dimmed if the mod is hidden - $link = "coursemodule\">$quiz->name"; + $link = "coursemodule\">$quiz->name"; } else { //Show normal if the mod is visible - $link = "coursemodule\">$quiz->name"; + $link = "coursemodule\">$quiz->name"; } $bestgrade = quiz_get_best_grade($quiz->id, $USER->id); diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php index 932a066f84..a6ceb93a87 100644 --- a/mod/quiz/lib.php +++ b/mod/quiz/lib.php @@ -1,4 +1,4 @@ -
\n"; + echo "
\n"; echo "\n"; echo "\n"; echo "cellcontent\">\n"; @@ -1399,11 +1399,11 @@ function quiz_print_cat_question_list($categoryid, $quizselected=true) { if ($canedit) { echo "\n"; echo "id&delete=$question->id\">\n "; + src=\"../../pix/t/delete.gif\" border=\"0\"> "; echo "id','$strpreview','scrollbars=yes,resizable=yes,width=700,height=480', false)\"> "; echo "id\">"; + src=\"../../pix/t/edit.gif\" border=\"0\">"; echo "
"; echo "\n"; - //echo ""; + //echo ""; echo "\n"; echo "
cellcontent2\" class=\"forumpostpicture\" width=\"35\" valign=\"top\">"; print_user_picture($activity->user->userid, $course, $activity->user->picture); - echo ""; + echo ""; if ($detail) { echo "modpixpath/$activity->type/icon.gif\" ". - "height=16 width=16 alt=\"$activity->type\"> "; + "height=\"16\" width=\"16\" alt=\"$activity->type\"> "; echo "wwwroot/mod/quiz/view.php?id=" . $activity->instance . "\">" . $activity->name . " - "; diff --git a/mod/quiz/mod.html b/mod/quiz/mod.html index a4dfc748ca..07c6f08662 100644 --- a/mod/quiz/mod.html +++ b/mod/quiz/mod.html @@ -61,15 +61,15 @@
- - - +

:

+ + - - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +

:

 - +

:

+

:

:

:

 timeopen and $course->format == "weeks") { @@ -104,8 +104,8 @@ ?>

:

:

 timeclose and $course->format == "weeks") { @@ -118,8 +118,8 @@

:

:

 timelimit, get_string("minutes","quiz")); @@ -128,8 +128,8 @@

:

:

:

:

:

:

:

:

:

:

:

:

:

:

:

:

:

:

 =1; $i--) { @@ -246,32 +246,32 @@ ?>

:

:

 - +

:

:

 - +
- + - - - - - - - -wwwroot/course/mod.php" ?>" /> + + + + + + + +wwwroot/course/mod.php" ?>" /> " />
diff --git a/mod/quiz/multiple.php b/mod/quiz/multiple.php index cf56739e29..c682d8276a 100644 --- a/mod/quiz/multiple.php +++ b/mod/quiz/multiple.php @@ -1,4 +1,4 @@ -cellheading"); - echo "
"; - echo ""; - echo ""; + + echo ""; + echo "
"; + echo ""; + echo ""; + echo ""; + echo ""; - echo ""; + echo ""; - echo ""; + echo ""; - echo ""; - - echo ""; - echo "
"; print_string("category", "quiz"); - echo ":"; + echo ":"; // choose_from_menu($categories, "category", "$category->id", ""); quiz_category_select_menu($course->id, true, true, $category->id ); - echo "
"; + echo "
"; print_string("randomcreate", "quiz"); - echo ":"; + echo ":"; choose_from_menu($randomcount, "randomcreate", "10", ""); - echo "
"; + echo "
"; print_string("defaultgrade", "quiz"); - echo ":"; + echo ":"; choose_from_menu($gradecount, "randomgrade", "1", ""); - echo "
"; + echo "
"; print_string("addquestionstoquiz", "quiz"); - echo ":"; + echo ":"; choose_from_menu($options, "addquestionstoquiz", "1", ""); - echo "
 "; - echo " id\" />"; - echo " "; - echo "
"; - echo ""; + echo "
 "; + echo " id\" />"; + echo " "; + echo "
"; + echo ""; print_simple_box_end(); print_footer(); diff --git a/mod/quiz/preview.php b/mod/quiz/preview.php index ff8daff0c1..5f94b4d3d3 100644 --- a/mod/quiz/preview.php +++ b/mod/quiz/preview.php @@ -61,7 +61,7 @@ print_header(); print_heading(get_string("previewquestion","quiz")); - echo "

"; + echo "

"; if (empty($question->id)) { $question->id = ""; diff --git a/mod/quiz/question.php b/mod/quiz/question.php index 02bd2b462e..c34aae2f19 100644 --- a/mod/quiz/question.php +++ b/mod/quiz/question.php @@ -1,4 +1,4 @@ -$question->name")."

".$beingused; + $beingused = get_string("questioninuse", "quiz", "$question->name")."

".$beingused; notice($beingused, "edit.php"); } else { // the question is not used in any of the existing quizzes diff --git a/mod/quiz/questiontypes/calculated/calculated.html b/mod/quiz/questiontypes/calculated/calculated.html index 3bed2f9e75..e1c7c26dea 100644 --- a/mod/quiz/questiontypes/calculated/calculated.html +++ b/mod/quiz/questiontypes/calculated/calculated.html @@ -1,27 +1,27 @@ -

-
- + +
+ ");} ?> - - - -

:

 + + + + - - - - + + + + - - + + + - - - + + - + + - - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + - - + ()

+ + + - + - - + - + - - -unit) ?>" />

+ + + -

:

 id, true, true, $question->category); ?> -

:

 - +

:

 + -

:




-

+

'; } else { - echo "

"; + echo "
"; print_string("formattexttype"); echo ": "; if (!isset($question->questiontextformat)) { @@ -55,93 +55,93 @@ ?>

:

 +

:

 image", get_string("none"),"",""); } ?> -

:

 -    - -

:

 - ± -

:

 +

:

 +    + +

:

 + ± +

:

 tolerance_types(), 'tolerancetype[]', $answers[0]->tolerancetype, false); ?> -

:

 +

:

 '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5', '6' => '6', '7' => '7', '8' => '8', '9' => '9', '10' => '10'), 'correctanswerlength[]', $answers[0]->correctanswerlength, false); ?> -

:

 - -

:

 -

- +

:

 + +

:

 +

+ - ()

-

:

:
-

: - " size="10" +

+

: + " size="10" align="RIGHT" name="multiplier[]" value="multiplier) ?>" /> -    : - " +    : + " name="unit[]" - size="5" value="unit) ?>" />

-
+
- - + + " />
diff --git a/mod/quiz/questiontypes/calculated/editquestion.php b/mod/quiz/questiontypes/calculated/editquestion.php index fcc12d0a9b..475e73c060 100644 --- a/mod/quiz/questiontypes/calculated/editquestion.php +++ b/mod/quiz/questiontypes/calculated/editquestion.php @@ -1,4 +1,4 @@ -id'; return true;" - .'" VALUE="'. get_string('generatevalue', 'quiz') . '"/>
' - . ' & ' + .'" value="'. get_string('generatevalue', 'quiz') . '"/>
' + . ' & ' . choose_from_menu($lengthoptions, 'calclength[]', $regs[4], // Selected '', '', '', true) . '
' diff --git a/mod/quiz/questiontypes/datasetdependent/abstractqtype.php b/mod/quiz/questiontypes/datasetdependent/abstractqtype.php index b460239226..a4b25cb694 100644 --- a/mod/quiz/questiontypes/datasetdependent/abstractqtype.php +++ b/mod/quiz/questiontypes/datasetdependent/abstractqtype.php @@ -1,4 +1,4 @@ -value; } else { - $icon = "wwwroot/pix/f/" + $icon = "wwwroot/pix/f/" . mimeinfo('icon', $item->value) - . '" HEIGHT="16" WIDTH="16" BORDER="0" ALT="File" />'; + . '" height="16" width="16" border="0" alt="File" />'; if (substr(strtolower($item->value), 0, 7)=='http://') { $link = $item->value; diff --git a/mod/quiz/questiontypes/datasetdependent/categorydatasetdefinitions.php b/mod/quiz/questiontypes/datasetdependent/categorydatasetdefinitions.php index 835275fb0f..cef314e436 100644 --- a/mod/quiz/questiontypes/datasetdependent/categorydatasetdefinitions.php +++ b/mod/quiz/questiontypes/datasetdependent/categorydatasetdefinitions.php @@ -1,4 +1,4 @@ -$streditingquiz -> $strdefinedataset"); + "$streditingquiz -> $strdefinedataset"); if ($form = data_submitted()) { /// Filename @@ -74,7 +74,7 @@ echo ""; } - echo ""; + echo "
"; $definitions = get_records('quiz_dataset_definitions', 'category', @@ -86,7 +86,7 @@ $definition = NULL; } - echo "\n"; } - echo ""; + echo ""; echo "
"; + echo "
"; print_string("itemdefinition", "quiz"); echo ":"; echo "name\" />"; @@ -96,7 +96,7 @@ echo "
"; echo ""; print_simple_box_end(); diff --git a/mod/quiz/questiontypes/datasetdependent/datasetitems.php b/mod/quiz/questiontypes/datasetdependent/datasetitems.php index 3bbff7b399..c123126247 100644 --- a/mod/quiz/questiontypes/datasetdependent/datasetitems.php +++ b/mod/quiz/questiontypes/datasetdependent/datasetitems.php @@ -1,4 +1,4 @@ - - "; + " + "; } else { $columns[] = ''; } $columns[] = $number; foreach ($datasetdefs as $datasetdef) { $columns[] = - '' - . " - id\"/>" + '' + . " + id\"/>" . // Set $data: ($data[$datasetdef->name] = $datasetdef->items[$number]->value) ; @@ -156,16 +156,16 @@ $force = ''; $reuse = ' checked="checked" '; } - $forceregeneration = '
' . $strreuseifpossible - . '
' . $strforceregeneration; } else { $forceregeneration = ''; } - $addline = array('" + . "\"/>" . $forceregeneration , $maxnumber+1); foreach ($datasetdefs as $datasetdef) { @@ -229,10 +229,10 @@ } $addline[] = - '' - . "id\"/>" + '' + . "id\"/>" . ( 2 != $datasetdef->type - ? '' : choose_from_menu($coursefiles, 'value[]', @@ -251,23 +251,23 @@ // Print form for adding one more dataset $addtable->align = $table->align; $addtable->data = array($addline); - echo "
- - id\"/> - "; + echo " + + id\"/> + "; print_table($addtable); - echo '
'; + echo ''; // Print form with current datasets if ($table->data) { - echo "
- id\"/> - "; + echo " + id\"/> + "; print_table($table); - echo '
'; + echo ''; } - echo "


id\"/>
\n"; + echo "


id\"/>
\n"; print_footer(); diff --git a/mod/quiz/questiontypes/datasetdependent/questiondatasets.html b/mod/quiz/questiontypes/datasetdependent/questiondatasets.html index df269be04a..cfc6af5761 100644 --- a/mod/quiz/questiontypes/datasetdependent/questiondatasets.html +++ b/mod/quiz/questiontypes/datasetdependent/questiondatasets.html @@ -1,58 +1,58 @@ -
-
- - + +
+ +
- - - - - - + + + + + + $menu) { ?> - - - + + + - - - + + + - - + - -
{ $tmp){break;} p($name) ?>} -
{ $tmp){break;} p($name) ?>} -
- {} - -
+ {} + +
- -
+ +
- - - - - - - +
+ + + + + + + - - - - - - + + + + + + - - + + -
+
- - - -" /> - - + + + +" /> + + diff --git a/mod/quiz/questiontypes/description/description.html b/mod/quiz/questiontypes/description/description.html index 761b606b9f..dc4f9c6415 100644 --- a/mod/quiz/questiontypes/description/description.html +++ b/mod/quiz/questiontypes/description/description.html @@ -1,36 +1,36 @@ -
+ -
+
- +
- + - + - + - + - + - + - + - + - + - + - + - + - + -

:

:

 + id, true, true, $question->category); ?> -

:

:

 + - + -

:

@@ -40,7 +40,7 @@
-

+

"; + echo "

"; print_string("formattexttype"); @@ -108,11 +108,11 @@

:

:

 + -
+ - + - + - + -" /> +" /> -
+
-
+ diff --git a/mod/quiz/questiontypes/description/editquestion.php b/mod/quiz/questiontypes/description/editquestion.php index 4d7a67ee5f..eb2bb14539 100644 --- a/mod/quiz/questiontypes/description/editquestion.php +++ b/mod/quiz/questiontypes/description/editquestion.php @@ -1,4 +1,4 @@ -id)) { $options = get_record("quiz_match", "question", $question->id); @@ -7,7 +7,7 @@ } } if (empty($subquestions) and empty($subanswers)) { - for ($i=0; $i +
-
+
- +
- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +

:

:

 + id, true, true, $question->category); ?> -

:

:

 + - + -

:

@@ -40,7 +40,7 @@
-

+

"; + echo "

"; print_string("formattexttype"); @@ -108,11 +108,11 @@

:

:

 + -

:

:

+

-

:

:

 + - +
   - + -
- + - + -" /> +" /> -
+
-
+ diff --git a/mod/quiz/questiontypes/match/questiontype.php b/mod/quiz/questiontypes/match/questiontype.php index 369f350963..5ca4bf877a 100644 --- a/mod/quiz/questiontypes/match/questiontype.php +++ b/mod/quiz/questiontypes/match/questiontype.php @@ -1,4 +1,4 @@ -questiontext and $question->id) { $answers = quiz_get_answers($question); diff --git a/mod/quiz/questiontypes/multianswer/multianswer.html b/mod/quiz/questiontypes/multianswer/multianswer.html index 25586f7ef7..1758dd098d 100644 --- a/mod/quiz/questiontypes/multianswer/multianswer.html +++ b/mod/quiz/questiontypes/multianswer/multianswer.html @@ -1,46 +1,46 @@ -
+ -
+
- +
- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + -

:

:

 + id, true, true, $question->category); ?> -

:

:

 + - + -

:

:

 + "; + echo "
"; } @@ -58,15 +58,15 @@ ?> -

:

:

 + -
+ - + - + - + -" /> +" /> -
+
-
+ diff --git a/mod/quiz/questiontypes/multianswer/questiontype.php b/mod/quiz/questiontypes/multianswer/questiontype.php index a1e029ea3a..fb89a42ff5 100644 --- a/mod/quiz/questiontypes/multianswer/questiontype.php +++ b/mod/quiz/questiontypes/multianswer/questiontype.php @@ -1,4 +1,4 @@ -answers)) { $answersraw = get_records_list("quiz_answers", "id", $options->answers); } - for ($i=0; $i +
-
+
- +
- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + @@ -230,19 +230,19 @@ ?> -

:

:

 + id, true, true, $question->category); ?> -

:

:

 + - + -

:

@@ -40,7 +40,7 @@
-

+

"; + echo "

"; print_string("formattexttype"); @@ -108,11 +108,11 @@

:

:

 + -

:

:

 + -

:

:

+

-

:

:

 + -    +    fraction, ""); ?> -
+
-

:

:

 + - + -
  
+ - + - + -" /> +" /> -
+
-
+ diff --git a/mod/quiz/questiontypes/multichoice/questiontype.php b/mod/quiz/questiontypes/multichoice/questiontype.php index c1a8a14f87..921b384409 100644 --- a/mod/quiz/questiontypes/multichoice/questiontype.php +++ b/mod/quiz/questiontypes/multichoice/questiontype.php @@ -1,4 +1,4 @@ - -
- - - -

:

 +
+
+ + + + - - - - + + + + - - + + + - - - + + - + + - - + + - - - - - + + + + - - - - - - - - + + + + + + + + - - + ()

+ + + - + - - + - + - - -unit) ?>" />

+ + + -

:

 id, true, true, $question->category); ?> -

:

 - +

:

 + -

:




-

+

'; } else { - echo "

"; + echo "
"; print_string("formattexttype"); echo ": "; if (!isset($question->questiontextformat)) { @@ -53,20 +53,20 @@ ?>

:

 +

:

 image", get_string("none"),"",""); } ?> -

:

:

 -    -

:

 - ± + +    +

:

 + ± - - - -
-

:

 - -

:

 -

- + + +
+

:

 + +

:

 +

+ - ()

-

:

:
-

: - " size="10" +

+

: + " size="10" align="RIGHT" name="multiplier[]" value="multiplier) ?>" /> -    : - " +    : + " name="unit[]" - size="5" value="unit) ?>" />

-
+
- - -" /> -
- - + diff --git a/mod/quiz/questiontypes/numerical/questiontype.php b/mod/quiz/questiontypes/numerical/questiontype.php index cc3ddb763f..5afbd93d70 100644 --- a/mod/quiz/questiontypes/numerical/questiontype.php +++ b/mod/quiz/questiontypes/numerical/questiontype.php @@ -1,4 +1,4 @@ - + - + - + - + - +

:

:

 @@ -18,9 +18,9 @@

:

:

 @@ -30,7 +30,7 @@ } ?> - + @@ -42,13 +42,13 @@ - + - + - + " /> diff --git a/mod/quiz/questiontypes/randomsamatch/editquestion.php b/mod/quiz/questiontypes/randomsamatch/editquestion.php index 87045a9cab..7f89013d62 100644 --- a/mod/quiz/questiontypes/randomsamatch/editquestion.php +++ b/mod/quiz/questiontypes/randomsamatch/editquestion.php @@ -1,4 +1,4 @@ -id)) { $options = get_record("quiz_randomsamatch", "question", $question->id); } else { diff --git a/mod/quiz/questiontypes/randomsamatch/questiontype.php b/mod/quiz/questiontypes/randomsamatch/questiontype.php index d84cfbd8a3..06dddeb45b 100644 --- a/mod/quiz/questiontypes/randomsamatch/questiontype.php +++ b/mod/quiz/questiontypes/randomsamatch/questiontype.php @@ -1,4 +1,4 @@ - +
-
+
- +
- + - + - + - + - + - + - + - + - + - - + - + - + - + -

:

:

 + - category]; ?> + category]; ?> - category"; ?>" /> + category"; ?>" /> -

:

:

 + - name)) { @@ -34,21 +34,21 @@ ?> - + -

:

+

:


-

+

"; + echo "

"; print_string("formattexttype"); @@ -122,11 +122,11 @@

:

:

 + -
+
- + - + -" /> +" /> - + - + diff --git a/mod/quiz/questiontypes/shortanswer/editquestion.php b/mod/quiz/questiontypes/shortanswer/editquestion.php index 670830ce32..6c240f4d85 100644 --- a/mod/quiz/questiontypes/shortanswer/editquestion.php +++ b/mod/quiz/questiontypes/shortanswer/editquestion.php @@ -1,4 +1,4 @@ -id)) { $options = get_record("quiz_shortanswer", "question", $question->id); } else { @@ -7,7 +7,7 @@ if (!empty($options->answers)) { $answersraw = get_records_list("quiz_answers", "id", $options->answers); } - for ($i=0; $i +
-
+
- +
- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +

:

:

 + id, true, true, $question->category); ?> -

:

:

 + - + -

:

@@ -40,7 +40,7 @@
-

+

"; + echo "

"; print_string("formattexttype"); @@ -108,11 +108,11 @@

:

:

 + -

:

:

 + -

:

:

 + -

+

-

:

:

 + -    +    fraction,""); ?> -
+
-

:

:

 + - + -
  
- + - + -" /> +" /> -
+
-
+ diff --git a/mod/quiz/questiontypes/truefalse/editquestion.php b/mod/quiz/questiontypes/truefalse/editquestion.php index e113ffbed3..9ffe39f6c9 100644 --- a/mod/quiz/questiontypes/truefalse/editquestion.php +++ b/mod/quiz/questiontypes/truefalse/editquestion.php @@ -1,4 +1,4 @@ -id)) { $options = get_record("quiz_truefalse", "question", "$question->id"); diff --git a/mod/quiz/questiontypes/truefalse/questiontype.php b/mod/quiz/questiontypes/truefalse/questiontype.php index 30e8f6472e..8f2416acdc 100644 --- a/mod/quiz/questiontypes/truefalse/questiontype.php +++ b/mod/quiz/questiontypes/truefalse/questiontype.php @@ -1,4 +1,4 @@ -id\" />$true->answer"; echo ""; echo "id\" />$false->answer"; - echo "
";// changed from CLEAR=ALL jm + echo "
";// changed from clear=ALL jm if ($quiz->feedback && isset($answers[$nameprefix]) && $feedback = $answers[$nameprefix]->feedback) { quiz_print_comment( diff --git a/mod/quiz/questiontypes/truefalse/truefalse.html b/mod/quiz/questiontypes/truefalse/truefalse.html index a9ec8ff788..92bd6c9916 100644 --- a/mod/quiz/questiontypes/truefalse/truefalse.html +++ b/mod/quiz/questiontypes/truefalse/truefalse.html @@ -1,36 +1,36 @@ -
+ -
+
- +
- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + -

:

:

 + id, true, true, $question->category); ?> -

:

:

 + - + -

:

@@ -40,7 +40,7 @@
-

+

"; + echo "

"; print_string("formattexttype"); @@ -108,11 +108,11 @@

:

:

 + -

:

:

 + answer", ""); ?> -
+
-

():

():

 + - + -

():

():

 + - + -
+ - + - + -" /> +" /> -
+
-
+ diff --git a/mod/quiz/quizfile.php b/mod/quiz/quizfile.php index 74583a91c0..af1a11be6e 100644 --- a/mod/quiz/quizfile.php +++ b/mod/quiz/quizfile.php @@ -1,4 +1,4 @@ -name", "", - "id>$strquizzes + "id\">$strquizzes -> id\">$quiz->name -> $strreport", "", "", true, update_module_button($cm->id, $course->id, $strquiz), navmenu($course, $cm)); @@ -69,7 +69,7 @@ } } - echo ""; + echo "
"; foreach ($reportlist as $report) { $strreport = get_string("report$report", "quiz"); if ($report == $mode) { diff --git a/mod/quiz/report/default.php b/mod/quiz/report/default.php index 083ec06a01..48f9f29207 100644 --- a/mod/quiz/report/default.php +++ b/mod/quiz/report/default.php @@ -1,4 +1,4 @@ -\n"); + print ("
\n"); $totcolcount = $table_colcount+2; print(""); qr_print_headers($data_tally,"$strname","$strgrade"); @@ -674,23 +674,23 @@ class quiz_report extends quiz_default_report { //else the data to be printed is in $thisitem['data'] and $thisitem['score'] == 1 shows that the item was correct if ($thisitem['score'] < 1) {$thiscolor = "ff0000";} else {$thiscolor = "000000";} if ($thisitemkey == 0){ - print(""); + print(""); } elseif ($thisitemkey == 1){ - print(""); + print(""); } elseif ($thisitemkey['qtype'] == 2){ print(""); } elseif ($thisitem['qtype'] == 5) { if ($thisitem['score'] == 1) {$thiscolor = "blue";} if(!$thisitem['data'][1]){$thisitem['data'][1]="($strnoresponse)";} - print(""); + print(""); } elseif ($thisitem['qtype'] == 3) { if ($showtext) { - print(""); + print(""); } else { - print(""); + print(""); } } else { - print(""); + print(""); } } } @@ -705,44 +705,44 @@ class quiz_report extends quiz_default_report { print_object($qtally); } //print tally of how many selected each choice - print ("

$strindivresp
$thisitem $thisitem  $thisitem%   $thisitem%    $thisitem[data][answer]  {$thisitem['data'][0]}
{$thisitem['data'][1]}		{$thisitem['data'][0]}
{$thisitem['data'][1]}		  {$thisitem['data']}    {$thisitem['data']}    {$thisitem['data']}    {$thisitem['data']}    {$thisitem['data']}    {$thisitem['data']}  
\n"); + print ("

\n"); print(""); qr_print_headers($data_tally,"Item"," "); //display row with correct answers - print(""); + print(""); foreach ($qs_in_order as $qid){ if ($quests[$qid]['qtype'] == 5) { foreach($match_answers[$qid] as $thisans){ - print(""); + print(""); } } else { - print(""); + print(""); } } print("\n"); //display a row for each possible multiple choice with $max_choices being highest row,$table_colcount is the width for ($i = 1; $i<= $max_choices;$i++){ - print(""); + print(""); } } print("\n"); //Display the total percent correct - print(""); + print(""); for ($i = 0; $i< $table_colcount;$i++){ print (" "); } print("\n"); //Finally display the itemanalysis - print(""); for ($i = 1; $i<= $table_colcount;$i++){ @@ -753,30 +753,30 @@ class quiz_report extends quiz_default_report { } else { $val = 0; } - print (" "); + print (" "); } print("\n"); print("
$stritemanal
$strcorrresp:
$strcorrresp: $thisans  $thisans  {$quests[$qid]['correct']}  {$quests[$qid]['correct']} 
 M/C #$i"); + print("
 M/C #$i"); //display answer tallies for ($j = 1; $j <= $table_colcount; $j++){ //substitute "
" for a "//" $nowdata = $analysis[$i][$j]; if (strpos($nowdata,"//")>0) {$nowdata = str_replace("//","
",$nowdata);} - print("		 $nowdata $nowdata
$strpercentcorrect:
$strpercentcorrect:{$pct_correct[$i]}
"); + print("
"); helpbutton("discrimination", "", "quiz"); print(" $strdiscrimination:$val ({$top_scores[$i]}/{$bott_scores[$i]})$val ({$top_scores[$i]}/{$bott_scores[$i]})
\n"); //Now printout the questions (and M/C answers if $containsMC - print ("

\n"); + print ("

\n"); if ($containsMCTF){$ws = " ". $strwithsummary;} else {$ws = "";} - print("\n"); + print("\n"); $qcount = 0; $itemcount = 0; //needed since matching Qs adds additional columns of data in $analysis foreach ($qs_in_order as $qid){ $qcount++; if ($quests[$qid]['qtype']==5) { $itemcount = $itemcount + $match_number[$qid];} else {$itemcount++;} - print("\n"); + print("\n"); if($quests[$qid]['qtype']==3){ $nowchoices = $quests[$qid]['choice']; foreach($nowchoices as $thischoice){ $cno = $thischoice['choiceno']; $nowstat = $analysis[$cno][$itemcount]; $pct_cor = qr_make_pct($nowstat,$total_user_count); - print(""); - print("\n"); + print(""); + print("\n"); } } if($quests[$qid]['qtype']==2){ @@ -785,21 +785,21 @@ class quiz_report extends quiz_default_report { $colpos = strpos($nowstat,":"); $nowresp = substr($nowstat,$colpos+1); $pct_cor = qr_make_pct($nowresp,$total_user_count); - print(""); - print("\n"); + print(""); + print("\n"); //"False" responses $nowstat = $analysis[2][$itemcount]; $colpos = strpos($nowstat,":"); $nowresp = substr($nowstat,$colpos+1); $pct_cor = qr_make_pct($nowresp,$total_user_count); - print(""); - print("\n"); + print(""); + print("\n"); } } print("
QUIZ: $quiz->name   --   $strlistitems$ws
QUIZ: $quiz->name   --   $strlistitems$ws
Q-$qcount{$quests[$qid]['qtext']}
Q-$qcount{$quests[$qid]['qtext']}
$nowstat ($pct_cor%) A-$cno{$thischoice['answer']}
$nowstat ($pct_cor%) A-$cno{$thischoice['answer']}
$nowresp ($pct_cor%) True
$nowresp ($pct_cor%) True
$nowresp ($pct_cor%) False
$nowresp ($pct_cor%) False
\n"); echo "
\n"; - echo "\n"; + echo "
\n"; echo ""); + print(""); } else { print(""); } @@ -1025,20 +1025,20 @@ function qr_match_array($nowQ){ function qr_match_table($resplist){ global $quiz_matches; - $tbl = "\n
"; unset($options); $options["id"] = "$cm->id"; @@ -894,7 +894,7 @@ function qr_print_headers($data_tally,$nm,$gd){ global $qs_in_order,$qtally,$quests,$total_user_count,$match_number,$strquestion; $qcount = 0; if($nm == "Item") { - print("
$strquestion:
$strquestion:
$nm$gd
"; + $tbl = "\n
"; $resp_array = explode(",",$resplist); $q_cnt=0; foreach ($resp_array as $resp_pair){ $q_cnt++; $tbl = $tbl .""; } - $tbl = $tbl . "\n"; + $tbl = $tbl . "\n"; foreach ($resp_array as $resp_pair){ $resp_QA = explode("-",$resp_pair); if ($resp_QA[0] == $resp_QA[1]){ - $qa = " {$quiz_matches[$resp_QA[0]]['Q']} - {$quiz_matches[$resp_QA[1]]['A']}"; + $qa = " {$quiz_matches[$resp_QA[0]]['Q']} - {$quiz_matches[$resp_QA[1]]['A']}"; } else{ - $qa = " {$quiz_matches[$resp_QA[0]]['Q']} - {$quiz_matches[$resp_QA[1]]['A']}"; + $qa = " {$quiz_matches[$resp_QA[0]]['Q']} - {$quiz_matches[$resp_QA[1]]['A']}"; } // $qa = $resp_QA[0] . "=" . $resp_QA[1] ; $tbl = $tbl . ""; diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php index 9c60f5d191..0a10130505 100644 --- a/mod/quiz/report/overview/report.php +++ b/mod/quiz/report/overview/report.php @@ -107,7 +107,7 @@ class quiz_report extends quiz_default_report { } //Embed script for warning - echo "\n - + onClick="lockoptions('form', 'windowpopup[0]', frameitem); return lockoptions('form', 'windowpopup[1]', popupitems);" /> ">
    - - options == "frame") ? "checked" : "" ?> /> + + options == "frame") ? "checked" : "" ?> />
@@ -83,7 +83,7 @@ @@ -74,7 +74,7 @@ - -
$q_cnt
$qa
- + onclick="lockoptions('form', 'windowpopup[0]', frameitem); return lockoptions('form', 'windowpopup[1]', popupitems);" /> @@ -93,19 +93,19 @@ if ($name == "height" or $name == "width") { continue; } - echo ""; - echo "$name." />"; + echo ""; + echo "$name." />"; $stringname = "str$name"; echo $$stringname."
"; } ?> - - + +
- - + +
fullname, "$navigation framename\" href=\"$fullurl\">{$resource->name}", "", "", true, update_module_button($this->cm->id, $course->id, $strresource), navmenu($course, $this->cm, "parent")); - echo "
".text_to_html($resource->summary, true, false)."
"; + echo "
".text_to_html($resource->summary, true, false)."
"; echo ""; exit; } @@ -365,11 +365,11 @@ function display() { echo ''; - echo "wwwroot/lib/mp3player/mp3player.swf?src=$fullurl&autostart=yes\">"; - echo ''; - echo ''; + echo "wwwroot/lib/mp3player/mp3player.swf?src=$fullurl&autostart=yes\">"; + echo ''; + echo ''; echo "wwwroot/lib/mp3player/mp3player.swf?src=$fullurl&autostart=yes\" "; - echo " quality=high bgcolor=\"#333333\" width=\"600\" height=\"70\" name=\"mp3player\" "; + echo " quality=\"high\" bgcolor=\"#333333\" width=\"600\" height=\"70\" name=\"mp3player\" "; echo ' type="application/x-shockwave-flash" '; echo ' pluginspage="http://www.macromedia.com/go/getflashplayer">'; echo ''; @@ -383,15 +383,15 @@ function display() { echo ' standby="Loading Microsoft® Windows® Media Player components..." '; echo ' id="msplayer" align="" type="application/x-oleobject">'; echo ""; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; echo "\n'; echo ""; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; echo ''; echo "\n - 		+

:



@@ -65,7 +65,7 @@ var popupitems = []; var allitems = []; - + onClick="return lockoptions('form', 'windowpopup[1]', popupitems);" /> ">
- + onclick=" return lockoptions('form', 'windowpopup[1]', popupitems);" />
    @@ -83,19 +83,19 @@ if ($name == "height" or $name == "width") { continue; } - echo ""; - echo "$name." />"; + echo ""; + echo "$name." />"; $stringname = "str$name"; echo $$stringname."
    "; } ?> - - + +
    - - + +
    alltext, FORMAT_HTML, $formatoptions, $course->id), "center", "", "$THEME->cellcontent", "20"); - echo "

    $strlastmodified: ".userdate($resource->timemodified)."

    "; + echo "

    $strlastmodified: ".userdate($resource->timemodified)."

    "; print_footer($course); } diff --git a/mod/resource/type/text/resource.class.php b/mod/resource/type/text/resource.class.php index 8447440a1f..ac9856230b 100644 --- a/mod/resource/type/text/resource.class.php +++ b/mod/resource/type/text/resource.class.php @@ -139,7 +139,7 @@ function display() { print_simple_box(format_text($resource->alltext, $resource->options, $formatoptions, $course->id), "center", "", "$THEME->cellcontent", "20"); - echo "

    $strlastmodified: ".userdate($resource->timemodified)."

    "; + echo "

    $strlastmodified: ".userdate($resource->timemodified)."

    "; print_footer($course); } diff --git a/mod/resource/type/text/text.html b/mod/resource/type/text/text.html index f0e036b8dd..78d02f4f46 100644 --- a/mod/resource/type/text/text.html +++ b/mod/resource/type/text/text.html @@ -28,7 +28,7 @@
+

:



@@ -40,7 +40,7 @@
+

:


 @@ -77,7 +77,7 @@ var popupitems = []; var allitems = []; - + onClick="return lockoptions('form', 'windowpopup[1]', popupitems);" /> "> @@ -87,7 +87,7 @@
- + onclick=" return lockoptions('form', 'windowpopup[1]', popupitems);" /> @@ -97,19 +97,19 @@ if ($name == "height" or $name == "width") { continue; } - echo ""; - echo "$name." />"; + echo ""; + echo "$name." />"; $stringname = "str$name"; echo $$stringname."
"; } ?> - - + +
- - + +
- - - +

scorm_validate:

+ + - - + + - - + + "; + echo ""; + echo ""; echo " - diff --git a/mod/scorm/coursefiles.php b/mod/scorm/coursefiles.php index ede9fce8a7..c111014a8f 100755 --- a/mod/scorm/coursefiles.php +++ b/mod/scorm/coursefiles.php @@ -1,4 +1,4 @@ -"; + echo "

scorm_validate:

scorm_framesize:

scorm_framesize:

 - +

scorm_popup:

scorm_popup:

 "; - echo "

$defaultvalue:

$defaultvalue:

"; if ($optionname == "height" or $optionname == "width") { - echo "$defaultvalue."\" />"; + echo "$defaultvalue."\" />"; } else { choose_from_menu ($choices, $defaultvalue, $CFG->$defaultvalue, ""); } @@ -61,7 +61,7 @@ } ?>
+ " />
"; echo ""; echo "\n"; + echo ""; + echo "\n"; } function displaydir ($wdir) { @@ -704,15 +704,15 @@ function displaydir ($wdir) { $strchoose = get_string("choose"); - echo ""; - echo "
"; } @@ -147,25 +147,25 @@ $strmaxsize = get_string("maxsize", "", $filesize); $strcancel = get_string("cancel"); - echo "

$struploadafile ($strmaxsize) --> $wdir"; - echo "
"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo " "; - echo ""; - echo ""; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "
"; + echo "

$struploadafile ($strmaxsize) --> $wdir"; + echo "
"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo " "; + echo ""; + echo ""; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "
"; } html_footer(); break; @@ -176,7 +176,7 @@ foreach ($USER->filelist as $file) { $fullfile = $basedir.$file; if (! fulldelete($fullfile)) { - echo "
Error: Could not delete: $fullfile"; + echo "
Error: Could not delete: $fullfile"; } } clearfilelist(); @@ -186,7 +186,7 @@ } else { html_header($course, $wdir); if (setfilelist($_POST)) { - echo "

".get_string("deletecheckwarning").":

"; + echo "

".get_string("deletecheckwarning").":

"; print_simple_box_start("center"); printfilelist($USER->filelist); print_simple_box_end(); @@ -206,7 +206,7 @@ if ($count = setfilelist($_POST)) { $USER->fileop = $action; $USER->filesource = $wdir; - echo "

"; + echo "

"; print_string("selectednowmove", "moodle", $count); echo "

"; } @@ -222,7 +222,7 @@ $oldfile = $basedir.$file; $newfile = $basedir.$wdir."/".$shortfile; if (!rename($oldfile, $newfile)) { - echo "

Error: $shortfile not moved"; + echo "

Error: $shortfile not moved"; } } } @@ -247,24 +247,24 @@ $strcancel = get_string("cancel"); $strrenamefileto = get_string("renamefileto", "moodle", $file); html_header($course, $wdir, "form.name"); - echo "

$strrenamefileto:"; - echo "
"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "		"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "
"; + echo "

$strrenamefileto:"; + echo "
"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "		"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "
"; } html_footer(); break; @@ -285,23 +285,23 @@ $strcancel = get_string("cancel"); $strcreatefolder = get_string("createfolder", "moodle", $wdir); html_header($course, $wdir, "form.name"); - echo "

$strcreatefolder:"; - echo "
"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "		"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "
"; + echo "

$strcreatefolder:"; + echo "
"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "		"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "
"; } html_footer(); break; @@ -315,7 +315,7 @@ displaydir($wdir); } else { - $streditfile = get_string("edit", "", "$file"); + $streditfile = get_string("edit", "", "$file"); $fileptr = fopen($basedir.$file, "r"); $contents = fread($fileptr, filesize($basedir.$file)); fclose($fileptr); @@ -334,24 +334,24 @@ print_heading("$streditfile"); - echo "
"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; + echo "
"; + echo ""; + echo " "; + echo " "; + echo " "; + echo " "; print_textarea($usehtmleditor, 25, 80, 680, 400, "text", $contents); - echo "
"; - echo " "; - echo ""; - echo ""; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "
"; + echo "
"; + echo " "; + echo ""; + echo ""; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "
"; if ($usehtmleditor) { print_richedit_javascript("form", "text", "yes"); @@ -392,28 +392,28 @@ html_header($course, $wdir, "form.name"); if (setfilelist($_POST)) { - echo "

".get_string("youareabouttocreatezip").":

"; + echo "

".get_string("youareabouttocreatezip").":

"; print_simple_box_start("center"); printfilelist($USER->filelist); print_simple_box_end(); - echo "
"; - echo "

".get_string("whattocallzip"); - echo "
"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "		"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "
"; + echo "
"; + echo "

".get_string("whattocallzip"); + echo "
"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "		"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "
"; } else { displaydir($wdir); clearfilelist(); @@ -432,7 +432,7 @@ $strok = get_string("ok"); $strunpacking = get_string("unpacking", "", $file); - echo "

$strunpacking:

"; + echo "

$strunpacking:

"; $file = basename($file); @@ -442,11 +442,11 @@ if (!$list = $archive->extract("$basedir/$wdir")) { error($archive->errorInfo(true)); } else { // print some output - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; + echo "
$strname$strsize$strmodified$strstatus
"; + echo ""; + echo ""; + echo ""; + echo ""; foreach ($list as $item) { echo ""; $item['filename'] = str_replace("$basedir/$wdir/", "", $item['filename']); @@ -466,20 +466,20 @@ } else { // Use external unzip program print_simple_box_start("center"); - echo "
";
+                    echo "
";
                     $command = "cd $basedir/$wdir ; $CFG->unzip -o $file 2>&1";
                     passthru($command);
-                    echo "
";
+                    echo "
"; print_simple_box_end(); } - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo ""; - echo "
"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo ""; + echo "
"; } else { displaydir($wdir); } @@ -495,7 +495,7 @@ $strok = get_string("ok"); $strlistfiles = get_string("listfiles", "", $file); - echo "

$strlistfiles:

"; + echo "

$strlistfiles:

"; $file = basename($file); include_once($CFG->libdir.'/pclzip/pclzip.lib.php'); @@ -504,8 +504,8 @@ notify($archive->errorInfo(true)); } else { - echo "
$strname$strsize$strmodified$strstatus
"; - echo ""; + echo "
$strname$strsize$strmodified
"; + echo ""; foreach ($list as $item) { echo ""; print_cell("left", $item['filename']); @@ -520,13 +520,13 @@ } echo "
$strname$strsize$strmodified
"; } - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "
"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "
"; } else { displaydir($wdir); } @@ -636,7 +636,7 @@ function printfilelist($filelist) { foreach ($filelist as $file) { if (is_dir($basedir.$file)) { - echo "pixpath/f/folder.gif\" height=16 width=16> $file
"; + echo "pixpath/f/folder.gif\" height=\"16\" width=\"16\"> $file
"; $subfilelist = array(); $currdir = opendir($basedir.$file); while ($subfile = readdir($currdir)) { @@ -648,18 +648,18 @@ function printfilelist($filelist) { } else { $icon = mimeinfo("icon", $file); - echo "pixpath/f/$icon\" height=16 width=16> $file
"; + echo "pixpath/f/$icon\" height=\"16\" width=\"16\"> $file
"; } } } function print_cell($alignment="center", $text=" ") { - echo "		"; - echo ""; + echo ""; + echo ""; echo "$text"; - echo ""; - echo "
"; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo "\n"; + echo ""; + echo "
$strname$strsize$strmodified$straction
"; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo "\n"; if ($wdir == "/") { $wdir = ""; @@ -731,15 +731,15 @@ function displaydir ($wdir) { $filesafe = rawurlencode($dir); $filedate = userdate(filectime($filename), "%d %b %Y, %I:%M %p"); - echo ""; + echo ""; - print_cell("center", ""); - print_cell("left", "pixpath/f/folder.gif\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"Folder\">".htmlspecialchars($dir).""); + print_cell("center", ""); + print_cell("left", "pixpath/f/folder.gif\" height=\"16\" width=\"16\" border=\"0\" alt=\"Folder\">".htmlspecialchars($dir).""); print_cell("right", "-"); print_cell("right", $filedate); - print_cell("right", "$strrename"); + print_cell("right", "$strrename"); - echo ""; + echo ""; } } @@ -772,9 +772,9 @@ function displaydir ($wdir) { print_cell("center", ""); - echo ""; } } echo "
$strname$strsize$strmodified$straction
"; + echo ""; link_to_popup_window ($ffurl, "display", - "pixpath/f/$icon\" height=16 width=16 border=0 alt=\"file\">", + "pixpath/f/$icon\" height=\"16\" width=\"16\" border=\"0\" alt=\"file\">", 480, 640); echo ""; link_to_popup_window ($ffurl, "display", htmlspecialchars($file), 480, 640); @@ -793,22 +793,22 @@ function displaydir ($wdir) { $edittext .= "$strlist "; } - print_cell("right", "$edittext $strrename"); + print_cell("right", "$edittext $strrename"); echo "
"; - echo "
"; + echo "
"; if (empty($wdir)) { $wdir = "/"; } - echo ""; - echo ""; + echo ""; + echo "
"; - echo ""; - echo " "; + echo ""; + echo ""; - echo ""; - echo "
"; + echo ""; + echo " "; $options = array ( "move" => "$strmovetoanotherfolder", "delete" => "$strdeletecompletely", @@ -818,34 +818,34 @@ function displaydir ($wdir) { choose_from_menu ($options, "action", "", "$strwithchosenfiles...", "javascript:document.dirform.submit()"); } - echo ""; - echo ""; + echo ""; + echo ""; if (!empty($USER->fileop) and ($USER->fileop == "move") and ($USER->filesource <> $wdir)) { - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; } - echo "		"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "		"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "
"; - echo "
"; + echo "		"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "		"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "
"; + echo "
"; } diff --git a/mod/scorm/db/mysql.php b/mod/scorm/db/mysql.php index 1286643277..640c9d8264 100755 --- a/mod/scorm/db/mysql.php +++ b/mod/scorm/db/mysql.php @@ -1,4 +1,4 @@ -cellheading"); echo "\n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; if ($errorlogs != '') { $lines = round(count($errors)/4); if ($lines < 5) { $lines = 5; } - echo " \n"; + echo " \n"; } if (($form->mode == "update") && ($form->launch == 0) && (get_records("scorm_sco_users","scormid",$form->instance))) - echo " \n"; + echo " \n"; echo "

$strname:

$form->name

".get_string("validation","scorm").":

".get_string($result,"scorm")."

$strname:

$form->name

".get_string("validation","scorm").":

".get_string($result,"scorm")."

".get_string("errorlogs","scorm").":

".get_string("errorlogs","scorm").":

".get_string("trackingloose","scorm")."

".get_string("trackingloose","scorm")."

\n"; if (($result == "regular") || ($result == "found")){ if (empty($form->auto)) { @@ -150,8 +150,8 @@ ?> - - + + - - + + - - + + -

:

:

:

:

 =1; $i--) { @@ -176,8 +176,8 @@ ?>

:

:
+

@@ -207,8 +207,8 @@ echo "document.theform.auto.disabled=true;\n"; ?> - - onclick="autowindow();return lockoptions('theform','newwindow', subitems);" /> + + onclick="autowindow();return lockoptions('theform','newwindow', subitems);" />
    - -
    - -
    + +
    + +
    \n - +