Skip to content

Commit f5148c6

Browse files
ptorrent-at-wirisptorrent-at-wiris
authored
Merge pull request wiris#88 from wiris/v4.11.4
V4.11.4
2 parents 36b4fa7 + 676882b commit f5148c6

File tree

6 files changed

+108
-59
lines changed

6 files changed

+108
-59
lines changed

‎lang/en/qtype_wq.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,6 @@
105105
$string['privacy:metadata:qtype_wq:xml'] = 'Wiris Quizzes Question XML';
106106

107107
$string['auxiliar_text'] = 'Write an optional reasoning for your answer:';
108+
109+
$string['log_server_errors'] = 'Log server errors';
110+
$string['log_server_errors_help'] = 'Extensively log errors coming from the WirisQuizzes service to your server logs. This might cause an increase in the size of your log files but might help the Wiris team troubleshoot issues.';

‎question.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ public function call_wiris_service($request) {
357357
$service = $builder->getQuizzesService();
358358

359359
$isdebugmodeenabled = get_config('qtype_wq', 'debug_mode_enabled') == '1';
360+
$islogmodeenabled = get_config('qtype_wq', 'log_server_errors') == '1';
360361

361362
if ($isdebugmodeenabled) {
362363
// @codingStandardsIgnoreLine
@@ -382,6 +383,10 @@ public function call_wiris_service($request) {
382383
print_object($e);
383384
}
384385

386+
if ($islogmodeenabled) {
387+
error_log('WIRISQUIZZES SERVER ERROR --- REQUEST: --- ' . $request->serialize());
388+
}
389+
385390
throw new moodle_exception('wirisquestionincorrect', 'qtype_wq', $link, $a, '');
386391
}
387392

@@ -391,4 +396,16 @@ public function call_wiris_service($request) {
391396
}
392397
return $response;
393398
}
399+
400+
401+
public function update_attempt_state_data_for_new_version(
402+
question_attempt_step $oldstep,
403+
question_definition $otherversion
404+
) {
405+
return $this->base->update_attempt_state_data_for_new_version($oldstep, $otherversion->base);
406+
}
407+
408+
public function validate_can_regrade_with_other_version(question_definition $otherversion): ?string {
409+
return $this->base->validate_can_regrade_with_other_version($otherversion->base);
410+
}
394411
}

‎renderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,6 @@ protected function prepare_response(
203203
'auxiliar_text',
204204
$step
205205
);
206-
return format_text($text, $step->get_qt_var($name), $formatoptions);
206+
return format_text($text, FORMAT_MOODLE, $formatoptions);
207207
}
208208
}

‎settings.php

Lines changed: 84 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -37,63 +37,92 @@
3737
}
3838
}
3939

40-
$settings->add(new admin_setting_heading('qtype_wq/connectionsettings',
41-
get_string('connectionsettings', 'qtype_wq'),
42-
get_string('connectionsettings_text', 'qtype_wq')));
43-
44-
$settings->add(new admin_setting_configtext('qtype_wq/quizzesserviceurl',
45-
get_string('quizzesserviceurl', 'qtype_wq'),
46-
get_string('quizzesserviceurl_help', 'qtype_wq'),
47-
'http://www.wiris.net/demo/quizzes',
48-
PARAM_URL));
49-
50-
$settings->add(new admin_setting_configtext('qtype_wq/quizzeseditorurl',
51-
get_string('quizzeseditorurl', 'qtype_wq'),
52-
get_string('quizzeseditorurl_help', 'qtype_wq'),
53-
'http://www.wiris.net/demo/editor',
54-
PARAM_URL));
55-
56-
$settings->add(new admin_setting_configtext('qtype_wq/quizzeshandurl',
57-
get_string('quizzeshandurl', 'qtype_wq'),
58-
get_string('quizzeshandurl_help', 'qtype_wq'),
59-
'http://www.wiris.net/demo/hand',
60-
PARAM_URL));
61-
62-
$settings->add(new admin_setting_configtext('qtype_wq/quizzeswirislauncherurl',
63-
get_string('quizzeswirislauncherurl', 'qtype_wq'),
64-
get_string('quizzeswirislauncherurl_help', 'qtype_wq'),
65-
'http://stateful.wiris.net/demo/wiris',
66-
PARAM_URL));
67-
68-
$settings->add(new admin_setting_configtext('qtype_wq/quizzeswirisurl',
69-
get_string('quizzeswirisurl', 'qtype_wq'),
70-
get_string('quizzeswirisurl_help', 'qtype_wq'),
71-
'http://www.wiris.net/demo/wiris',
72-
PARAM_URL));
40+
$settings->add(new admin_setting_heading(
41+
'qtype_wq/connectionsettings',
42+
get_string('connectionsettings', 'qtype_wq'),
43+
get_string('connectionsettings_text', 'qtype_wq')
44+
));
45+
46+
$settings->add(new admin_setting_configtext(
47+
'qtype_wq/quizzesserviceurl',
48+
get_string('quizzesserviceurl', 'qtype_wq'),
49+
get_string('quizzesserviceurl_help', 'qtype_wq'),
50+
'http://www.wiris.net/demo/quizzes',
51+
PARAM_URL
52+
));
53+
54+
$settings->add(new admin_setting_configtext(
55+
'qtype_wq/quizzeseditorurl',
56+
get_string('quizzeseditorurl', 'qtype_wq'),
57+
get_string('quizzeseditorurl_help', 'qtype_wq'),
58+
'http://www.wiris.net/demo/editor',
59+
PARAM_URL
60+
));
61+
62+
$settings->add(new admin_setting_configtext(
63+
'qtype_wq/quizzeshandurl',
64+
get_string('quizzeshandurl', 'qtype_wq'),
65+
get_string('quizzeshandurl_help', 'qtype_wq'),
66+
'http://www.wiris.net/demo/hand',
67+
PARAM_URL
68+
));
69+
70+
$settings->add(new admin_setting_configtext(
71+
'qtype_wq/quizzeswirislauncherurl',
72+
get_string('quizzeswirislauncherurl', 'qtype_wq'),
73+
get_string('quizzeswirislauncherurl_help', 'qtype_wq'),
74+
'http://stateful.wiris.net/demo/wiris',
75+
PARAM_URL
76+
));
77+
78+
$settings->add(new admin_setting_configtext(
79+
'qtype_wq/quizzeswirisurl',
80+
get_string('quizzeswirisurl', 'qtype_wq'),
81+
get_string('quizzeswirisurl_help', 'qtype_wq'),
82+
'http://www.wiris.net/demo/wiris',
83+
PARAM_URL
84+
));
7385

