prevent access to filters when disabled in filter settings SC#291; merged from MOODLE...

diff --git a/filter/algebra/algebradebug.php b/filter/algebra/algebradebug.php
index 6ae4967107be37079e3e4cd32bdc936830b03779..c1b04acc82401661469a5a88dfacc4e608dd0144 100644 (file)
--- a/filter/algebra/algebradebug.php
+++ b/filter/algebra/algebradebug.php
@@ -7,6 +7,14 @@
 
     require_once("../../config.php");
 
+    if (empty($CFG->textfilters)) {
+        error ('Filter not enabled!');
+    } else {
+        $filters = explode(',', $CFG->textfilters);
+        if (array_search('filter/algebra', $filters) === FALSE) {
+            error ('Filter not enabled!');
+        }
+    }
 
     $CFG->texfilterdir = "filter/tex";
     $CFG->algebrafilterdir = "filter/algebra";

diff --git a/filter/algebra/pix.php b/filter/algebra/pix.php
index d0218474d867255a795ec30bca2b5661dcdc58e9..8fd51bff894e5c151fc749445e0d1312664e3225 100644 (file)
--- a/filter/algebra/pix.php
+++ b/filter/algebra/pix.php
@@ -6,6 +6,16 @@
     $nomoodlecookie = true;     // Because it interferes with caching
 
     require_once('../../config.php');
+
+    if (empty($CFG->textfilters)) {
+        error ('Filter not enabled!');
+    } else {
+        $filters = explode(',', $CFG->textfilters);
+        if (array_search('filter/algebra', $filters) === FALSE) {
+            error ('Filter not enabled!');
+        }
+    }
+
     require_once($CFG->libdir.'/filelib.php');
 
     $CFG->texfilterdir     = 'filter/tex';

diff --git a/filter/tex/pix.php b/filter/tex/pix.php
index 0b79fba73f83ac645215a883851af8658f23cac9..1977c8eb8876339096f9eacd92f3754efd67b51a 100644 (file)
--- a/filter/tex/pix.php
+++ b/filter/tex/pix.php
@@ -6,6 +6,16 @@
     $nomoodlecookie = true;     // Because it interferes with caching
 
     require_once('../../config.php');
+
+    if (empty($CFG->textfilters)) {
+        error ('Filter not enabled!');
+    } else {
+        $filters = explode(',', $CFG->textfilters);
+        if (array_search('filter/tex', $filters) === FALSE) {
+            error ('Filter not enabled!');
+        }
+    }
+
     require_once($CFG->libdir.'/filelib.php');
     require_once('defaultsettings.php' );
     require_once('latex.php');

diff --git a/filter/tex/texdebug.php b/filter/tex/texdebug.php
index d6e41ae49f21362b1cf41ac96e305e43b5fe784e..2db14a7c732e1cc96dde69e7cff6720e31f7e553 100644 (file)
--- a/filter/tex/texdebug.php
+++ b/filter/tex/texdebug.php
@@ -7,6 +7,15 @@
 
     require_once("../../config.php");
 
+    if (empty($CFG->textfilters)) {
+        error ('Filter not enabled!');
+    } else {
+        $filters = explode(',', $CFG->textfilters);
+        if (array_search('filter/tex', $filters) === FALSE) {
+            error ('Filter not enabled!');
+        }
+    }
+
     $CFG->texfilterdir = "filter/tex";
     $CFG->teximagedir = "filter/tex";
 

diff --git a/filter/tex/texed.php b/filter/tex/texed.php
index 5d61b11935438b30818c56f1b8b4dd36b0e59c8a..c0069428f466a8e9534013e2abe6773149e4f85d 100644 (file)
--- a/filter/tex/texed.php
+++ b/filter/tex/texed.php
@@ -7,6 +7,15 @@
 
     require_once("../../config.php");
 
+    if (empty($CFG->textfilters)) {
+        error ('Filter not enabled!');
+    } else {
+        $filters = explode(',', $CFG->textfilters);
+        if (array_search('filter/tex', $filters) === FALSE) {
+            error ('Filter not enabled!');
+        }
+    }
+
     $CFG->texfilterdir = "filter/tex";
     $CFG->teximagedir = "filter/tex";