diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php index 19ebc425c7e..661b09287bc 100644 --- a/mod/quiz/edit.php +++ b/mod/quiz/edit.php @@ -20,19 +20,19 @@ } $modform->instance = $modform->id; $SESSION->modform = $modform; // Save the form in the current session - + $cm = get_coursemodule_from_instance('quiz', $modform->instance); - add_to_log($cm->course, 'quiz', 'editquestions', - "view.php?id=$modform->instance", - "$modform->name", $cm->id); + add_to_log($cm->course, 'quiz', 'editquestions', + "view.php?id=$modform->instance", + "$modform->name", $cm->id); } else if ($courseid) { // Page retrieve through "Edit Questions" link - no quiz selected $modform->course = $courseid; unset($modform->instance); $SESSION->modform = $modform; // Save the form in the current session - + add_to_log($courseid, 'quiz', 'editquestions', "index.php?id=$courseid"); - + } else { if (!isset($SESSION->modform)) { // We currently also get here after editing a question by @@ -40,7 +40,7 @@ error(''); } - // The data is obtained from a $SESSION variable. This is mostly for historic reasons. + // The data is obtained from a $SESSION variable. This is mostly for historic reasons. // With the way things work now it would be just as possible to get the data from the database. $modform = $SESSION->modform; } @@ -121,11 +121,11 @@ $questionrecord = get_record("quiz_questions", "id", $key); if (!empty($questionrecord->defaultgrade)) { - $modform->grades[$key] = $questionrecord->defaultgrade; + $modform->grades[$key] = $questionrecord->defaultgrade; } else if ($questionrecord->qtype == DESCRIPTION){ - $modform->grades[$key] = 0; + $modform->grades[$key] = 0; } else { - $modform->grades[$key] = 1; + $modform->grades[$key] = 1; } } } @@ -140,7 +140,7 @@ quiz_questiongrades_update($modform->grades, $modform->instance); } - if (isset($_REQUEST['delete']) and confirm_sesskey()) { /// Delete a question from the list + if (isset($_REQUEST['delete']) and confirm_sesskey()) { /// Delete a question from the list $questions = explode(",", $modform->questions); foreach ($questions as $key => $question) { if ($question == $delete) { @@ -171,18 +171,18 @@ } quiz_questiongrades_update($modform->grades, $modform->instance); } - + if (isset($_REQUEST['cat'])) { /// coming from category selection drop-down menu $modform->category = $cat; } - + if (isset($_REQUEST['recurse'])) { /// coming from checkbox below category selection form $modform->recurse = $recurse; } - + /// all commands have been dealt with, now print the page - if (empty($modform->category) or !record_exists('quiz_categories', 'id', $modform->category)) { + if (empty($modform->category) or !record_exists('quiz_categories', 'id', $modform->category)) { $category = quiz_get_default_category($course->id); $modform->category = $category->id; } @@ -213,7 +213,7 @@ " -> $strediting"); echo ''; echo '"; + echo ""; + echo "
'; - print_simple_box_start("center", "100%", $THEME->cellcontent2); + print_simple_box_start("center", "100%"); print_heading($modform->name); $sumgrades = quiz_print_question_list($modform->questions, $modform->grades); if (!set_field('quiz', 'sumgrades', $sumgrades, 'id', $modform->instance)) { @@ -235,14 +235,14 @@ echo ''; } // non-quiz-specific column - print_simple_box_start("center", "100%", $THEME->cellcontent2); + print_simple_box_start("center", "100%"); // starts with category selection form quiz_print_category_form($course, $modform->category, $modform->recurse); print_simple_box_end(); - + print_spacer(5,1); // continues with list of questions - print_simple_box_start("center", "100%", $THEME->cellcontent2); + print_simple_box_start("center", "100%"); quiz_print_cat_question_list($modform->category, isset($modform->instance), $modform->recurse, $page, $perpage); print_simple_box_end(); diff --git a/mod/quiz/export.php b/mod/quiz/export.php index 95b54d37d34..5b2c790d183 100644 --- a/mod/quiz/export.php +++ b/mod/quiz/export.php @@ -45,17 +45,17 @@ $format = new quiz_file_format(); if (! $format->exportpreprocess($category, $course)) { // Do anything before that we need to - error("Error occurred during pre-processing!", + error("Error occurred during pre-processing!", "$CFG->wwwroot/mod/quiz/export.php?category=$category->id"); } if (! $format->exportprocess($exportfilename)) { // Process the export data - error("Error occurred during processing!", + error("Error occurred during processing!", "$CFG->wwwroot/mod/quiz/export.php?category=$category->id"); } if (! $format->exportpostprocess()) { // In case anything needs to be done after - error("Error occurred during post-processing!", + error("Error occurred during post-processing!", "$CFG->wwwroot/mod/quiz/export.php?category=$category->id"); } @@ -63,7 +63,7 @@ print_continue("edit.php"); print_footer($course); exit; - } + } /// Print upload form @@ -85,11 +85,11 @@ // get filename if (!isset($exportfilename)) { $exportfilename = default_export_filename($course, $category); - } + } print_heading_with_help($strexportquestions, "export", "quiz"); - print_simple_box_start("center", "", "$THEME->cellheading"); + print_simple_box_start("center"); echo "
"; echo ""; diff --git a/mod/quiz/format/coursetestmanager/format.php b/mod/quiz/format/coursetestmanager/format.php index 18cbe553a65..5c971d219c0 100755 --- a/mod/quiz/format/coursetestmanager/format.php +++ b/mod/quiz/format/coursetestmanager/format.php @@ -1,4 +1,4 @@ -getquestioncategories($mdbpath, $mdapath, $hostname); - if (!$question_categories) { - $hostname_access_error = $hostname . " "; - unset($hostname); + if (!$question_categories) { + $hostname_access_error = $hostname . " "; + unset($hostname); } else { - $hostname_access_error = 0; + $hostname_access_error = 0; } - } + } - if ((PHP_OS == "Linux") and !isset($hostname)) { - // copy the file to a semi-permanent location - if (! $basedir = make_upload_directory("$course->id")) { - error("The site administrator needs to fix the file permissions for the data directory"); - } - if (!isset($hostname_access_error)) { - $bname=basename($filename); - $cleanfilename = clean_filename($bname); - if ($cleanfilename) { - $newfile = "$basedir/$cleanfilename"; - if (move_uploaded_file($filename, $newfile)) { - chmod($newfile, 0666); + if ((PHP_OS == "Linux") and !isset($hostname)) { + // copy the file to a semi-permanent location + if (! $basedir = make_upload_directory("$course->id")) { + error("The site administrator needs to fix the file permissions for the data directory"); + } + if (!isset($hostname_access_error)) { + $bname=basename($filename); + $cleanfilename = clean_filename($bname); + if ($cleanfilename) { + $newfile = "$basedir/$cleanfilename"; + if (move_uploaded_file($filename, $newfile)) { + chmod($newfile, 0666); clam_log_upload($newfile,$course); - } else { - notify(get_string("uploadproblem", "", $filename)); - } - } - $filename = $newfile; - } - print_heading_with_help($strimportquestions, "import", "quiz"); - print_simple_box_start("center", "", "$THEME->cellheading"); - if ($hostname_access_error) { notify("couldn't connect to ODBC Socket Server on " . $hostname_access_error); } - echo ""; - echo "
"; + } else { + notify(get_string("uploadproblem", "", $filename)); + } + } + $filename = $newfile; + } + print_heading_with_help($strimportquestions, "import", "quiz"); + print_simple_box_start("center"); + if ($hostname_access_error) { notify("couldn't connect to ODBC Socket Server on " . $hostname_access_error); } + echo ""; + echo "
"; echo ""; + echo "What is the hostname or IP address of the ODBC Socket Server:"; echo ""; + echo "What is the location of the database (.mdb file) on the Socket Server:"; 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 " "; + echo " id."\" />"; + echo " format."\" />"; + echo " 
"; - echo "What is the location of the database (.mdb file) on the Socket Server:"; - echo " "; - echo " 
"; + echo " "; + echo " 
"; - echo "What is the location of the system database (System.mda file) on the Socket Server:"; - echo " "; - echo " 
 "; - echo " "; - echo "
