Merge pull request #93 from wiris/v4.12.2

feat: add new settings - mathjax compat, calc & graph url, maxconnect…

Author: ptorrent-at-wiris

classes/MoodleConfiguration.class.php

@@ -48,6 +48,18 @@ public function get($key) {
                 return $quizzeshandurl;
             }
         }
+        if ($key == 'quizzes.calc.url') {
+            $quizzescalcurl = get_config('qtype_wq', 'quizzescalcurl');
+            if (isset($quizzescalcurl) && !empty($quizzescalcurl)) {
+                return $quizzescalcurl;
+            }
+        }
+        if ($key == 'quizzes.graph.url') {
+            $quizzesgraphurl = get_config('qtype_wq', 'quizzesgraphurl');
+            if (isset($quizzesgraphurl) && !empty($quizzesgraphurl)) {
+                return $quizzesgraphurl;
+            }
+        }
         if ($key == 'quizzes.wirislauncher.url') {
             $quizzeswirislauncherurl = get_config('qtype_wq', 'quizzeswirislauncherurl');
             if (isset($quizzeswirislauncherurl) && !empty($quizzeswirislauncherurl)) {
@@ -72,7 +84,12 @@ public function get($key) {
         if ($key == 'quizzes.httpproxy.pass' && $moodleproxyenabled && $proxypassenabled) {
             return $CFG->proxypassword;
         }
-
+        if ($key == 'quizzes.maxconnections') {
+            $maxconnectionsdisabled = get_config('qtype_wq', 'maxconnections_disabled');
+            if ($maxconnectionsdisabled) {
+                return '-1';
+            }
+        }
         if ($key == 'quizzes.cache.dir') {
             return $CFG->dataroot . '/filter/wiris/cache';
         }

lang/en/qtype_wq.php

@@ -97,7 +97,7 @@
 
 $string['compatibility_settings'] = 'Compatibility settings';
 $string['compatibility_settings_text'] = '';
-$string['filtercodes_compatibility_enabled'] = 'Compatibility with Filter Codes filter';
+$string['filtercodes_compatibility_enabled'] = 'FilterCodes compatibility';
 $string['filtercodes_compatibility_enabled_help'] = 'The Filter Codes filter is not compatible with certain WirisQuizzes features if the option "Escape tags" is selected. Enabling this option solves the compatibility problem. Do not enable it in any other situation.';
 
 $string['privacy:metadata:qtype_wq'] = 'Information about user\'s correct answer for a given WirisQuizzes question type';
@@ -111,3 +111,15 @@
 
 $string['corruptquestion_edit'] = 'WARNING: This question was corrupted and its mathematical data was lost from the database. We have tried to restore everything we could, but you need to rebuild the CalcMe algorithm if your question had one, and any custom input options and validation options. Contact with your administrator for further information.';
 $string['corruptquestion_attempt'] = 'The question {$a->questionname} was corrupted and could not be loaded. Please contact with your teacher so they can fix it.';
+
+$string['quizzescalcurl'] = 'CalcMe URL';
+$string['quizzescalcurl_help'] = 'URL where to load the CalcMe web app.';
+
+$string['quizzesgraphurl'] = 'Graph tool URL';
+$string['quizzesgraphurl_help'] = 'URL where to load the tool used for graph rendering and graphical answer questions.';
+
+$string['maxconnections_disabled'] = 'Disable max connections protection';
+$string['maxconnections_disabled_help'] = 'Disables the protection mechanism that limits the number of concurrent connections to the WirisQuizzes server. Only enable this setting if your usage of WirisQuizzes reaches the concurrency limit and be mindful that your infrastructure will need to handle the increased number of concurrent connections to our server.';
+
+$string['mathjax_compatibity'] = 'MathJax compatibility';
+$string['mathjax_compatibity_help'] = '(Experimental) Enables compatibility with MathJax. This option is only needed if you want to use MathJax instead of MathType to render LaTeX formulas in WirisQuizzes questions. Formulas created with MathType or WirisQuizzes will still be rendered by MathType. For the best performance, we recommend using MathType to render all formulas.';

question.php

@@ -184,24 +184,49 @@ public function format_text($text, $format, $qa, $component, $filearea, $itemid,
             $text = $this->base->format_text($text, $format, $qa, $component, $filearea, $itemid, $clean);
             $format = FORMAT_HTML;
         }
-        $text = $this->expand_variables($text);
-
+        $text = $this->expand_variables($text);        
         return $this->base->format_text($text, $format, $qa, $component, $filearea, $itemid, $clean);
     }
 
+    private function mathml_to_safe($input) {
+        $safe = array('«', '»', '¨', '§', '`');
+        $mathml = array('<', '>', '"', '&', '\'');
+        return str_replace($mathml, $safe, $input);
+    }
+    
     public function expand_variables($text) {
         if (isset($this->wirisquestioninstance)) {
             $text = $this->wirisquestioninstance->expandVariables($text);
         }
-        return $this->filtercodes_compatibility($text);
+
+        if (get_config('qtype_wq', 'filtercodes_compatibility')) {
+            $text = $this->filtercodes_compatibility($text);
+        }
+        if (get_config('qtype_wq', 'mathjax_compatibity')) {
+            $text = $this->mathjax_compatibility($text);
+        }
+
+        return $text;
+    }
+
+    /**
+     * If MathType is in client mode and we want to use MathJax to render LaTeX,
+     * the MathJax plugin can conflict with standard MathML due to supporting
+     * HTML inside formulae. This function replaces MathML special chars with a MathType's
+     * safe enconding so MathJax does not interact with it.
+     */
+    private function mathjax_compatibility($text) {
+        return preg_replace_callback('/<math.*?<\/math>/s',
+            function ($matches) { 
+                return $this->mathml_to_safe($matches[0]); 
+            },
+            $text
+        );
     }
 
     private function filtercodes_compatibility($text) {
-        $configfiltercodes = get_config('qtype_wq', 'filtercodes_compatibility');
-        if (isset($configfiltercodes) && $configfiltercodes == '1') {
-            $text = str_replace('[{', '[[{', $text);
-            $text = str_replace('}]', '}]]', $text);
-        }
+        $text = str_replace('[{', '[[{', $text);
+        $text = str_replace('}]', '}]]', $text);
         return $text;
     }
 

settings.php

@@ -47,23 +47,39 @@
     'qtype_wq/quizzesserviceurl',
     get_string('quizzesserviceurl', 'qtype_wq'),
     get_string('quizzesserviceurl_help', 'qtype_wq'),
-    'http://www.wiris.net/demo/quizzes',
+    'https://www.wiris.net/demo/quizzes',
     PARAM_URL
 ));
 
 $settings->add(new admin_setting_configtext(
     'qtype_wq/quizzeseditorurl',
     get_string('quizzeseditorurl', 'qtype_wq'),
     get_string('quizzeseditorurl_help', 'qtype_wq'),
-    'http://www.wiris.net/demo/editor',
+    'https://www.wiris.net/demo/editor',
     PARAM_URL
 ));
 
 $settings->add(new admin_setting_configtext(
     'qtype_wq/quizzeshandurl',
     get_string('quizzeshandurl', 'qtype_wq'),
     get_string('quizzeshandurl_help', 'qtype_wq'),
-    'http://www.wiris.net/demo/hand',
+    'https://www.wiris.net/demo/hand',
+    PARAM_URL
+));
+
+$settings->add(new admin_setting_configtext(
+    'qtype_wq/quizzescalcurl',
+    get_string('quizzescalcurl', 'qtype_wq'),
+    get_string('quizzescalcurl_help', 'qtype_wq'),
+    'https://calcme.com',
+    PARAM_URL
+));
+
+$settings->add(new admin_setting_configtext(
+    'qtype_wq/quizzesgraphurl',
+    get_string('quizzesgraphurl', 'qtype_wq'),
+    get_string('quizzesgraphurl_help', 'qtype_wq'),
+    'https://www.wiris.net/demo/graph',
     PARAM_URL
 ));
 
