diff --git a/classes/moodlefilecache.php b/classes/moodlefilecache.php index e0ca4ec2..f2bc69c7 100644 --- a/classes/moodlefilecache.php +++ b/classes/moodlefilecache.php @@ -29,6 +29,8 @@ class moodlefilecache { private $cache; + public $area; + public $module; /** * Constructores for WIRIS file cache. @@ -36,6 +38,8 @@ class moodlefilecache { * @param String $module cache definition. */ public function __construct($area, $module) { + $this->area = $area; + $this->module = $module; $this->cache = cache::make($area, $module); } @@ -55,7 +59,7 @@ public function delete($key) { public function deleteAll() { // @codingStandardsIgnoreEnd if (!$this->cache->purgue()) { - throw new moodle_exception('Error deleting cache on ' . $this->area . ' area', $this->module); + throw new moodle_exception(get_string('errordeletingcache', 'filter_wiris', $this->area), $this->module); } } @@ -81,7 +85,7 @@ public function get($key) { */ public function set($key, $value) { if (!$this->cache->set($key, $value)) { - throw new moodle_exception('Error saving cache on ' . $this->area . ' area', $this->module); + throw new moodle_exception(get_string('errorsavingcache', 'filter_wiris', $this->area), $this->module); } } } diff --git a/info.php b/info.php index 82b1d043..ade6ab29 100644 --- a/info.php +++ b/info.php @@ -90,8 +90,8 @@ function wrs_createtablerow($testname, $reporttext, $solutionlink, $condition) { $plugin = new stdClass(); require_once($CFG->dirroot . '/question/type/wq/version.php'); -if (isset($plugin->version)) { - $version = $plugin->version; +if (isset($plugin->release)) { + $version = $plugin->release; $reporttext = get_string('info_test1_rt1', 'qtype_wq') . $version; $condition = true; } else { @@ -112,8 +112,8 @@ function wrs_createtablerow($testname, $reporttext, $solutionlink, $condition) { require_once($CFG->dirroot . '/filter/wiris/version.php'); $plugininfo = get_string('info_test2_info', 'qtype_wq') . '' . get_string('info_test2_infopage', 'qtype_wq') . ''; -if (isset($plugin->version)) { - $version = $plugin->version; +if (isset($plugin->release)) { + $version = $plugin->release; if ($version >= '3.17.20') { $reporttext = get_string('info_test2_rt1', 'qtype_wq') . ' ' . $plugininfo; $condition = true; diff --git a/lang/ca/qtype_wq.php b/lang/ca/qtype_wq.php index 78fe48b1..258e8756 100644 --- a/lang/ca/qtype_wq.php +++ b/lang/ca/qtype_wq.php @@ -14,5 +14,64 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -$string['wq'] = 'Matemàtiques i Ciències - WIRIS'; -$string['pluginname'] = 'Matemàtiques i Ciències - WIRIS'; +$string['wq'] = 'Matemàtiques i Ciències - WIRIS';; +$string['pluginname'] = 'Matemàtiques i Ciències - WIRIS';; +$string['pluginnamesummary'] = ''; +$string['wq_help'] = 'Generic WIRIS quizzes Help'; +$string['editingwq'] = 'Editing a generic WIRIS question'; +$string['addingwq'] = 'Adding a generic WIRIS question'; +$string['cachedef_images'] = "WIRIS Quizzes images."; +$string['error'] = 'ERROR'; +$string['info_maintitle'] = "Moodle 2.x WIRIS quizzes test page"; +$string['info_tableheader_test'] = "Test"; +$string['info_tableheader_report'] = "Report"; +$string['info_tableheader_status'] = "Status"; +$string['info_disabled'] = "DISABLED"; +$string['info_enabled'] = "ENABLED"; +$string['info_enabled'] = "ENABLED"; +$string['info_information'] = "For more information or if you have any doubt contact WIRIS Support:"; +$string['info_test1_name'] = "WIRIS quizzes version"; +$string['info_test1_rt1'] = "WIRIS quizzes version is "; +$string['info_test1_rt2'] = "Impossible to find WIRIS quizzes version."; +$string['info_test2_name'] = "WIRIS plugin version"; +$string['info_test2_info'] = "Check WIRIS plugin "; +$string['info_test2_infopage'] = "info page"; +$string['info_test2_rt1'] = "WIRIS plugin is properly installed."; +$string['info_test2_rt2'] = "WIRIS quizzes requires WIRIS plugin 3.17.20 or greater. Your version is"; +$string['info_test2_rt3'] = "Impossible to find WIRIS plugin version file."; +$string['info_test3_name'] = "Moodle version"; +$string['info_test3_rt1'] = "Your moodle version is sufficiently new."; +$string['info_test3_rt2'] = "Your Moodle version is %s. WIRIS quizzes could not work correctly with Moodle version prior to 2011060313"; +$string['info_test3_rt3'] = "Impossible to find Moodle version file."; +$string['info_test4_name'] = "Plugins"; +$string['info_test4_pluginname1'] = "True/False question type"; +$string['info_test4_pluginname2'] = "Short-Answer question type"; +$string['info_test4_pluginname3'] = "Embedded answer (Cloze) question type"; +$string['info_test4_pluginname4'] = "Multi Choice question type"; +$string['info_test4_pluginname5'] = "Matching question type"; +$string['info_test4_pluginname6'] = "Essay question type"; +$string['info_test4_pluginname7'] = "Commons question type"; +$string['info_test4_rt1'] = "The following WIRIS question plugins are installed:"; +$string['info_test4_rt2'] = "The following WIRIS question plugins are missing:"; +$string['info_test4_rt3'] = "Install"; +$string['info_test5_name'] = "Database"; +$string['info_test5_rt1'] = "All WIRIS tables are present."; +$string['info_test5_rt2'] = "One or more of WIRIS tables are missing."; +$string['info_test6_name'] = "WIRIS quizzes"; +$string['info_test7_name'] = "Checking WIRIS configuration"; +$string['info_test8_name'] = "Checking if WIRIS server is reachable"; +$string['info_test8_rt1'] = "Connecting to %s at port %s"; +$string['info_test9_name'] = "WIRIS quizzes service"; +$string['info_test10_name'] = "Checking WIRIS quizzes functionality (variable)"; +$string['info_test11_name'] = "Checking WIRIS quizzes functionality (plot)"; +$string['info_test12_name'] = "Max server connections"; +$string['info_test12_rt1'] = "There are currently %s active concurrent connections out of a maximum of %s. Greatest number of concurrent connections is %s."; +$string['info_test12_rt2'] = "Error with the maximum connections security system. See details: 
%s
%s
"; +$string['ok'] = 'OK'; +$string['proxyurl'] = 'PROXY_URL:'; +$string['cachedir'] = 'CACHE_DIR:'; +$string['serviceurl'] = 'SERVICE_URL:'; +$string['wqsummary'] = 'This adds a generic WIRIS question. Only for test purpose. It will be hide from here.'; +$string['wirisquestionincorrect'] = 'Sorry! The system can not generate one of the questions of the quiz.
Maybe there is a temporary connection problem right now.
Maybe the question algorithm has a bug, and fails sometimes.
Maybe it will fail always.
Don\'t panic...
You can retry the quiz, without penalty, just clicking Continue.
You can also tell the Teachers that there is an issue with the question titled: \'{$a->questionname}\''; +$string['wirisquizzeserror'] = 'Sorry! There was an error in WIRIS quizzes.'; +$string['failedtoloadwirisquizzesfromxml'] = 'Failed to load WIRIS quizzes XML definition for question id'; diff --git a/lang/de/qtype_wq.php b/lang/de/qtype_wq.php index 04ee607d..2afcdbe4 100644 --- a/lang/de/qtype_wq.php +++ b/lang/de/qtype_wq.php @@ -14,5 +14,64 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -$string['wq'] = 'Mathematik und Naturwissenschaften von WIRIS'; -$string['pluginname'] = 'Mathematik und Naturwissenschaften von WIRIS'; +$string['wq'] = 'Mathematik und Naturwissenschaften von WIRIS';; +$string['pluginname'] = 'Mathematik und Naturwissenschaften von WIRIS';; +$string['pluginnamesummary'] = ''; +$string['wq_help'] = 'Generic WIRIS quizzes Help'; +$string['editingwq'] = 'Editing a generic WIRIS question'; +$string['addingwq'] = 'Adding a generic WIRIS question'; +$string['cachedef_images'] = "WIRIS Quizzes images."; +$string['error'] = 'ERROR'; +$string['info_maintitle'] = "Moodle 2.x WIRIS quizzes test page"; +$string['info_tableheader_test'] = "Test"; +$string['info_tableheader_report'] = "Report"; +$string['info_tableheader_status'] = "Status"; +$string['info_disabled'] = "DISABLED"; +$string['info_enabled'] = "ENABLED"; +$string['info_enabled'] = "ENABLED"; +$string['info_information'] = "For more information or if you have any doubt contact WIRIS Support:"; +$string['info_test1_name'] = "WIRIS quizzes version"; +$string['info_test1_rt1'] = "WIRIS quizzes version is "; +$string['info_test1_rt2'] = "Impossible to find WIRIS quizzes version."; +$string['info_test2_name'] = "WIRIS plugin version"; +$string['info_test2_info'] = "Check WIRIS plugin "; +$string['info_test2_infopage'] = "info page"; +$string['info_test2_rt1'] = "WIRIS plugin is properly installed."; +$string['info_test2_rt2'] = "WIRIS quizzes requires WIRIS plugin 3.17.20 or greater. Your version is"; +$string['info_test2_rt3'] = "Impossible to find WIRIS plugin version file."; +$string['info_test3_name'] = "Moodle version"; +$string['info_test3_rt1'] = "Your moodle version is sufficiently new."; +$string['info_test3_rt2'] = "Your Moodle version is %s. WIRIS quizzes could not work correctly with Moodle version prior to 2011060313"; +$string['info_test3_rt3'] = "Impossible to find Moodle version file."; +$string['info_test4_name'] = "Plugins"; +$string['info_test4_pluginname1'] = "True/False question type"; +$string['info_test4_pluginname2'] = "Short-Answer question type"; +$string['info_test4_pluginname3'] = "Embedded answer (Cloze) question type"; +$string['info_test4_pluginname4'] = "Multi Choice question type"; +$string['info_test4_pluginname5'] = "Matching question type"; +$string['info_test4_pluginname6'] = "Essay question type"; +$string['info_test4_pluginname7'] = "Commons question type"; +$string['info_test4_rt1'] = "The following WIRIS question plugins are installed:"; +$string['info_test4_rt2'] = "The following WIRIS question plugins are missing:"; +$string['info_test4_rt3'] = "Install"; +$string['info_test5_name'] = "Database"; +$string['info_test5_rt1'] = "All WIRIS tables are present."; +$string['info_test5_rt2'] = "One or more of WIRIS tables are missing."; +$string['info_test6_name'] = "WIRIS quizzes"; +$string['info_test7_name'] = "Checking WIRIS configuration"; +$string['info_test8_name'] = "Checking if WIRIS server is reachable"; +$string['info_test8_rt1'] = "Connecting to %s at port %s"; +$string['info_test9_name'] = "WIRIS quizzes service"; +$string['info_test10_name'] = "Checking WIRIS quizzes functionality (variable)"; +$string['info_test11_name'] = "Checking WIRIS quizzes functionality (plot)"; +$string['info_test12_name'] = "Max server connections"; +$string['info_test12_rt1'] = "There are currently %s active concurrent connections out of a maximum of %s. Greatest number of concurrent connections is %s."; +$string['info_test12_rt2'] = "Error with the maximum connections security system. See details: 
%s
%s
"; +$string['ok'] = 'OK'; +$string['proxyurl'] = 'PROXY_URL:'; +$string['cachedir'] = 'CACHE_DIR:'; +$string['serviceurl'] = 'SERVICE_URL:'; +$string['wqsummary'] = 'This adds a generic WIRIS question. Only for test purpose. It will be hide from here.'; +$string['wirisquestionincorrect'] = 'Sorry! The system can not generate one of the questions of the quiz.
Maybe there is a temporary connection problem right now.
Maybe the question algorithm has a bug, and fails sometimes.
Maybe it will fail always.
Don\'t panic...
You can retry the quiz, without penalty, just clicking Continue.
You can also tell the Teachers that there is an issue with the question titled: \'{$a->questionname}\''; +$string['wirisquizzeserror'] = 'Sorry! There was an error in WIRIS quizzes.'; +$string['failedtoloadwirisquizzesfromxml'] = 'Failed to load WIRIS quizzes XML definition for question id'; diff --git a/lang/el/qtype_wq.php b/lang/el/qtype_wq.php index 3f780afb..1328c228 100644 --- a/lang/el/qtype_wq.php +++ b/lang/el/qtype_wq.php @@ -14,5 +14,64 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -$string['wq'] = 'Μαθηματικά και επιστήμη από τη WIRIS'; -$string['pluginname'] = 'Μαθηματικά και επιστήμη από τη WIRIS'; +$string['wq'] = 'Μαθηματικά και επιστήμη από τη WIRIS';; +$string['pluginname'] = 'Μαθηματικά και επιστήμη από τη WIRIS';; +$string['pluginnamesummary'] = ''; +$string['wq_help'] = 'Generic WIRIS quizzes Help'; +$string['editingwq'] = 'Editing a generic WIRIS question'; +$string['addingwq'] = 'Adding a generic WIRIS question'; +$string['cachedef_images'] = "WIRIS Quizzes images."; +$string['error'] = 'ERROR'; +$string['info_maintitle'] = "Moodle 2.x WIRIS quizzes test page"; +$string['info_tableheader_test'] = "Test"; +$string['info_tableheader_report'] = "Report"; +$string['info_tableheader_status'] = "Status"; +$string['info_disabled'] = "DISABLED"; +$string['info_enabled'] = "ENABLED"; +$string['info_enabled'] = "ENABLED"; +$string['info_information'] = "For more information or if you have any doubt contact WIRIS Support:"; +$string['info_test1_name'] = "WIRIS quizzes version"; +$string['info_test1_rt1'] = "WIRIS quizzes version is "; +$string['info_test1_rt2'] = "Impossible to find WIRIS quizzes version."; +$string['info_test2_name'] = "WIRIS plugin version"; +$string['info_test2_info'] = "Check WIRIS plugin "; +$string['info_test2_infopage'] = "info page"; +$string['info_test2_rt1'] = "WIRIS plugin is properly installed."; +$string['info_test2_rt2'] = "WIRIS quizzes requires WIRIS plugin 3.17.20 or greater. Your version is"; +$string['info_test2_rt3'] = "Impossible to find WIRIS plugin version file."; +$string['info_test3_name'] = "Moodle version"; +$string['info_test3_rt1'] = "Your moodle version is sufficiently new."; +$string['info_test3_rt2'] = "Your Moodle version is %s. WIRIS quizzes could not work correctly with Moodle version prior to 2011060313"; +$string['info_test3_rt3'] = "Impossible to find Moodle version file."; +$string['info_test4_name'] = "Plugins"; +$string['info_test4_pluginname1'] = "True/False question type"; +$string['info_test4_pluginname2'] = "Short-Answer question type"; +$string['info_test4_pluginname3'] = "Embedded answer (Cloze) question type"; +$string['info_test4_pluginname4'] = "Multi Choice question type"; +$string['info_test4_pluginname5'] = "Matching question type"; +$string['info_test4_pluginname6'] = "Essay question type"; +$string['info_test4_pluginname7'] = "Commons question type"; +$string['info_test4_rt1'] = "The following WIRIS question plugins are installed:"; +$string['info_test4_rt2'] = "The following WIRIS question plugins are missing:"; +$string['info_test4_rt3'] = "Install"; +$string['info_test5_name'] = "Database"; +$string['info_test5_rt1'] = "All WIRIS tables are present."; +$string['info_test5_rt2'] = "One or more of WIRIS tables are missing."; +$string['info_test6_name'] = "WIRIS quizzes"; +$string['info_test7_name'] = "Checking WIRIS configuration"; +$string['info_test8_name'] = "Checking if WIRIS server is reachable"; +$string['info_test8_rt1'] = "Connecting to %s at port %s"; +$string['info_test9_name'] = "WIRIS quizzes service"; +$string['info_test10_name'] = "Checking WIRIS quizzes functionality (variable)"; +$string['info_test11_name'] = "Checking WIRIS quizzes functionality (plot)"; +$string['info_test12_name'] = "Max server connections"; +$string['info_test12_rt1'] = "There are currently %s active concurrent connections out of a maximum of %s. Greatest number of concurrent connections is %s."; +$string['info_test12_rt2'] = "Error with the maximum connections security system. See details: 
%s
%s
"; +$string['ok'] = 'OK'; +$string['proxyurl'] = 'PROXY_URL:'; +$string['cachedir'] = 'CACHE_DIR:'; +$string['serviceurl'] = 'SERVICE_URL:'; +$string['wqsummary'] = 'This adds a generic WIRIS question. Only for test purpose. It will be hide from here.'; +$string['wirisquestionincorrect'] = 'Sorry! The system can not generate one of the questions of the quiz.
Maybe there is a temporary connection problem right now.
Maybe the question algorithm has a bug, and fails sometimes.
Maybe it will fail always.
Don\'t panic...
You can retry the quiz, without penalty, just clicking Continue.
You can also tell the Teachers that there is an issue with the question titled: \'{$a->questionname}\''; +$string['wirisquizzeserror'] = 'Sorry! There was an error in WIRIS quizzes.'; +$string['failedtoloadwirisquizzesfromxml'] = 'Failed to load WIRIS quizzes XML definition for question id'; diff --git a/lang/en/qtype_wq.php b/lang/en/qtype_wq.php index 23ae935b..ee141f35 100644 --- a/lang/en/qtype_wq.php +++ b/lang/en/qtype_wq.php @@ -14,15 +14,14 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -$string['wq'] = 'Math & Science by WIRIS'; -$string['pluginname'] = 'Math & Science by WIRIS';$string['pluginnamesummary'] = ''; +$string['wq'] = 'Math & Science by WIRIS';; +$string['pluginname'] = 'Math & Science by WIRIS';; +$string['pluginnamesummary'] = ''; $string['wq_help'] = 'Generic WIRIS quizzes Help'; $string['editingwq'] = 'Editing a generic WIRIS question'; $string['addingwq'] = 'Adding a generic WIRIS question'; -$string['wqsummary'] = 'This adds a generic WIRIS question. Only for test purpose. It will be hide from here.'; -$string['wirisquestionincorrect'] = 'Sorry! The system can not generate one of the questions of the quiz.
Maybe there is a temporary connection problem right now.
Maybe the question algorithm has a bug, and fails sometimes.
Maybe it will fail always.
Don\'t panic...
You can retry the quiz, without penalty, just clicking Continue.
You can also tell the Teachers that there is an issue with the question titled: \'{$a->questionname}\''; -$string['wirisquizzeserror'] = 'Sorry! There was an error in WIRIS quizzes.'; $string['cachedef_images'] = "WIRIS Quizzes images."; +$string['error'] = 'ERROR'; $string['info_maintitle'] = "Moodle 2.x WIRIS quizzes test page"; $string['info_tableheader_test'] = "Test"; $string['info_tableheader_report'] = "Report"; @@ -68,3 +67,11 @@ $string['info_test12_name'] = "Max server connections"; $string['info_test12_rt1'] = "There are currently %s active concurrent connections out of a maximum of %s. Greatest number of concurrent connections is %s."; $string['info_test12_rt2'] = "Error with the maximum connections security system. See details: 
%s
%s
"; +$string['ok'] = 'OK'; +$string['proxyurl'] = 'PROXY_URL:'; +$string['cachedir'] = 'CACHE_DIR:'; +$string['serviceurl'] = 'SERVICE_URL:'; +$string['wqsummary'] = 'This adds a generic WIRIS question. Only for test purpose. It will be hide from here.'; +$string['wirisquestionincorrect'] = 'Sorry! The system can not generate one of the questions of the quiz.
Maybe there is a temporary connection problem right now.
Maybe the question algorithm has a bug, and fails sometimes.
Maybe it will fail always.
Don\'t panic...
You can retry the quiz, without penalty, just clicking Continue.
You can also tell the Teachers that there is an issue with the question titled: \'{$a->questionname}\''; +$string['wirisquizzeserror'] = 'Sorry! There was an error in WIRIS quizzes.'; +$string['failedtoloadwirisquizzesfromxml'] = 'Failed to load WIRIS quizzes XML definition for question id'; diff --git a/lang/es/qtype_wq.php b/lang/es/qtype_wq.php index 6ceb589f..5a31b487 100644 --- a/lang/es/qtype_wq.php +++ b/lang/es/qtype_wq.php @@ -14,5 +14,64 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -$string['wq'] = 'Matemáticas y Ciencias - WIRIS'; -$string['pluginname'] = 'Matemáticas y Ciencias - WIRIS'; +$string['wq'] = 'Matemáticas y Ciencias - WIRIS';; +$string['pluginname'] = 'Matemáticas y Ciencias - WIRIS';; +$string['pluginnamesummary'] = ''; +$string['wq_help'] = 'Generic WIRIS quizzes Help'; +$string['editingwq'] = 'Editing a generic WIRIS question'; +$string['addingwq'] = 'Adding a generic WIRIS question'; +$string['cachedef_images'] = "WIRIS Quizzes images."; +$string['error'] = 'ERROR'; +$string['info_maintitle'] = "Moodle 2.x WIRIS quizzes test page"; +$string['info_tableheader_test'] = "Test"; +$string['info_tableheader_report'] = "Report"; +$string['info_tableheader_status'] = "Status"; +$string['info_disabled'] = "DISABLED"; +$string['info_enabled'] = "ENABLED"; +$string['info_enabled'] = "ENABLED"; +$string['info_information'] = "For more information or if you have any doubt contact WIRIS Support:"; +$string['info_test1_name'] = "WIRIS quizzes version"; +$string['info_test1_rt1'] = "WIRIS quizzes version is "; +$string['info_test1_rt2'] = "Impossible to find WIRIS quizzes version."; +$string['info_test2_name'] = "WIRIS plugin version"; +$string['info_test2_info'] = "Check WIRIS plugin "; +$string['info_test2_infopage'] = "info page"; +$string['info_test2_rt1'] = "WIRIS plugin is properly installed."; +$string['info_test2_rt2'] = "WIRIS quizzes requires WIRIS plugin 3.17.20 or greater. Your version is"; +$string['info_test2_rt3'] = "Impossible to find WIRIS plugin version file."; +$string['info_test3_name'] = "Moodle version"; +$string['info_test3_rt1'] = "Your moodle version is sufficiently new."; +$string['info_test3_rt2'] = "Your Moodle version is %s. WIRIS quizzes could not work correctly with Moodle version prior to 2011060313"; +$string['info_test3_rt3'] = "Impossible to find Moodle version file."; +$string['info_test4_name'] = "Plugins"; +$string['info_test4_pluginname1'] = "True/False question type"; +$string['info_test4_pluginname2'] = "Short-Answer question type"; +$string['info_test4_pluginname3'] = "Embedded answer (Cloze) question type"; +$string['info_test4_pluginname4'] = "Multi Choice question type"; +$string['info_test4_pluginname5'] = "Matching question type"; +$string['info_test4_pluginname6'] = "Essay question type"; +$string['info_test4_pluginname7'] = "Commons question type"; +$string['info_test4_rt1'] = "The following WIRIS question plugins are installed:"; +$string['info_test4_rt2'] = "The following WIRIS question plugins are missing:"; +$string['info_test4_rt3'] = "Install"; +$string['info_test5_name'] = "Database"; +$string['info_test5_rt1'] = "All WIRIS tables are present."; +$string['info_test5_rt2'] = "One or more of WIRIS tables are missing."; +$string['info_test6_name'] = "WIRIS quizzes"; +$string['info_test7_name'] = "Checking WIRIS configuration"; +$string['info_test8_name'] = "Checking if WIRIS server is reachable"; +$string['info_test8_rt1'] = "Connecting to %s at port %s"; +$string['info_test9_name'] = "WIRIS quizzes service"; +$string['info_test10_name'] = "Checking WIRIS quizzes functionality (variable)"; +$string['info_test11_name'] = "Checking WIRIS quizzes functionality (plot)"; +$string['info_test12_name'] = "Max server connections"; +$string['info_test12_rt1'] = "There are currently %s active concurrent connections out of a maximum of %s. Greatest number of concurrent connections is %s."; +$string['info_test12_rt2'] = "Error with the maximum connections security system. See details: 
%s
%s
"; +$string['ok'] = 'OK'; +$string['proxyurl'] = 'PROXY_URL:'; +$string['cachedir'] = 'CACHE_DIR:'; +$string['serviceurl'] = 'SERVICE_URL:'; +$string['wqsummary'] = 'This adds a generic WIRIS question. Only for test purpose. It will be hide from here.'; +$string['wirisquestionincorrect'] = 'Sorry! The system can not generate one of the questions of the quiz.
Maybe there is a temporary connection problem right now.
Maybe the question algorithm has a bug, and fails sometimes.
Maybe it will fail always.
Don\'t panic...
You can retry the quiz, without penalty, just clicking Continue.
You can also tell the Teachers that there is an issue with the question titled: \'{$a->questionname}\''; +$string['wirisquizzeserror'] = 'Sorry! There was an error in WIRIS quizzes.'; +$string['failedtoloadwirisquizzesfromxml'] = 'Failed to load WIRIS quizzes XML definition for question id'; diff --git a/lang/fr/qtype_wq.php b/lang/fr/qtype_wq.php index 56e01993..34126514 100644 --- a/lang/fr/qtype_wq.php +++ b/lang/fr/qtype_wq.php @@ -14,5 +14,64 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -$string['wq'] = 'Maths et sciences par WIRIS'; -$string['pluginname'] = 'Maths et sciences par WIRIS'; +$string['wq'] = 'Maths et sciences par WIRIS';; +$string['pluginname'] = 'Maths et sciences par WIRIS';; +$string['pluginnamesummary'] = ''; +$string['wq_help'] = 'Generic WIRIS quizzes Help'; +$string['editingwq'] = 'Editing a generic WIRIS question'; +$string['addingwq'] = 'Adding a generic WIRIS question'; +$string['cachedef_images'] = "WIRIS Quizzes images."; +$string['error'] = 'ERROR'; +$string['info_maintitle'] = "Moodle 2.x WIRIS quizzes test page"; +$string['info_tableheader_test'] = "Test"; +$string['info_tableheader_report'] = "Report"; +$string['info_tableheader_status'] = "Status"; +$string['info_disabled'] = "DISABLED"; +$string['info_enabled'] = "ENABLED"; +$string['info_enabled'] = "ENABLED"; +$string['info_information'] = "For more information or if you have any doubt contact WIRIS Support:"; +$string['info_test1_name'] = "WIRIS quizzes version"; +$string['info_test1_rt1'] = "WIRIS quizzes version is "; +$string['info_test1_rt2'] = "Impossible to find WIRIS quizzes version."; +$string['info_test2_name'] = "WIRIS plugin version"; +$string['info_test2_info'] = "Check WIRIS plugin "; +$string['info_test2_infopage'] = "info page"; +$string['info_test2_rt1'] = "WIRIS plugin is properly installed."; +$string['info_test2_rt2'] = "WIRIS quizzes requires WIRIS plugin 3.17.20 or greater. Your version is"; +$string['info_test2_rt3'] = "Impossible to find WIRIS plugin version file."; +$string['info_test3_name'] = "Moodle version"; +$string['info_test3_rt1'] = "Your moodle version is sufficiently new."; +$string['info_test3_rt2'] = "Your Moodle version is %s. WIRIS quizzes could not work correctly with Moodle version prior to 2011060313"; +$string['info_test3_rt3'] = "Impossible to find Moodle version file."; +$string['info_test4_name'] = "Plugins"; +$string['info_test4_pluginname1'] = "True/False question type"; +$string['info_test4_pluginname2'] = "Short-Answer question type"; +$string['info_test4_pluginname3'] = "Embedded answer (Cloze) question type"; +$string['info_test4_pluginname4'] = "Multi Choice question type"; +$string['info_test4_pluginname5'] = "Matching question type"; +$string['info_test4_pluginname6'] = "Essay question type"; +$string['info_test4_pluginname7'] = "Commons question type"; +$string['info_test4_rt1'] = "The following WIRIS question plugins are installed:"; +$string['info_test4_rt2'] = "The following WIRIS question plugins are missing:"; +$string['info_test4_rt3'] = "Install"; +$string['info_test5_name'] = "Database"; +$string['info_test5_rt1'] = "All WIRIS tables are present."; +$string['info_test5_rt2'] = "One or more of WIRIS tables are missing."; +$string['info_test6_name'] = "WIRIS quizzes"; +$string['info_test7_name'] = "Checking WIRIS configuration"; +$string['info_test8_name'] = "Checking if WIRIS server is reachable"; +$string['info_test8_rt1'] = "Connecting to %s at port %s"; +$string['info_test9_name'] = "WIRIS quizzes service"; +$string['info_test10_name'] = "Checking WIRIS quizzes functionality (variable)"; +$string['info_test11_name'] = "Checking WIRIS quizzes functionality (plot)"; +$string['info_test12_name'] = "Max server connections"; +$string['info_test12_rt1'] = "There are currently %s active concurrent connections out of a maximum of %s. Greatest number of concurrent connections is %s."; +$string['info_test12_rt2'] = "Error with the maximum connections security system. See details: 
%s
%s
"; +$string['ok'] = 'OK'; +$string['proxyurl'] = 'PROXY_URL:'; +$string['cachedir'] = 'CACHE_DIR:'; +$string['serviceurl'] = 'SERVICE_URL:'; +$string['wqsummary'] = 'This adds a generic WIRIS question. Only for test purpose. It will be hide from here.'; +$string['wirisquestionincorrect'] = 'Sorry! The system can not generate one of the questions of the quiz.
Maybe there is a temporary connection problem right now.
Maybe the question algorithm has a bug, and fails sometimes.
Maybe it will fail always.
Don\'t panic...
You can retry the quiz, without penalty, just clicking Continue.
You can also tell the Teachers that there is an issue with the question titled: \'{$a->questionname}\''; +$string['wirisquizzeserror'] = 'Sorry! There was an error in WIRIS quizzes.'; +$string['failedtoloadwirisquizzesfromxml'] = 'Failed to load WIRIS quizzes XML definition for question id'; diff --git a/lang/it/qtype_wq.php b/lang/it/qtype_wq.php index 6197b5ff..925ff4a5 100644 --- a/lang/it/qtype_wq.php +++ b/lang/it/qtype_wq.php @@ -14,5 +14,64 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -$string['wq'] = 'Matematica e scienza - WIRIS'; -$string['pluginname'] = 'Matematica e scienza - WIRIS'; +$string['wq'] = 'Matematica e scienza - WIRIS';; +$string['pluginname'] = 'Matematica e scienza - WIRIS';; +$string['pluginnamesummary'] = ''; +$string['wq_help'] = 'Generic WIRIS quizzes Help'; +$string['editingwq'] = 'Editing a generic WIRIS question'; +$string['addingwq'] = 'Adding a generic WIRIS question'; +$string['cachedef_images'] = "WIRIS Quizzes images."; +$string['error'] = 'ERROR'; +$string['info_maintitle'] = "Moodle 2.x WIRIS quizzes test page"; +$string['info_tableheader_test'] = "Test"; +$string['info_tableheader_report'] = "Report"; +$string['info_tableheader_status'] = "Status"; +$string['info_disabled'] = "DISABLED"; +$string['info_enabled'] = "ENABLED"; +$string['info_enabled'] = "ENABLED"; +$string['info_information'] = "For more information or if you have any doubt contact WIRIS Support:"; +$string['info_test1_name'] = "WIRIS quizzes version"; +$string['info_test1_rt1'] = "WIRIS quizzes version is "; +$string['info_test1_rt2'] = "Impossible to find WIRIS quizzes version."; +$string['info_test2_name'] = "WIRIS plugin version"; +$string['info_test2_info'] = "Check WIRIS plugin "; +$string['info_test2_infopage'] = "info page"; +$string['info_test2_rt1'] = "WIRIS plugin is properly installed."; +$string['info_test2_rt2'] = "WIRIS quizzes requires WIRIS plugin 3.17.20 or greater. Your version is"; +$string['info_test2_rt3'] = "Impossible to find WIRIS plugin version file."; +$string['info_test3_name'] = "Moodle version"; +$string['info_test3_rt1'] = "Your moodle version is sufficiently new."; +$string['info_test3_rt2'] = "Your Moodle version is %s. WIRIS quizzes could not work correctly with Moodle version prior to 2011060313"; +$string['info_test3_rt3'] = "Impossible to find Moodle version file."; +$string['info_test4_name'] = "Plugins"; +$string['info_test4_pluginname1'] = "True/False question type"; +$string['info_test4_pluginname2'] = "Short-Answer question type"; +$string['info_test4_pluginname3'] = "Embedded answer (Cloze) question type"; +$string['info_test4_pluginname4'] = "Multi Choice question type"; +$string['info_test4_pluginname5'] = "Matching question type"; +$string['info_test4_pluginname6'] = "Essay question type"; +$string['info_test4_pluginname7'] = "Commons question type"; +$string['info_test4_rt1'] = "The following WIRIS question plugins are installed:"; +$string['info_test4_rt2'] = "The following WIRIS question plugins are missing:"; +$string['info_test4_rt3'] = "Install"; +$string['info_test5_name'] = "Database"; +$string['info_test5_rt1'] = "All WIRIS tables are present."; +$string['info_test5_rt2'] = "One or more of WIRIS tables are missing."; +$string['info_test6_name'] = "WIRIS quizzes"; +$string['info_test7_name'] = "Checking WIRIS configuration"; +$string['info_test8_name'] = "Checking if WIRIS server is reachable"; +$string['info_test8_rt1'] = "Connecting to %s at port %s"; +$string['info_test9_name'] = "WIRIS quizzes service"; +$string['info_test10_name'] = "Checking WIRIS quizzes functionality (variable)"; +$string['info_test11_name'] = "Checking WIRIS quizzes functionality (plot)"; +$string['info_test12_name'] = "Max server connections"; +$string['info_test12_rt1'] = "There are currently %s active concurrent connections out of a maximum of %s. Greatest number of concurrent connections is %s."; +$string['info_test12_rt2'] = "Error with the maximum connections security system. See details: 
%s
%s
"; +$string['ok'] = 'OK'; +$string['proxyurl'] = 'PROXY_URL:'; +$string['cachedir'] = 'CACHE_DIR:'; +$string['serviceurl'] = 'SERVICE_URL:'; +$string['wqsummary'] = 'This adds a generic WIRIS question. Only for test purpose. It will be hide from here.'; +$string['wirisquestionincorrect'] = 'Sorry! The system can not generate one of the questions of the quiz.
Maybe there is a temporary connection problem right now.
Maybe the question algorithm has a bug, and fails sometimes.
Maybe it will fail always.
Don\'t panic...
You can retry the quiz, without penalty, just clicking Continue.
You can also tell the Teachers that there is an issue with the question titled: \'{$a->questionname}\''; +$string['wirisquizzeserror'] = 'Sorry! There was an error in WIRIS quizzes.'; +$string['failedtoloadwirisquizzesfromxml'] = 'Failed to load WIRIS quizzes XML definition for question id'; diff --git a/questiontype.php b/questiontype.php index d64df914..46988587 100644 --- a/questiontype.php +++ b/questiontype.php @@ -77,7 +77,7 @@ public function get_question_options($question) { $question->options->wirisquestion = $record->xml; $question->options->wirisoptions = $record->options; } else { - $OUTPUT->notification('Failed to load WIRIS quizzes XML definition for question id ' . $question->id . '.'); + $OUTPUT->notification( get_string('failedtoloadwirisquizzesfromxml', 'qtype_wq') . ' ' . $question->id . '.'); return false; } } diff --git a/quizzes/lib/com/wiris/quizzes/api/QuestionInstance.interface.php b/quizzes/lib/com/wiris/quizzes/api/QuestionInstance.interface.php index f4dc44e4..0950417f 100644 --- a/quizzes/lib/com/wiris/quizzes/api/QuestionInstance.interface.php +++ b/quizzes/lib/com/wiris/quizzes/api/QuestionInstance.interface.php @@ -2,6 +2,8 @@ interface com_wiris_quizzes_api_QuestionInstance extends com_wiris_quizzes_api_Serializable{ function setParameter($name, $value); + function getProperty($name); + function setProperty($name, $value); function areVariablesReady(); function getAssertionChecks($correctAnswer, $studentAnswer); function getStudentAnswersLength(); diff --git a/quizzes/lib/com/wiris/quizzes/impl/QuestionInstanceImpl.class.php b/quizzes/lib/com/wiris/quizzes/impl/QuestionInstanceImpl.class.php index 0f2a1165..664df4b5 100644 --- a/quizzes/lib/com/wiris/quizzes/impl/QuestionInstanceImpl.class.php +++ b/quizzes/lib/com/wiris/quizzes/impl/QuestionInstanceImpl.class.php @@ -1197,6 +1197,12 @@ public function getLocalDataImpl($name) { } return $this->defaultLocalData($name); } + public function getProperty($name) { + return $this->getLocalData($name); + } + public function setProperty($name, $value) { + $this->setLocalData($name, $value); + } public function getLocalData($name) { if($name === com_wiris_quizzes_impl_LocalData::$KEY_OPENANSWER_HANDWRITING_CONSTRAINTS) { if($this->hasHandwritingConstraints()) { @@ -1230,6 +1236,9 @@ public function setLocalData($name, $value) { if(!$found) { $this->localData->push($data); } + if($name === com_wiris_quizzes_impl_LocalData::$KEY_OPENANSWER_HANDWRITING_CONSTRAINTS) { + $this->handConstraints = com_wiris_quizzes_impl_HandwritingConstraints::readHandwritingConstraints($value); + } } public function newInstance() { return new com_wiris_quizzes_impl_QuestionInstanceImpl(); diff --git a/quizzes/lib/com/wiris/quizzes/wrap/MultipleQuestionInstanceWrap.class.php b/quizzes/lib/com/wiris/quizzes/wrap/MultipleQuestionInstanceWrap.class.php index 3a8b4dcb..59befb27 100644 --- a/quizzes/lib/com/wiris/quizzes/wrap/MultipleQuestionInstanceWrap.class.php +++ b/quizzes/lib/com/wiris/quizzes/wrap/MultipleQuestionInstanceWrap.class.php @@ -6,6 +6,35 @@ public function __construct($instance) { $this->instance = $instance; $this->wrapper = com_wiris_system_CallWrapper::getInstance(); }} + public function setProperty($name, $value) { + try { + $this->wrapper->start(); + $this->instance->setProperty($name, $value); + $this->wrapper->stop(); + }catch(Exception $�e) { + $_ex_ = ($�e instanceof HException) ? $�e->e : $�e; + $e = $_ex_; + { + $this->wrapper->stop(); + throw new HException($e); + } + } + } + public function getProperty($name) { + try { + $this->wrapper->start(); + $r = $this->instance->getProperty($name); + $this->wrapper->stop(); + return $r; + }catch(Exception $�e) { + $_ex_ = ($�e instanceof HException) ? $�e->e : $�e; + $e = $_ex_; + { + $this->wrapper->stop(); + throw new HException($e); + } + } + } public function isSubAnswerCorrect($sub, $answerIndex) { try { $this->wrapper->start(); diff --git a/quizzes/lib/com/wiris/quizzes/wrap/QuestionInstanceWrap.class.php b/quizzes/lib/com/wiris/quizzes/wrap/QuestionInstanceWrap.class.php index 58dadf2c..ff38c4d6 100644 --- a/quizzes/lib/com/wiris/quizzes/wrap/QuestionInstanceWrap.class.php +++ b/quizzes/lib/com/wiris/quizzes/wrap/QuestionInstanceWrap.class.php @@ -6,6 +6,35 @@ public function __construct($instance) { $this->instance = $instance; $this->wrapper = com_wiris_system_CallWrapper::getInstance(); }} + public function setProperty($name, $value) { + try { + $this->wrapper->start(); + $this->instance->setProperty($name, $value); + $this->wrapper->stop(); + }catch(Exception $�e) { + $_ex_ = ($�e instanceof HException) ? $�e->e : $�e; + $e = $_ex_; + { + $this->wrapper->stop(); + throw new HException($e); + } + } + } + public function getProperty($name) { + try { + $this->wrapper->start(); + $r = $this->instance->getProperty($name); + $this->wrapper->stop(); + return $r; + }catch(Exception $�e) { + $_ex_ = ($�e instanceof HException) ? $�e->e : $�e; + $e = $_ex_; + { + $this->wrapper->stop(); + throw new HException($e); + } + } + } public function setParameter($name, $value) { try { $this->wrapper->start(); diff --git a/quizzes/lib/com/wiris/util/type/Arrays.class.php b/quizzes/lib/com/wiris/util/type/Arrays.class.php index 635b1e30..e326400f 100644 --- a/quizzes/lib/com/wiris/util/type/Arrays.class.php +++ b/quizzes/lib/com/wiris/util/type/Arrays.class.php @@ -122,6 +122,25 @@ static function insertSortedImpl($a, $e, $set) { } $a->insert($imin, $e); } + static function binarySearch($array, $key) { + $imin = 0; + $imax = $array->length; + while($imin < $imax) { + $imid = Math::floor(($imin + $imax) / 2); + $cmp = Reflect::compare($array[$imid], $key); + if($cmp === 0) { + return $imid; + } else { + if($cmp < 0) { + $imin = $imid + 1; + } else { + $imax = $imid; + } + } + unset($imid,$cmp); + } + return -1; + } static function copyArray($a) { $b = new _hx_array(array()); $i = $a->iterator(); diff --git a/quizzes/lib/integration.ini b/quizzes/lib/integration.ini index c07bb334..404c265e 100644 --- a/quizzes/lib/integration.ini +++ b/quizzes/lib/integration.ini @@ -136,10 +136,10 @@ quizzes.hand.logtraces = "true" ;quizzes.graph.url = "" -; -; Classpath and Class used in Moodle to overwrite service.php and cache folder path -; + ; + ; Classpath and Class used in Moodle to overwrite service.php and cache folder path + ; -quizzes.configuration.classpath = "../classes" -quizzes.configuration.class = "MoodleConfiguration" - \ No newline at end of file + quizzes.configuration.classpath = "../classes" + quizzes.configuration.class = "MoodleConfiguration" + \ No newline at end of file diff --git a/quizzes/lib/quizzes.js b/quizzes/lib/quizzes.js index 2b1763b4..a6fa5054 100644 --- a/quizzes/lib/quizzes.js +++ b/quizzes/lib/quizzes.js @@ -1518,7 +1518,9 @@ com.wiris.quizzes.JsImageMathInput.prototype = $extend(com.wiris.quizzes.JsPopup var container = new com.wiris.quizzes.JsContainer(this.popup.document); container.addClass("wirismaincontainer"); var editor = new com.wiris.quizzes.JsEditorInput(this.popup.document,this.getValue(),this.editorParams); - editor.setGrammarUrl(this.grammar); + var check = true; + if(this.editorParams != null && this.editorParams.checkSyntax != null) check = this.editorParams.checkSyntax == "true"; + editor.setGrammarUrl(this.grammar,check); editor.setHandConstraints(haxe.Json.parse(this.handConstraints)); editor.addClass("wirispopupsimplecontent"); container.addChild(editor); @@ -1527,6 +1529,12 @@ com.wiris.quizzes.JsImageMathInput.prototype = $extend(com.wiris.quizzes.JsPopup _g.setValue(editor.getValue()); if(_g.changeHandler != null) _g.changeHandler(_g.value); }); + editor.addOnChangeStartHandler(function() { + submit.setAcceptEnabled(false); + }); + editor.addOnChangeHandler(function(s) { + submit.setAcceptEnabled(true); + }); container.addChild(submit); this.addPopupChild(container); } @@ -1839,7 +1847,10 @@ com.wiris.quizzes.JsSubmitButtons = $hxClasses["com.wiris.quizzes.JsSubmitButton com.wiris.quizzes.JsSubmitButtons.__name__ = ["com","wiris","quizzes","JsSubmitButtons"]; com.wiris.quizzes.JsSubmitButtons.__super__ = com.wiris.quizzes.JsComponent; com.wiris.quizzes.JsSubmitButtons.prototype = $extend(com.wiris.quizzes.JsComponent.prototype,{ - setCorporateLogo: function(src,title,url) { + setAcceptEnabled: function(enabled) { + if(this.accept != null) this.accept.setEnabled(enabled); + } + ,setCorporateLogo: function(src,title,url) { var doc = this.getOwnerDocument(); var img = doc.createElement("img"); img.src = src; @@ -2179,7 +2190,7 @@ com.wiris.quizzes.JsCasJnlpLauncher.prototype = $extend(com.wiris.quizzes.JsInpu } else { this.setButtonEnabled(true); this.setNote(this.t("error")); - haxe.Log.trace(session.get("error"),{ fileName : "JsComponent.hx", lineNumber : 1558, className : "com.wiris.quizzes.JsCasJnlpLauncher", methodName : "sessionReceived"}); + haxe.Log.trace(session.get("error"),{ fileName : "JsComponent.hx", lineNumber : 1575, className : "com.wiris.quizzes.JsCasJnlpLauncher", methodName : "sessionReceived"}); } } ,pollServiceImpl: function() { @@ -2540,6 +2551,7 @@ com.wiris.quizzes.JsStudentAnswerInput.prototype = $extend(com.wiris.quizzes.JsI } ,setEditorInitialParams: function(editorParams) { this.editorParams = editorParams; + if(this.editorParams.checkSyntax != null) this.checkSyntax = this.editorParams.checkSyntax == "true"; if(this.input != null) { if(this.type == com.wiris.quizzes.JsStudentAnswerInput.TYPE_IMAGEMATH) { var popupEditor = this.input; @@ -6738,6 +6750,8 @@ com.wiris.quizzes.api.QuestionInstance.__name__ = ["com","wiris","quizzes","api" com.wiris.quizzes.api.QuestionInstance.__interfaces__ = [com.wiris.quizzes.api.Serializable]; com.wiris.quizzes.api.QuestionInstance.prototype = { setParameter: null + ,getProperty: null + ,setProperty: null ,areVariablesReady: null ,getAssertionChecks: null ,getStudentAnswersLength: null @@ -13182,6 +13196,12 @@ com.wiris.quizzes.impl.QuestionInstanceImpl.prototype = $extend(com.wiris.util.x } return this.defaultLocalData(name); } + ,getProperty: function(name) { + return this.getLocalData(name); + } + ,setProperty: function(name,value) { + this.setLocalData(name,value); + } ,getLocalData: function(name) { if(name == com.wiris.quizzes.impl.LocalData.KEY_OPENANSWER_HANDWRITING_CONSTRAINTS) { if(this.hasHandwritingConstraints()) return this.getHandwritingConstraints().getNegativeConstraints().toJSON(); else return null; @@ -13204,6 +13224,7 @@ com.wiris.quizzes.impl.QuestionInstanceImpl.prototype = $extend(com.wiris.util.x } } if(!found) this.localData.push(data); + if(name == com.wiris.quizzes.impl.LocalData.KEY_OPENANSWER_HANDWRITING_CONSTRAINTS) this.handConstraints = com.wiris.quizzes.impl.HandwritingConstraints.readHandwritingConstraints(value); } ,newInstance: function() { return new com.wiris.quizzes.impl.QuestionInstanceImpl(); @@ -15309,6 +15330,16 @@ com.wiris.util.type.Arrays.insertSortedImpl = function(a,e,set) { } a.splice(imin,0,e); } +com.wiris.util.type.Arrays.binarySearch = function(array,key) { + var imin = 0; + var imax = array.length; + while(imin < imax) { + var imid = Math.floor((imin + imax) / 2); + var cmp = Reflect.compare(array[imid],key); + if(cmp == 0) return imid; else if(cmp < 0) imin = imid + 1; else imax = imid; + } + return -1; +} com.wiris.util.type.Arrays.copyArray = function(a) { var b = new Array(); var i = HxOverrides.iter(a); diff --git a/quizzes/lib/version.txt b/quizzes/lib/version.txt index ece3c348..ba5e73f3 100644 --- a/quizzes/lib/version.txt +++ b/quizzes/lib/version.txt @@ -1 +1 @@ -3.55.0 \ No newline at end of file +3.56.1 \ No newline at end of file diff --git a/settings.php b/settings.php index b3d3b7c3..11ab1149 100644 --- a/settings.php +++ b/settings.php @@ -16,18 +16,6 @@ defined('MOODLE_INTERNAL') || die(); -// Checking that WIRIS plugin is installed. -$filterexists = file_exists($CFG->dirroot . '/filter/wiris/filter.php'); - -$output = ''; -if (!$filterexists) { - $title = '


Attention! WIRIS filter is not installed'; - $info = ''; - $info .= 'add(new admin_setting_configcheckbox('question/wq_disabled', 'WIRIS quizzes', $output, '0', '0', '1')); -if ($filterexists) { - if ($CFG->version >= 2012120300 && $CFG->version < 2013051400) { - $settingslink = 'filtersettingfilterwiris'; - } else { - $settingslink = 'filtersettingwiris'; - } - $url = $CFG->wwwroot . '/admin/settings.php?section=' . $settingslink; - $url = 'WIRIS filter settings'; - $settings->add(new admin_setting_heading('filter_wirisfilterheading', $url, '')); +if ($CFG->version >= 2012120300 && $CFG->version < 2013051400) { + $settingslink = 'filtersettingfilterwiris'; +} else { + $settingslink = 'filtersettingwiris'; } +$url = $CFG->wwwroot . '/admin/settings.php?section=' . $settingslink; +$url = 'WIRIS filter settings'; +$settings->add(new admin_setting_heading('filter_wirisfilterheading', $url, '')); diff --git a/thirdpartylibs.xml b/thirdpartylibs.xml index 453c2435..615e0dae 100644 --- a/thirdpartylibs.xml +++ b/thirdpartylibs.xml @@ -3,7 +3,7 @@ quizzes WIRIS QUIZZES engine - 3.55.0.1025 + 3.56.1.1026 GPL 3.0+ diff --git a/version.php b/version.php index 6de932f9..98827044 100644 --- a/version.php +++ b/version.php @@ -16,9 +16,9 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2017081000; +$plugin->version = 2017083000; $plugin->requires = 2011120500; // Moodle 2.2. -$plugin->release = '3.55.0.1025'; +$plugin->release = '3.56.1.1026'; $plugin->maturity = MATURITY_STABLE; $plugin->component = 'qtype_wq'; $plugin->dependencies = array (