"; - echo "
"; - print_simple_box_end(); - print_footer($course); - exit; - } - - // we get here if running windows or after connect to ODBC socket server on linux + echo "What is the location of the system database (System.mda file) on the Socket Server:		"; + echo " "; + echo " 
 "; + echo " "; + echo "
"; + echo ""; + print_simple_box_end(); + print_footer($course); + exit; + } + + // we get here if running windows or after connect to ODBC socket server on linux // // this generates the page to choose categories of questions to import // - if (!isset($question_category)) { + if (!isset($question_category)) { - if (PHP_OS == "WINNT") { - // copy the file to a semi-permanent location - if (! $basedir = make_upload_directory("$course->id")) { - error("The site administrator needs to fix the file permissions for the data directory"); - } - $bname=basename($filename); - $cleanfilename = clean_filename($bname); - if ($cleanfilename) { - $newfile = "$basedir/$cleanfilename"; - if (move_uploaded_file($filename, $newfile)) { - chmod($newfile, 0666); + if (PHP_OS == "WINNT") { + // copy the file to a semi-permanent location + if (! $basedir = make_upload_directory("$course->id")) { + error("The site administrator needs to fix the file permissions for the data directory"); + } + $bname=basename($filename); + $cleanfilename = clean_filename($bname); + if ($cleanfilename) { + $newfile = "$basedir/$cleanfilename"; + if (move_uploaded_file($filename, $newfile)) { + chmod($newfile, 0666); clam_log_upload($newfile,$course); - } else { - notify(get_string("uploadproblem", "", $filename)); - } - } - $filename = $newfile; - } + } else { + notify(get_string("uploadproblem", "", $filename)); + } + } + $filename = $newfile; + } // end of file copy - // don't have to do this on linux, since it's alreay been done in the test above + // don't have to do this on linux, since it's alreay been done in the test above if (PHP_OS == "WINNT") { $question_categories = $this->getquestioncategories($filename); } // print the intermediary form - if (!$categories = quiz_get_category_menu($course->id, true)) { - error("No categories!"); - } - print_heading_with_help($strimportquestions, "import", "quiz"); - print_simple_box_start("center", "", "$THEME->cellheading"); - echo "
"; - echo ""; + if (!$categories = quiz_get_category_menu($course->id, true)) { + error("No categories!"); + } + print_heading_with_help($strimportquestions, "import", "quiz"); + print_simple_box_start("center"); + 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"); - echo " "; - echo " id."\" />"; - echo " format."\" />"; - if (PHP_OS == "Linux") { - echo " "; - echo " "; - echo " "; - } - echo " 
 "; - echo " "; - echo "
