Index: lib/weblib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/weblib.php,v
retrieving revision 1.1184
diff -u -u -r1.1184 weblib.php
--- lib/weblib.php	9 Dec 2008 20:30:02 -0000	1.1184
+++ lib/weblib.php	11 Dec 2008 07:31:46 -0000
@@ -1,6 +1,5 @@
 <?php // $Id: weblib.php,v 1.1184 2008/12/09 20:30:02 skodak Exp $
 
-
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
 // NOTICE OF COPYRIGHT                                                   //
@@ -1347,6 +1346,8 @@
     global $CFG, $COURSE, $DB;
 
     static $croncache = array();
+    
+    $hashstr = '';
 
     if ($text === '') {
         return ''; // no need to do any filters and cleaning
@@ -1374,15 +1375,30 @@
     if (!isset($options->newlines)) {
         $options->newlines=true;
     }
-
     if (empty($courseid)) {
-        $courseid = $COURSE->id;
+        $couseid = $COURSE->id;
     }
 
+    if (!empty($CFG->textfilters)) {
+        require_once($CFG->libdir.'/filterlib.php');
+        $textfilters = explode(',', $CFG->textfilters);
+        foreach ($textfilters as $textfilter) {
+            if (is_readable($CFG->dirroot .'/'. $textfilter .'/filter.php')) {
+                include_once($CFG->dirroot .'/'. $textfilter .'/filter.php');
+                $classname = basename($textfilter).'_filter';
+                $obj = new $classname($courseid, $format, $options);
+                filter_base::addfilter($classname, $obj);
+                $hashstr .= $obj->hash();
+            }
+        }
+    }
     if (!empty($CFG->cachetext) and empty($options->nocache)) {
-        $time = time() - $CFG->cachetext;
-        $md5key = md5($text.'-'.(int)$courseid.'-'.current_language().'-'.(int)$format.(int)$options->trusttext.(int)$options->noclean.(int)$options->smiley.(int)$options->filter.(int)$options->para.(int)$options->newlines);
+        $hashstr .= $text.'-'.(int)$courseid.'-'.current_language().'-'.(int)$format.(int)$options->trusttext.(int)$options->noclean.(int)$options->smiley.(int)$options->filter.(int)$options->para.(int)$options->newlines;
+        // for debug filtering system
+        // $hashstr .= time();
 
+        $time = time() - $CFG->cachetext;
+        $md5key = md5($hashstr); 
         if (defined('FULLME') and FULLME == 'cron') {
             if (isset($croncache[$md5key])) {
                 return $croncache[$md5key];
@@ -1433,7 +1449,7 @@
                 $text = clean_text($text, FORMAT_HTML);
             }
             if ($options->filter) {
-                $text = filter_text($text, $courseid);
+                $text = filter_base::filter($text);
             }
             break;
 
@@ -1462,7 +1478,7 @@
             }
 
             if ($options->filter) {
-                $text = filter_text($text, $courseid);
+                $text = filter_base::filter($text);
             }
             break;
 
@@ -1473,7 +1489,7 @@
             }
 
             if ($options->filter) {
-                $text = filter_text($text, $courseid);
+                $text = filter_base::filter($text);
             }
             break;
     }
Index: lib/filterlib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/filterlib.php,v
retrieving revision 1.26
diff -u -u -r1.26 filterlib.php
--- lib/filterlib.php	26 Jul 2008 22:13:39 -0000	1.26
+++ lib/filterlib.php	11 Dec 2008 07:31:46 -0000
@@ -1,6 +1,35 @@
-<?php // $Id: filterlib.php,v 1.26 2008/07/26 22:13:39 stronk7 Exp $
+<?php // $Id:$
       // Contains special functions that are particularly useful to filters
 
+abstract class filter_base {
+    public static $filters = array();
+    protected $courseid;
+    protected $format;
+    protected $options;
+    public function __construct($courseid, $format, $options) {
+        $this->courseid = $courseid;
+        $this->format   = $format;
+        $this->options  = $options;
+    }
+    public static function addfilter($classname, $obj) {
+        if (empty(self::$filters[$classname])) {
+            self::$filters[$classname] = $obj;
+            return true;
+        } else {
+            return false;
+        }
+    }
+    public static function filter($text) {
+        foreach (self::$filters as $n=>$obj) {
+            $text = $obj->dofilter($text); 
+        }
+        return $text;
+    }
+    public function hash() {
+        return __CLASS__;
+    }
+    abstract function dofilter($text);
+}
 
 /**
  * This is just a little object to define a phrase and some instructions