7486
// Access provider option. If enabled only loged users can access to Wiris Quizzes services.
75-
$settings->add(new admin_setting_configcheckbox('qtype_wq/access_provider_enabled',
76-
get_string('access_provider_enabled', 'qtype_wq'),
77-
get_string('access_provider_enabled_help', 'qtype_wq'),
78-
'0'));
79-
80-
$settings->add(new admin_setting_heading('qtype_wq/compatibility_settings',
81-
get_string('compatibility_settings', 'qtype_wq'),
82-
get_string('compatibility_settings_text', 'qtype_wq')));
83-
84-
$settings->add(new admin_setting_configcheckbox('qtype_wq/filtercodes_compatibility',
85-
get_string('filtercodes_compatibility_enabled', 'qtype_wq'),
86-
get_string('filtercodes_compatibility_enabled_help', 'qtype_wq'),
87-
'0'));
88-
89-
$settings->add(new admin_setting_heading('qtype_wq/troubleshooting_settings',
90-
get_string('troubleshooting_settings', 'qtype_wq'),
91-
get_string('troubleshooting_settings_text', 'qtype_wq')));
92-
93-
$settings->add(new admin_setting_configcheckbox('qtype_wq/debug_mode_enabled',
94-
get_string('debug_mode_enabled', 'qtype_wq'),
95-
get_string('debug_mode_enabled_help', 'qtype_wq'),
96-
'0'));
87+
$settings->add(new admin_setting_configcheckbox(
88+
'qtype_wq/access_provider_enabled',
89+
get_string('access_provider_enabled', 'qtype_wq'),
90+
get_string('access_provider_enabled_help', 'qtype_wq'),
91+
'0'
92+
));
93+
94+
$settings->add(new admin_setting_heading(
95+
'qtype_wq/compatibility_settings',
96+
get_string('compatibility_settings', 'qtype_wq'),
97+
get_string('compatibility_settings_text', 'qtype_wq')
98+
));
99+
100+
$settings->add(new admin_setting_configcheckbox(
101+
'qtype_wq/filtercodes_compatibility',
102+
get_string('filtercodes_compatibility_enabled', 'qtype_wq'),
103+
get_string('filtercodes_compatibility_enabled_help', 'qtype_wq'),
104+
'0'
105+
));
106+
107+
$settings->add(new admin_setting_heading(
108+
'qtype_wq/troubleshooting_settings',
109+
get_string('troubleshooting_settings', 'qtype_wq'),
110+
get_string('troubleshooting_settings_text', 'qtype_wq')
111+
));
112+
113+
$settings->add(new admin_setting_configcheckbox(
114+
'qtype_wq/debug_mode_enabled',
115+
get_string('debug_mode_enabled', 'qtype_wq'),
116+
get_string('debug_mode_enabled_help', 'qtype_wq'),
117+
'0'
118+
));
119+
120+
$settings->add(new admin_setting_configcheckbox(
121+
'qtype_wq/log_server_errors',
122+
get_string('log_server_errors', 'qtype_wq'),
123+
get_string('log_server_errors_help', 'qtype_wq'),
124+
'0'
125+
));
97126

98127

99128
if ($CFG->version >= 2012120300 && $CFG->version < 2013051400) {

‎step.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public function get_var($name, $subquesbool = true) {
217217
}
218218

219219
private function get_step_var_internal($name, $subquesbool) {
220-
if ($subquesbool && strlen($this->extraprefix) > 0) {
220+
if ($subquesbool && isset($this->extraprefix) && strlen($this->extraprefix) > 0) {
221221
// The prefix is needed when it is a subquestion of a cloze
222222
// (multianswer) question type.
223223
if (substr($name, 0, 2) === '!_') {

‎version.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
defined('MOODLE_INTERNAL') || die();
1818

19-
$plugin->version = 2024032203;
19+
$plugin->version = 2024032204;
2020
$plugin->requires = 2015111600; // Moodle 3.0.
21-
$plugin->release = '4.11.3';
21+
$plugin->release = '4.11.4';
2222
$plugin->maturity = MATURITY_STABLE;
2323
$plugin->component = 'qtype_wq';
2424
$plugin->dependencies = array(

0 commit comments

Comments
 (0)