"; - echo "
"; - print_simple_box_end(); - print_footer($course); - exit; - } + echo "Choose a category of questions to import:"; + asort($question_categories); + choose_from_menu($question_categories, "question_category","All Categories","All Categories", "", "allcategories"); + echo " "; + echo " id."\" />"; + echo " format."\" />"; + if (PHP_OS == "Linux") { + echo " "; + echo " "; + echo " "; + } + echo " "; + echo " "; + echo " "; + echo ""; + echo ""; + echo ""; + print_simple_box_end(); + print_footer($course); + exit; + } // // this is the main import section // notify("Importing questions"); - if (PHP_OS == "Linux") { - $hostname = trim($hostname); - $records = $this->getquestions($mdbpath,$question_category,$mdapath, $hostname); + if (PHP_OS == "Linux") { + $hostname = trim($hostname); + $records = $this->getquestions($mdbpath,$question_category,$mdapath, $hostname); } else { - $records = $this->getquestions($filename,$question_category); + $records = $this->getquestions($filename,$question_category); } - foreach ($records as $qrec) - { - $question = NULL; - $question->image = ""; // No images with this format - if ($qrec[9] != "") { - $question->image = $qrec[9]; - } - $question->defaultgrade = 1; -// 0 Selected -// 1 PracticeTestOK? -// 2 QuestionText -// 3 QuestionType -// 4 Option1Text -// 5 Option2Text -// 6 Option3Text -// 7 Option4Text -// 8 CorrectAnswer -// 9 Graphic -// 10 Module -// 11 ChapterNumber -// 12 PageNumber + foreach ($records as $qrec) + { + $question = NULL; + $question->image = ""; // No images with this format + if ($qrec[9] != "") { + $question->image = $qrec[9]; + } + $question->defaultgrade = 1; +// 0 Selected +// 1 PracticeTestOK? +// 2 QuestionText +// 3 QuestionType +// 4 Option1Text +// 5 Option2Text +// 6 Option3Text +// 7 Option4Text +// 8 CorrectAnswer +// 9 Graphic +// 10 Module +// 11 ChapterNumber +// 12 PageNumber $ref = "Answer can be found in chapter ". $qrec[11] . ", page " . $qrec[12] . "."; - switch ($qrec[3]) { - case 1: - $question->qtype = MULTICHOICE; // MULTICHOICE, SHORTANSWER, TRUEFALSE - // echo "
";echo htmlspecialchars($qrec[2]); echo "
"; - $question->questiontext = addslashes(trim($qrec[2])); - // echo "
";echo $question->questiontext; echo "
"; - $question->name = preg_replace("/
/", "", $question->questiontext); - $question->single = 1; // Only one answer is allowed -- used for multiple choicers - $fractionset = 0; - for ($i=4;$i<=7;$i++) { - if ($qrec[$i] != "") { - $question->answer[$i-3]=addslashes($qrec[$i]); - if ($qrec[8] == $i-3) { // if this is the index of CorrectAnswer - $question->fraction[$i-3] = 1; - $fractionset = 1; - } else { - $question->fraction[$i-3] = 0; - } - $question->feedback[$i-3] = (($qrec[8] == $i-3)?"Correct. ":"Incorrect. ") . $ref; - } - } - if ($fractionset == 0) { $question->fraction[1] = 1; } - break; - case 2: // TRUE FALSE - $question->qtype = TRUEFALSE; - $question->questiontext = addslashes(trim($qrec[2])); - $question->name = preg_replace("/
/", "", $question->questiontext); - // for TF, $question->answer should be 1 for true, 0 for false - if ($qrec[8] == "T") { $question->answer =1;} else { $question->answer = 0; } - // for TF, use $question->feedbacktrue and feedbackfalse - $question->feedbacktrue = (($qrec[8] =="T")?"Correct. ":"Incorrect. ") . $ref; - $question->feedbackfalse = (($qrec[8] =="F")?"Correct. ":"Incorrect. ") . $ref; - break; - case 3: - $question->qtype = SHORTANSWER; - $question->questiontext = addslashes(trim($qrec[2])); - // echo "
";echo $question->questiontext; echo "
"; - $question->name = preg_replace("/
/", "", $question->questiontext); - $question->usecase=0; // Ignore case -- for SHORT ANSWER questions - $answers = explode("~", $qrec[8]); - $question->answer[0]=" "; - $question->fraction[0]=1; - for ($i=0;$ianswer[$i] = addslashes(trim($answers[$i])); - $question->feedback[$i] = $ref; - $question->fraction[$i] = 1; // 1 for 100%, 0 for none or somewhere in between - } - break; - case 4: - $question = 0; - notify("Cannot use essay questions - skipping question ". $qrec[2] . " " . $ref); - break; - default: - $question = 0; - notify("Misformatted Record. Question Skipped."); - break; - } + switch ($qrec[3]) { + case 1: + $question->qtype = MULTICHOICE; // MULTICHOICE, SHORTANSWER, TRUEFALSE + // echo "
";echo htmlspecialchars($qrec[2]); echo "
"; + $question->questiontext = addslashes(trim($qrec[2])); + // echo "
";echo $question->questiontext; echo "
"; + $question->name = preg_replace("/
/", "", $question->questiontext); + $question->single = 1; // Only one answer is allowed -- used for multiple choicers + $fractionset = 0; + for ($i=4;$i<=7;$i++) { + if ($qrec[$i] != "") { + $question->answer[$i-3]=addslashes($qrec[$i]); + if ($qrec[8] == $i-3) { // if this is the index of CorrectAnswer + $question->fraction[$i-3] = 1; + $fractionset = 1; + } else { + $question->fraction[$i-3] = 0; + } + $question->feedback[$i-3] = (($qrec[8] == $i-3)?"Correct. ":"Incorrect. ") . $ref; + } + } + if ($fractionset == 0) { $question->fraction[1] = 1; } + break; + case 2: // TRUE FALSE + $question->qtype = TRUEFALSE; + $question->questiontext = addslashes(trim($qrec[2])); + $question->name = preg_replace("/
/", "", $question->questiontext); + // for TF, $question->answer should be 1 for true, 0 for false + if ($qrec[8] == "T") { $question->answer =1;} else { $question->answer = 0; } + // for TF, use $question->feedbacktrue and feedbackfalse + $question->feedbacktrue = (($qrec[8] =="T")?"Correct. ":"Incorrect. ") . $ref; + $question->feedbackfalse = (($qrec[8] =="F")?"Correct. ":"Incorrect. ") . $ref; + break; + case 3: + $question->qtype = SHORTANSWER; + $question->questiontext = addslashes(trim($qrec[2])); + // echo "
";echo $question->questiontext; echo "
"; + $question->name = preg_replace("/
/", "", $question->questiontext); + $question->usecase=0; // Ignore case -- for SHORT ANSWER questions + $answers = explode("~", $qrec[8]); + $question->answer[0]=" "; + $question->fraction[0]=1; + for ($i=0;$ianswer[$i] = addslashes(trim($answers[$i])); + $question->feedback[$i] = $ref; + $question->fraction[$i] = 1; // 1 for 100%, 0 for none or somewhere in between + } + break; + case 4: + $question = 0; + notify("Cannot use essay questions - skipping question ". $qrec[2] . " " . $ref); + break; + default: + $question = 0; + notify("Misformatted Record. Question Skipped."); + break; + } if ($question) { $questions[] = $question; } - } - $count = 0; - // process all the questions - if (PHP_OS == "WINNT") { - $filename = str_replace("\\\\","\\",$filename); - $filename = str_replace("/","\\",$filename); - } - foreach ($questions as $question) { // Process and store each question + } + $count = 0; + // process all the questions + if (PHP_OS == "WINNT") { + $filename = str_replace("\\\\","\\",$filename); + $filename = str_replace("/","\\",$filename); + } + foreach ($questions as $question) { // Process and store each question $count++; echo "