@@ -91,6 +107,13 @@
     '0'
 ));
 
+$settings->add(new admin_setting_configcheckbox(
+    'qtype_wq/maxconnections_disabled',
+    get_string('maxconnections_disabled', 'qtype_wq'),
+    get_string('maxconnections_disabled_help', 'qtype_wq'),
+    '0'
+));
+
 $settings->add(new admin_setting_heading(
     'qtype_wq/compatibility_settings',
     get_string('compatibility_settings', 'qtype_wq'),
@@ -104,6 +127,13 @@
     '0'
 ));
 
+$settings->add(new admin_setting_configcheckbox(
+    'qtype_wq/mathjax_compatibity',
+    get_string('mathjax_compatibity', 'qtype_wq'),
+    get_string('mathjax_compatibity_help', 'qtype_wq'),
+    '0'
+));
+
 $settings->add(new admin_setting_heading(
     'qtype_wq/troubleshooting_settings',
     get_string('troubleshooting_settings', 'qtype_wq'),

version.php

@@ -16,9 +16,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2024121901;
+$plugin->version = 2024121902;
 $plugin->requires = 2015111600; // Moodle 3.0.
-$plugin->release = '4.12.1';
+$plugin->release = '4.12.2';
 $plugin->maturity = MATURITY_STABLE;
 $plugin->component = 'qtype_wq';
 $plugin->dependencies = array(