$count. ".stripslashes($question->questiontext)."

"; $question->category = $this->category->id; @@ -265,245 +265,245 @@ class quiz_file_format { return true; } - function deletedatabase($filename) { - if (! $this->fulldelete($filename)) { + function deletedatabase($filename) { + if (! $this->fulldelete($filename)) { echo "
Error: Could not delete: $filename"; return false; } - return true; - } + return true; + } - function getquestions($filename, $category, $mdapath="", $hostname="") { - if (($category == "allcategories") or ($category == "")) { - $sql = "SELECT * FROM TBQuestions"; - } else { - $sql = "SELECT * FROM TBQuestions where module = '".$category."'"; - } - if (PHP_OS == "WINNT") { - $ldb =& $this->connect_win($filename); - $qset = $ldb->Execute("$sql"); - if ( $qset->RecordCount() > 0 ) { - $records = $qset->GetAssoc(true); - } else { - $this->err("There were no records in the database.",$dsn); - $ldb->Close(); - return false; - } - $ldb->Close(); - } else { // if PHP_OS == WINNT - // we have a linux installation - $result = $this->query_linux($sql,$filename, $mdapath,$hostname); - if ( count($result) > 0 ) { - // get rid of the ID field in the first column. - for($i=0;$ierr("There were no records in the database.",$dsn); - $ldb->Close(); - return false; - } - // xml test and connect - } // PHP_OS TEST - return $records; - } + function getquestions($filename, $category, $mdapath="", $hostname="") { + if (($category == "allcategories") or ($category == "")) { + $sql = "SELECT * FROM TBQuestions"; + } else { + $sql = "SELECT * FROM TBQuestions where module = '".$category."'"; + } + if (PHP_OS == "WINNT") { + $ldb =& $this->connect_win($filename); + $qset = $ldb->Execute("$sql"); + if ( $qset->RecordCount() > 0 ) { + $records = $qset->GetAssoc(true); + } else { + $this->err("There were no records in the database.",$dsn); + $ldb->Close(); + return false; + } + $ldb->Close(); + } else { // if PHP_OS == WINNT + // we have a linux installation + $result = $this->query_linux($sql,$filename, $mdapath,$hostname); + if ( count($result) > 0 ) { + // get rid of the ID field in the first column. + for($i=0;$ierr("There were no records in the database.",$dsn); + $ldb->Close(); + return false; + } + // xml test and connect + } // PHP_OS TEST + return $records; + } function getquestioncategories($filename, $mdapath="", $hostname="") { global $CFG, $result; - $sql = "SELECT Distinct module FROM TBQuestions"; - if (PHP_OS == "WINNT") { - $ldb =& $this->connect_win($filename); - $qset = $ldb->Execute("$sql"); + $sql = "SELECT Distinct module FROM TBQuestions"; + if (PHP_OS == "WINNT") { + $ldb =& $this->connect_win($filename); + $qset = $ldb->Execute("$sql"); if ( $qset->RecordCount() > 0 ) { $records = $qset->GetArray(true); - foreach ($records as $record) { - $categories[$record[0]] = $record[0]; - } - } else { // if recordcount + foreach ($records as $record) { + $categories[$record[0]] = $record[0]; + } + } else { // if recordcount $this->err("There were no records in the database.",$dsn); - $ldb->Close(); - return false; - } - $ldb->Close(); - } else { // if PHP_OS == WINNT - // we have a linux installation - $result = $this->query_linux($sql, $filename, $mdapath, $hostname); - for($i=0;$iClose(); + return false; + } + $ldb->Close(); + } else { // if PHP_OS == WINNT + // we have a linux installation + $result = $this->query_linux($sql, $filename, $mdapath, $hostname); + for($i=0;$isHostName = $hostname; - $oTest->nPort = 9628; -// $oTest->sConnectionString="DRIVER=Microsoft Access Driver (*.mdb);SystemDB=C:\CTM\System.mda;DBQ=C:\CTM\of2K3\ctm.mdb;UID=Assess;PWD=VBMango;"; - $oTest->sConnectionString="DRIVER=Microsoft Access Driver (*.mdb);SystemDB=". - $mdapath.";DBQ=".$mdbpath.";UID=Assess;PWD=VBMango;"; - // send and receive XML communication - $qResult = $oTest->ExecSQL($sql); - // set up XML parser to read the results - $xml_parser = xml_parser_create("US-ASCII"); - xml_set_element_handler($xml_parser, "quiz_xmlstart", "quiz_xmlend"); + + function query_linux($sql, $mdbpath, $mdapath, $hostname) { + global $result; + include_once("odbcsocketserver.class.php"); + // set up socket server object to connect to remote host + $oTest = new ODBCSocketServer; + //Set the Hostname, port, and connection string + $oTest->sHostName = $hostname; + $oTest->nPort = 9628; +// $oTest->sConnectionString="DRIVER=Microsoft Access Driver (*.mdb);SystemDB=C:\CTM\System.mda;DBQ=C:\CTM\of2K3\ctm.mdb;UID=Assess;PWD=VBMango;"; + $oTest->sConnectionString="DRIVER=Microsoft Access Driver (*.mdb);SystemDB=". + $mdapath.";DBQ=".$mdbpath.";UID=Assess;PWD=VBMango;"; + // send and receive XML communication + $qResult = $oTest->ExecSQL($sql); + // set up XML parser to read the results + $xml_parser = xml_parser_create("US-ASCII"); + xml_set_element_handler($xml_parser, "quiz_xmlstart", "quiz_xmlend"); xml_set_character_data_handler($xml_parser, "quiz_xmldata"); // parse the XML and get back the result set array if (!xml_parse($xml_parser, $qResult)) { - $this->err("XML error: ".xml_error_string(xml_get_error_code($xml_parser)) - ." at line ".xml_get_current_line_number($xml_parser),$oTest->sConnectionString); - return false; - } else { -// echo("Successful XML parse. "); - // prepare the array for use in the pull-down -/* echo "
count of rows is ". count ($result); - echo "
\n";
-					$qResult = HtmlSpecialChars($qResult);
-					echo $qResult;
-					echo "\n
"; + $this->err("XML error: ".xml_error_string(xml_get_error_code($xml_parser)) + ." at line ".xml_get_current_line_number($xml_parser),$oTest->sConnectionString); + return false; + } else { +// echo("Successful XML parse. "); + // prepare the array for use in the pull-down +/* echo "
count of rows is ". count ($result); + echo "
\n";
+                    $qResult = HtmlSpecialChars($qResult);
+                    echo $qResult;
+                    echo "\n
"; */ - xml_parser_free($xml_parser); -// $sResult = HtmlSpecialChars($qResult); - //echo("
");
-//	echo($sResult);
-//	echo("
"); + xml_parser_free($xml_parser); +// $sResult = HtmlSpecialChars($qResult); + //echo("
");
+//  echo($sResult);
+//  echo("
"); - return $result; + return $result; + } } - } - function connect_win($filename) { - global $CFG, $systemdb; - // first, verify the location of System.mda - if (!isset($systemdb)) { - $systemdb=$this->findfile("System.mda"); - } - if (! $systemdb) { + function connect_win($filename) { + global $CFG, $systemdb; + // first, verify the location of System.mda + if (!isset($systemdb)) { + $systemdb=$this->findfile("System.mda"); + } + if (! $systemdb) { $this->err("The system database System.mda cannot be found. Check that you've uploaded it to the course.",$dsn); die; - } + } - $ldb = &ADONewConnection('access'); - $dsn="DRIVER=Microsoft Access Driver (*.mdb);SystemDB=".$systemdb.";DBQ=".$filename.";UID=Assess;PWD=VBMango;"; - $dbconnected = $ldb->Connect($dsn); - if (! $dbconnected) { + $ldb = &ADONewConnection('access'); + $dsn="DRIVER=Microsoft Access Driver (*.mdb);SystemDB=".$systemdb.";DBQ=".$filename.";UID=Assess;PWD=VBMango;"; + $dbconnected = $ldb->Connect($dsn); + if (! $dbconnected) { $this->err("Moodle could not connect to the database.",$dsn); die; - } - return $ldb; - } + } + return $ldb; + } function err($message, $dsn) { - echo ""; - echo "

Error: $message

"; - echo "

ODBC File DSN: $dsn
"; - echo ""; - } + echo ""; + echo "

Error: $message

"; + echo "

ODBC File DSN: $dsn
"; + echo ""; + } - function fulldelete($location) { - if (is_dir($location)) { - $currdir = opendir($location); - while ($file = readdir($currdir)) { - if ($file <> ".." && $file <> ".") { - $fullfile = $location."/".$file; - if (is_dir($fullfile)) { - if (!fulldelete($fullfile)) { - return false; - } - } else { - if (!unlink($fullfile)) { - return false; - } - } - } - } - closedir($currdir); - if (! rmdir($location)) { - return false; - } - - } else { - if (!unlink($location)) { - return false; - } - } - return true; - } + function fulldelete($location) { + if (is_dir($location)) { + $currdir = opendir($location); + while ($file = readdir($currdir)) { + if ($file <> ".." && $file <> ".") { + $fullfile = $location."/".$file; + if (is_dir($fullfile)) { + if (!fulldelete($fullfile)) { + return false; + } + } else { + if (!unlink($fullfile)) { + return false; + } + } + } + } + closedir($currdir); + if (! rmdir($location)) { + return false; + } + + } else { + if (!unlink($location)) { + return false; + } + } + return true; + } - function findfile($filename) { - global $CFG; - $dirs = $this->getcoursedirs(); - $dirs[] = $CFG->dirroot."\mod\quiz\format"; - foreach ($dirs as $dir) { - $file = $dir . "\System.mda"; - // look for System.mda - if (is_file($file)) return $file; - } - return false; + function findfile($filename) { + global $CFG; + $dirs = $this->getcoursedirs(); + $dirs[] = $CFG->dirroot."\mod\quiz\format"; + foreach ($dirs as $dir) { + $file = $dir . "\System.mda"; + // look for System.mda + if (is_file($file)) return $file; + } + return false; } function getcoursedirs() { - global $CFG; - // for every course in the system, find the root of the data directory - $courses = get_records_sql("select distinct id,fullname from ".$CFG->prefix."course"); - $dirs = array(); - if ($courses) { - foreach ($courses as $course) { - $dir = $CFG->dataroot . "/" . $course->id; - if (is_dir($dir)) { $dirs[] = $dir; } - } - } - return $dirs; + global $CFG; + // for every course in the system, find the root of the data directory + $courses = get_records_sql("select distinct id,fullname from ".$CFG->prefix."course"); + $dirs = array(); + if ($courses) { + foreach ($courses as $course) { + $dir = $CFG->dataroot . "/" . $course->id; + if (is_dir($dir)) { $dirs[] = $dir; } + } + } + return $dirs; } } // END OF CLASS - //Handler for starting elements - function quiz_xmlstart($parser, $name, $attribs) { - global $result,$row, $col, $incolumn; - $name = strtolower($name); - switch ($name) { - case "row": + //Handler for starting elements + function quiz_xmlstart($parser, $name, $attribs) { + global $result,$row, $col, $incolumn; + $name = strtolower($name); + switch ($name) { + case "row": $col=0;break; - case "column": - $incolumn = 1;break; - case "error": + case "column": + $incolumn = 1;break; + case "error": break; - case "result": - $row = 0; break; - } // switch - } + case "result": + $row = 0; break; + } // switch + } - //handler for the end of elements - function quiz_xmlend($parser, $name) { - global $result, $row, $col, $incolumn; - $name = strtolower($name); - switch ($name) { - case "row": + //handler for the end of elements + function quiz_xmlend($parser, $name) { + global $result, $row, $col, $incolumn; + $name = strtolower($name); + switch ($name) { + case "row": $row++;break; - case "column": - $incolumn = 0; + case "column": + $incolumn = 0; $col++; break; - case "error": + case "error": break; - case "result": + case "result": break; - } // switch - } // function + } // switch + } // function - //handler for character data - function quiz_xmldata($parser, $data) { - global $result, $row, $col, $incolumn; - if ($incolumn) { $result[$row][$col] = $result[$row][$col] . $data; - } - } + //handler for character data + function quiz_xmldata($parser, $data) { + global $result, $row, $col, $incolumn; + if ($incolumn) { $result[$row][$col] = $result[$row][$col] . $data; + } + } ?> diff --git a/mod/quiz/import.php b/mod/quiz/import.php index b5a60412dcf..90bdccedd69 100644 --- a/mod/quiz/import.php +++ b/mod/quiz/import.php @@ -34,13 +34,13 @@ if ($form = data_submitted()) { /// Filename if (isset($form->filename)) { // file already on server - $newfile['tmp_name'] = $form->filename; + $newfile['tmp_name'] = $form->filename; $newfile['size'] = filesize($form->filename); - + } else if (!empty($_FILES['newfile'])) { // file was just uploaded require_once($CFG->dirroot.'/lib/uploadlib.php'); $um = new upload_manager('newfile',false,false,$course,false,0,false); - if ($um->preprocess_files()) { // validate and virus check! + if ($um->preprocess_files()) { // validate and virus check! $newfile = $_FILES['newfile']; } } @@ -59,17 +59,17 @@ $format = new quiz_file_format(); if (! $format->importpreprocess($category)) { // Do anything before that we need to - error("Error occurred during pre-processing!", + error("Error occurred during pre-processing!", "$CFG->wwwroot/mod/quiz/import.php?category=$category->id"); } if (! $format->importprocess($newfile['tmp_name'])) { // Process the uploaded file - error("Error occurred during processing!", + error("Error occurred during processing!", "$CFG->wwwroot/mod/quiz/import.php?category=$category->id"); } if (! $format->importpostprocess()) { // In case anything needs to be done after - error("Error occurred during post-processing!", + error("Error occurred during post-processing!", "$CFG->wwwroot/mod/quiz/import.php?category=$category->id"); } @@ -78,7 +78,7 @@ print_footer($course); exit; } - } + } /// Print upload form @@ -100,7 +100,7 @@ print_heading_with_help($strimportquestions, "import", "quiz"); - print_simple_box_start("center", "", "$THEME->cellheading"); + print_simple_box_start("center"); echo "

"; echo ""; diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php index b4b08143f79..72fad5b9fee 100644 --- a/mod/quiz/lib.php +++ b/mod/quiz/lib.php @@ -20,7 +20,7 @@ function quiz_add_instance($quiz) { $quiz->openhour, $quiz->openminute, 0); $quiz->timeclose = make_timestamp($quiz->closeyear, $quiz->closemonth, $quiz->closeday, $quiz->closehour, $quiz->closeminute, 0); - + if (empty($quiz->name)) { if (empty($quiz->intro)) { $quiz->name = get_string('modulename', 'quiz'); @@ -33,7 +33,7 @@ function quiz_add_instance($quiz) { if (!$quiz->id = insert_record("quiz", $quiz)) { return false; // some error occurred } - + if (isset($quiz->optionsettingspref)) { set_user_preference('quiz_optionsettingspref', $quiz->optionsettingspref); } @@ -102,7 +102,7 @@ function quiz_update_instance($quiz) { delete_event($event->id); } } - + unset($event); $event->description = $quiz->intro; $event->courseid = $quiz->course; @@ -420,11 +420,11 @@ function quiz_get_recent_mod_activity(&$activities, &$index, $sincetime, $course function quiz_print_recent_mod_activity($activity, $course, $detail=false) { - global $CFG, $THEME; + global $CFG echo '
'; - echo "cellcontent\">"; + echo ""; echo ""; echo "\n"; echo "
cellcontent2\" class=\"forumpostpicture\" width=\"35\" valign=\"top\">"; + echo "
"; print_user_picture($activity->user->userid, $course, $activity->user->picture); echo ""; diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php index 4917fa585c1..614824c0698 100644 --- a/mod/quiz/locallib.php +++ b/mod/quiz/locallib.php @@ -344,7 +344,7 @@ class quiz_default_questiontype { // No options by default return false; - } + } } quiz_load_questiontypes(); @@ -386,7 +386,7 @@ function quiz_get_question_grades($quizid, $questionlist) { } function quiz_questiongrades_update($grades, $quizid) { - // this is called from edit.php to store changes to the question grades + // this is called from edit.php to store changes to the question grades // in the quiz_question_grades table. It does not update 'sumgrades' in the quiz table. $existing = get_records("quiz_question_grades", "quiz", $quizid, "", "question,grade,id"); foreach ($grades as $question => $grade) { @@ -432,7 +432,7 @@ function quiz_get_attempt_questions($quiz, $attempt, $attempting = false) { /// Returns the questions of the quiz attempt in a format used for /// grading and printing them... /// - /// $attempting should be set to true if this function is called in + /// $attempting should be set to true if this function is called in /// order to create an attempt page and false if it is called to create /// a review page. /// @@ -617,14 +617,10 @@ function quiz_extract_posted_id($name, $nameprefix='question') { } function quiz_print_comment($text) { - global $THEME; - echo "".format_text($text, true, false).""; } function quiz_print_correctanswer($text) { - global $THEME; - echo "

$text

"; } @@ -1142,7 +1138,7 @@ function quiz_print_question_list($questionlist, $grades) { // $questionlist is comma-separated list // $grades is an array of corresponding grades - global $THEME, $USER; + global $USER; if (!$questionlist) { echo "

"; @@ -1186,7 +1182,7 @@ function quiz_print_question_list($questionlist, $grades) { $question = $questions[$qnum]; $canedit = isteacheredit($question->course); $count++; - echo "

$count"; if ($count != 1) { @@ -1228,7 +1224,7 @@ function quiz_print_question_list($questionlist, $grades) { echo "
\n"; echo "\n"; echo "\n"; - echo "cellcontent\">\n"; + echo "\n"; echo "$sumgrade"; echo "\n
\n"; @@ -1241,7 +1237,7 @@ function quiz_print_question_list($questionlist, $grades) { function quiz_print_cat_question_list($categoryid, $quizselected=true, $recurse=1, $page, $perpage) { // Prints the table of questions in a category with interactions - global $THEME, $QUIZ_QUESTION_TYPE, $USER; + global $QUIZ_QUESTION_TYPE, $USER; $strcategory = get_string("category", "quiz"); $strquestion = get_string("question", "quiz"); @@ -1339,7 +1335,7 @@ function quiz_print_cat_question_list($categoryid, $quizselected=true, $recurse= if ($question->qtype == RANDOM) { //continue; } - echo "cellcontent\">\n"; + echo "\n"; if ($quizselected) { echo ""; echo "id\" value=\"1\" />\n"; diff --git a/mod/quiz/multiple.php b/mod/quiz/multiple.php index 411771f546f..bdee00bce10 100644 --- a/mod/quiz/multiple.php +++ b/mod/quiz/multiple.php @@ -34,7 +34,7 @@ if ($form = data_submitted() and confirm_sesskey()) { if ($form->randomcreate > 0) { $newquestionids = array(); // this will hold the ids of the random questions - + // find existing random questions in this category $random = RANDOM; if ($existingquestions = get_records_select('quiz_questions', "qtype = '$random' AND category = '$category->id'")) { @@ -47,7 +47,7 @@ // now take as many of these as needed $i = 0; while (($existingquestion = array_pop($existingquestions)) and ($i < $form->randomcreate)) { - if ($existingquestion->questiontext == "$form->recurse") { + if ($existingquestion->questiontext == "$form->recurse") { // this question has the right recurse property, so use it $newquestionids[] = $existingquestion->id; $i++; @@ -63,7 +63,7 @@ $question->qtype = RANDOM; $question->category = $category->id; $question->name = get_string('random', 'quiz') .' ('. $category->name .')'; - $question->questiontext = "$form->recurse"; // we use the questiontext field to store the info + $question->questiontext = "$form->recurse"; // we use the questiontext field to store the info // on whether to include questions in subcategories $question->image = ''; $question->defaultgrade = $form->randomgrade; @@ -136,7 +136,7 @@ $options[0] = get_string('no'); $options[1] = get_string('yes'); - print_simple_box_start('center', '', $THEME->cellheading); + print_simple_box_start('center'); echo ''; echo "sesskey\">"; echo ''; diff --git a/mod/quiz/questiontypes/datasetdependent/categorydatasetdefinitions.php b/mod/quiz/questiontypes/datasetdependent/categorydatasetdefinitions.php index cef314e4364..f63b6ae84a0 100644 --- a/mod/quiz/questiontypes/datasetdependent/categorydatasetdefinitions.php +++ b/mod/quiz/questiontypes/datasetdependent/categorydatasetdefinitions.php @@ -41,7 +41,7 @@ $definition->name = $name; $definition->id = $form->id[$key]; $definition->type = $form->type[$key]; - + if ($definition->id) { if (!update_record('quiz_dataset_definitions', $definition)) { notify("Could not update dataset item definition"); @@ -67,13 +67,13 @@ print_heading_with_help($strdefinedataset, "datasets", "quiz"); - print_simple_box_start("center", "", "$THEME->cellheading"); + print_simple_box_start("center"); echo ""; echo "id\" />"; if ($question) { echo ""; } - + echo "
"; $definitions = get_records('quiz_dataset_definitions',