Closes #833: Kses now built as module

git-svn-id: https://code.elgg.org/elgg/trunk@3222 36083f99-b078-4883-b0ff-0f9b5a30f544

23 files changed, 318 insertions, 285 deletions

diff --git a/actions/systemsettings/install.php b/actions/systemsettings/install.php
index a40049b8b..04dbe87e4 100644
--- a/actions/systemsettings/install.php
+++ b/actions/systemsettings/install.php
@@ -100,7 +100,8 @@
 				enable_plugin('updateclient', $site->getGUID());

 				enable_plugin('logbrowser', $site->getGUID());

 				enable_plugin('diagnostics', $site->getGUID());

-				enable_plugin('uservalidationbyemail', $site->getGUID());

+				enable_plugin('uservalidationbyemail', $site->getGUID());
+				enable_plugin('kses', $site->getGUID());

 			}

 				

 			// Now ping home

diff --git a/engine/lib/input.php b/engine/lib/input.php
index 5ac3ad618..1380860b8 100644
--- a/engine/lib/input.php
+++ b/engine/lib/input.php
@@ -67,39 +67,6 @@
 		else

 			$CONFIG->input[trim($variable)] = trim($value);

 			

-	}
-	
-	/**
-	 * Kses filtering of tags, called on a plugin hook
-	 *
-	 * @param mixed $var Variable to filter
-	 * @return mixed
-	 */
-	function kses_filter_tags($hook, $entity_type, $returnvalue, $params)
-	{
-		$return = $returnvalue;
-		$var = $returnvalue;
-		
-		if (@include_once(dirname(dirname(dirname(__FILE__)))) . "/vendors/kses/kses.php") {
-			
-			global $CONFIG;
-			
-			$allowedtags = $CONFIG->allowedtags; 
-			$allowedprotocols = $CONFIG->allowedprotocols;
-			
-			if (!is_array($var)) {
-				$return = "";
-				$return = kses($var, $allowedtags, $allowedprotocols);
-			} else {
-				$return = array();
-				
-				foreach($var as $key => $el) {
-					$return[$key] = kses($el, $allowedtags, $allowedprotocols);
-				}
-			}
-		}
-	
-		return $return;
 	}

 	

 	/**

@@ -247,257 +214,8 @@
 		        $_SERVER['PATH_TRANSLATED'] = stripslashes($_SERVER['PATH_TRANSLATED']);

 		    }

 		    

-		}

-		

-		

-		global $CONFIG;

-		$CONFIG->allowedtags = array(

-		'address' => array(),

-		'a' => array(

-			'class' => array (),

-			'href' => array (),

-			'id' => array (),

-			'title' => array (),

-			'rel' => array (),

-			'rev' => array (),

-			'name' => array (),

-			'target' => array()),

-		'abbr' => array(

-			'class' => array (),

-			'title' => array ()),

-		'acronym' => array(

-			'title' => array ()),

-		'b' => array(),

-		'big' => array(),

-		'blockquote' => array(

-			'id' => array (),

-			'cite' => array (),

-			'class' => array(),

-			'lang' => array(),

-			'xml:lang' => array()),

-		'br' => array (

-			'class' => array ()),

-		'button' => array(

-			'disabled' => array (),

-			'name' => array (),

-			'type' => array (),

-			'value' => array ()),

-		'caption' => array(

-			'align' => array (),

-			'class' => array ()),

-		'cite' => array (

-			'class' => array(),

-			'dir' => array(),

-			'lang' => array(),

-			'title' => array ()),

-		'code' => array (),

-//			'style' => array()),

-//		'col' => array(

-//			'align' => array (),

-//			'char' => array (),

-//			'charoff' => array (),

-//			'span' => array (),

-//			'dir' => array(),

-//			'style' => array (),

-//			'valign' => array (),

-//			'width' => array ()),

-		'del' => array(

-			'datetime' => array ()),

-		'dd' => array(),

-		'div' => array(

-			'align' => array (),

-			'class' => array (),

-			'dir' => array (),

-			'lang' => array(),

-//			'style' => array (),

-			'xml:lang' => array()),

-		'dl' => array(),

-		'dt' => array(),

-		'em' => array(),

-//		'fieldset' => array(),

-		'font' => array(

-			'color' => array (),

-			'face' => array (),

-			'size' => array ()),

-//		'form' => array(

-//			'action' => array (),

-//			'accept' => array (),

-//			'accept-charset' => array (),

-//			'enctype' => array (),

-//			'method' => array (),

-//			'name' => array (),

-//			'target' => array ()),

-		'h1' => array(

-			'align' => array (),

-			'class' => array ()),

-		'h2' => array(

-			'align' => array (),

-			'class' => array ()),

-		'h3' => array(

-			'align' => array (),

-			'class' => array ()),

-		'h4' => array(

-			'align' => array (),

-			'class' => array ()),

-		'h5' => array(

-			'align' => array (),

-			'class' => array ()),

-		'h6' => array(

-			'align' => array (),

-			'class' => array ()),

-		'hr' => array(

-			'align' => array (),

-			'class' => array (),

-			'noshade' => array (),

-			'size' => array (),

-			'width' => array ()),

-		'i' => array(),

-		'img' => array(

-			'alt' => array (),

-			'align' => array (),

-			'border' => array (),

-			'class' => array (),

-			'height' => array (),

-			'hspace' => array (),

-			'longdesc' => array (),

-			'vspace' => array (),

-			'src' => array (),

-//			'style' => array (),

-			'width' => array ()),

-		'ins' => array(

-			'datetime' => array (),

-			'cite' => array ()),

-		'kbd' => array(),

-		'label' => array(

-			'for' => array ()),

-		'legend' => array(

-			'align' => array ()),

-		'li' => array (

-			'align' => array (),

-			'class' => array ()),

-		'p' => array(

-			'class' => array (),

-			'align' => array (),

-			'dir' => array(),

-			'lang' => array(),

-//			'style' => array (),

-			'xml:lang' => array()),

-		'pre' => array(

-//			'style' => array(),

-			'width' => array ()),

-		'q' => array(

-			'cite' => array ()),

-		's' => array(),

-		'span' => array (

-			'class' => array (),

-			'dir' => array (),

-			'align' => array (),

-			'lang' => array (),

-//			'style' => array (),

-			'title' => array (),

-			'xml:lang' => array()),

-		'strike' => array(),

-		'strong' => array(),

-		'sub' => array(),

-		'sup' => array(),

-//		'table' => array(

-//			'align' => array (),

-//			'bgcolor' => array (),

-//			'border' => array (),

-//			'cellpadding' => array (),

-//			'cellspacing' => array (),

-//			'class' => array (),

-//			'dir' => array(),

-//			'id' => array(),

-//			'rules' => array (),

-//			'style' => array (),

-//			'summary' => array (),

-//			'width' => array ()),

-//		'tbody' => array(

-//			'align' => array (),

-//			'char' => array (),

-//			'charoff' => array (),

-//			'valign' => array ()),

-//		'td' => array(

-//			'abbr' => array (),

-//			'align' => array (),

-//			'axis' => array (),

-//			'bgcolor' => array (),

-//			'char' => array (),

-//			'charoff' => array (),

-//			'class' => array (),

-//			'colspan' => array (),

-//			'dir' => array(),

-//			'headers' => array (),

-//			'height' => array (),

-//			'nowrap' => array (),

-//			'rowspan' => array (),

-//			'scope' => array (),

-//			'style' => array (),

-//			'valign' => array (),

-//			'width' => array ()),

-//		'textarea' => array(

-//			'cols' => array (),

-//			'rows' => array (),

-//			'disabled' => array (),

-//			'name' => array (),

-//			'readonly' => array ()),

-//		'tfoot' => array(

-//			'align' => array (),

-//			'char' => array (),

-//			'class' => array (),

-//			'charoff' => array (),

-//			'valign' => array ()),

-//		'th' => array(

-//			'abbr' => array (),

-//			'align' => array (),

-//			'axis' => array (),

-//			'bgcolor' => array (),

-//			'char' => array (),

-//			'charoff' => array (),

-//			'class' => array (),

-//			'colspan' => array (),

-//			'headers' => array (),

-//			'height' => array (),

-//			'nowrap' => array (),

-//			'rowspan' => array (),

-//			'scope' => array (),

-//			'valign' => array (),

-//			'width' => array ()),

-//		'thead' => array(

-//			'align' => array (),

-//			'char' => array (),

-//			'charoff' => array (),

-//			'class' => array (),

-//			'valign' => array ()),

-		'title' => array(),

-//		'tr' => array(

-//			'align' => array (),

-//			'bgcolor' => array (),

-//			'char' => array (),

-//			'charoff' => array (),

-//			'class' => array (),

-//			'style' => array (),

-//			'valign' => array ()),

-		'tt' => array(),

-		'u' => array(),

-		'ul' => array (

-			'class' => array (),

-//			'style' => array (),

-			'type' => array ()),

-		'ol' => array (

-			'class' => array (),

-			'start' => array (),

-//			'style' => array (),

-			'type' => array ()),

-		'var' => array ());

+		}
 		

-		$CONFIG->allowedprotocols = array('http', 'https', 'ftp', 'news', 'mailto', 'rtsp', 'teamspeak', 'gopher', 'mms',

-                           'color', 'callto', 'cursor', 'text-align', 'font-size', 'font-weight', 'font-style', 

-                           'border', 'margin', 'padding', 'float');
-		
-		// For now, register the kses for processing
-		register_plugin_hook('validate', 'input', 'kses_filter_tags', 1);

 	}

 	

 	register_elgg_event_handler('init','system','input_init');

diff --git a/engine/lib/upgrades/2009041701.php b/engine/lib/upgrades/2009041701.php
new file mode 100644
index 000000000..609c7e569
--- /dev/null
+++ b/engine/lib/upgrades/2009041701.php
@@ -0,0 +1,10 @@
+<?php
+
+	global $CONFIG;
+	
+	/// Activate kses
+	/**
+	 * Elgg now has kses tag filtering built as a plugin. This needs to be enabled.
+	 */	
+	enable_plugin('kses', $CONFIG->site->guid);
+?>
\ No newline at end of file
diff --git a/mod/kses/start.php b/mod/kses/start.php
new file mode 100644
index 000000000..ed8a12e57
--- /dev/null
+++ b/mod/kses/start.php
@@ -0,0 +1,304 @@
+<?php
+	/**
+	 * Elgg kses tag filtering.
+	 * 
+	 * @package ElggKses
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2009
+	 * @link http://elgg.com/
+	 */
+
+	/**
+	 * Initialise kses
+	 *
+	 */
+	function kses_init()
+	{
+		/** For now declare allowed tags and protocols here, TODO: Make this configurable */
+		global $CONFIG;
+		$CONFIG->kses_allowedtags = array(
+		'address' => array(),
+		'a' => array(
+			'class' => array (),
+			'href' => array (),
+			'id' => array (),
+			'title' => array (),
+			'rel' => array (),
+			'rev' => array (),
+			'name' => array (),
+			'target' => array()),
+		'abbr' => array(
+			'class' => array (),
+			'title' => array ()),
+		'acronym' => array(
+			'title' => array ()),
+		'b' => array(),
+		'big' => array(),
+		'blockquote' => array(
+			'id' => array (),
+			'cite' => array (),
+			'class' => array(),
+			'lang' => array(),
+			'xml:lang' => array()),
+		'br' => array (
+			'class' => array ()),
+		'button' => array(
+			'disabled' => array (),
+			'name' => array (),
+			'type' => array (),
+			'value' => array ()),
+		'caption' => array(
+			'align' => array (),
+			'class' => array ()),
+		'cite' => array (
+			'class' => array(),
+			'dir' => array(),
+			'lang' => array(),
+			'title' => array ()),
+		'code' => array (),
+//			'style' => array()),
+//		'col' => array(
+//			'align' => array (),
+//			'char' => array (),
+//			'charoff' => array (),
+//			'span' => array (),
+//			'dir' => array(),
+//			'style' => array (),
+//			'valign' => array (),
+//			'width' => array ()),
+		'del' => array(
+			'datetime' => array ()),
+		'dd' => array(),
+		'div' => array(
+			'align' => array (),
+			'class' => array (),
+			'dir' => array (),
+			'lang' => array(),
+//			'style' => array (),
+			'xml:lang' => array()),
+		'dl' => array(),
+		'dt' => array(),
+		'em' => array(),
+//		'fieldset' => array(),
+		'font' => array(
+			'color' => array (),
+			'face' => array (),
+			'size' => array ()),
+//		'form' => array(
+//			'action' => array (),
+//			'accept' => array (),
+//			'accept-charset' => array (),
+//			'enctype' => array (),
+//			'method' => array (),
+//			'name' => array (),
+//			'target' => array ()),
+		'h1' => array(
+			'align' => array (),
+			'class' => array ()),
+		'h2' => array(
+			'align' => array (),
+			'class' => array ()),
+		'h3' => array(
+			'align' => array (),
+			'class' => array ()),
+		'h4' => array(
+			'align' => array (),
+			'class' => array ()),
+		'h5' => array(
+			'align' => array (),
+			'class' => array ()),
+		'h6' => array(
+			'align' => array (),
+			'class' => array ()),
+		'hr' => array(
+			'align' => array (),
+			'class' => array (),
+			'noshade' => array (),
+			'size' => array (),
+			'width' => array ()),
+		'i' => array(),
+		'img' => array(
+			'alt' => array (),
+			'align' => array (),
+			'border' => array (),
+			'class' => array (),
+			'height' => array (),
+			'hspace' => array (),
+			'longdesc' => array (),
+			'vspace' => array (),
+			'src' => array (),
+//			'style' => array (),
+			'width' => array ()),
+		'ins' => array(
+			'datetime' => array (),
+			'cite' => array ()),
+		'kbd' => array(),
+		'label' => array(
+			'for' => array ()),
+		'legend' => array(
+			'align' => array ()),
+		'li' => array (
+			'align' => array (),
+			'class' => array ()),
+		'p' => array(
+			'class' => array (),
+			'align' => array (),
+			'dir' => array(),
+			'lang' => array(),
+//			'style' => array (),
+			'xml:lang' => array()),
+		'pre' => array(
+//			'style' => array(),
+			'width' => array ()),
+		'q' => array(
+			'cite' => array ()),
+		's' => array(),
+		'span' => array (
+			'class' => array (),
+			'dir' => array (),
+			'align' => array (),
+			'lang' => array (),
+//			'style' => array (),
+			'title' => array (),
+			'xml:lang' => array()),
+		'strike' => array(),
+		'strong' => array(),
+		'sub' => array(),
+		'sup' => array(),
+//		'table' => array(
+//			'align' => array (),
+//			'bgcolor' => array (),
+//			'border' => array (),
+//			'cellpadding' => array (),
+//			'cellspacing' => array (),
+//			'class' => array (),
+//			'dir' => array(),
+//			'id' => array(),
+//			'rules' => array (),
+//			'style' => array (),
+//			'summary' => array (),
+//			'width' => array ()),
+//		'tbody' => array(
+//			'align' => array (),
+//			'char' => array (),
+//			'charoff' => array (),
+//			'valign' => array ()),
+//		'td' => array(
+//			'abbr' => array (),
+//			'align' => array (),
+//			'axis' => array (),
+//			'bgcolor' => array (),
+//			'char' => array (),
+//			'charoff' => array (),
+//			'class' => array (),
+//			'colspan' => array (),
+//			'dir' => array(),
+//			'headers' => array (),
+//			'height' => array (),
+//			'nowrap' => array (),
+//			'rowspan' => array (),
+//			'scope' => array (),
+//			'style' => array (),
+//			'valign' => array (),
+//			'width' => array ()),
+//		'textarea' => array(
+//			'cols' => array (),
+//			'rows' => array (),
+//			'disabled' => array (),
+//			'name' => array (),
+//			'readonly' => array ()),
+//		'tfoot' => array(
+//			'align' => array (),
+//			'char' => array (),
+//			'class' => array (),
+//			'charoff' => array (),
+//			'valign' => array ()),
+//		'th' => array(
+//			'abbr' => array (),
+//			'align' => array (),
+//			'axis' => array (),
+//			'bgcolor' => array (),
+//			'char' => array (),
+//			'charoff' => array (),
+//			'class' => array (),
+//			'colspan' => array (),
+//			'headers' => array (),
+//			'height' => array (),
+//			'nowrap' => array (),
+//			'rowspan' => array (),
+//			'scope' => array (),
+//			'valign' => array (),
+//			'width' => array ()),
+//		'thead' => array(
+//			'align' => array (),
+//			'char' => array (),
+//			'charoff' => array (),
+//			'class' => array (),
+//			'valign' => array ()),
+		'title' => array(),
+//		'tr' => array(
+//			'align' => array (),
+//			'bgcolor' => array (),
+//			'char' => array (),
+//			'charoff' => array (),
+//			'class' => array (),
+//			'style' => array (),
+//			'valign' => array ()),
+		'tt' => array(),
+		'u' => array(),
+		'ul' => array (
+			'class' => array (),
+//			'style' => array (),
+			'type' => array ()),
+		'ol' => array (
+			'class' => array (),
+			'start' => array (),
+//			'style' => array (),
+			'type' => array ()),
+		'var' => array ());
+		
+		$CONFIG->kses_allowedprotocols = array('http', 'https', 'ftp', 'news', 'mailto', 'rtsp', 'teamspeak', 'gopher', 'mms',
+                           'color', 'callto', 'cursor', 'text-align', 'font-size', 'font-weight', 'font-style', 
+                           'border', 'margin', 'padding', 'float');
+		
+		register_plugin_hook('validate', 'input', 'kses_filter_tags', 1);
+	}
+	
+	/**
+	 * Kses filtering of tags, called on a plugin hook
+	 *
+	 * @param mixed $var Variable to filter
+	 * @return mixed
+	 */
+	function kses_filter_tags($hook, $entity_type, $returnvalue, $params)
+	{
+		$return = $returnvalue;
+		$var = $returnvalue;
+		
+		if (@include_once(dirname(__FILE__) . "/vendors/kses/kses.php")) {
+			
+			global $CONFIG;
+			
+			$allowedtags = $CONFIG->kses_allowedtags; 
+			$allowedprotocols = $CONFIG->kses_allowedprotocols;
+			
+			if (!is_array($var)) {
+				$return = "";
+				$return = kses($var, $allowedtags, $allowedprotocols);
+			} else {
+				$return = array();
+				
+				foreach($var as $key => $el) {
+					$return[$key] = kses($el, $allowedtags, $allowedprotocols);
+				}
+			}
+		}
+	
+		return $return;
+	}
+	
+	
+	register_elgg_event_handler('init','system','kses_init');
+        
+?>
\ No newline at end of file
diff --git a/vendors/kses/AUTHORS b/mod/kses/vendors/kses/AUTHORS
index 2e034090f..2e034090f 100644
--- a/vendors/kses/AUTHORS
+++ b/mod/kses/vendors/kses/AUTHORS
diff --git a/vendors/kses/COPYING b/mod/kses/vendors/kses/COPYING
index d60c31a97..d60c31a97 100644
--- a/vendors/kses/COPYING
+++ b/mod/kses/vendors/kses/COPYING
diff --git a/vendors/kses/ChangeLog b/mod/kses/vendors/kses/ChangeLog
index 7102396ce..7102396ce 100644
--- a/vendors/kses/ChangeLog
+++ b/mod/kses/vendors/kses/ChangeLog
diff --git a/vendors/kses/README b/mod/kses/vendors/kses/README
index 192524c9f..192524c9f 100644
--- a/vendors/kses/README
+++ b/mod/kses/vendors/kses/README
diff --git a/vendors/kses/TODO b/mod/kses/vendors/kses/TODO
index 93652d46a..93652d46a 100644
--- a/vendors/kses/TODO
+++ b/mod/kses/vendors/kses/TODO
diff --git a/vendors/kses/docs/attribute-value-checks b/mod/kses/vendors/kses/docs/attribute-value-checks
index 8b0d645ee..8b0d645ee 100644
--- a/vendors/kses/docs/attribute-value-checks
+++ b/mod/kses/vendors/kses/docs/attribute-value-checks
diff --git a/vendors/kses/docs/hooks b/mod/kses/vendors/kses/docs/hooks
index 971ff1ca4..971ff1ca4 100644
--- a/vendors/kses/docs/hooks
+++ b/mod/kses/vendors/kses/docs/hooks
diff --git a/vendors/kses/docs/stripping-everything b/mod/kses/vendors/kses/docs/stripping-everything
index f11742b7c..f11742b7c 100644
--- a/vendors/kses/docs/stripping-everything
+++ b/mod/kses/vendors/kses/docs/stripping-everything
diff --git a/vendors/kses/docs/supported-formats b/mod/kses/vendors/kses/docs/supported-formats
index c0a9d9740..c0a9d9740 100644
--- a/vendors/kses/docs/supported-formats
+++ b/mod/kses/vendors/kses/docs/supported-formats
diff --git a/vendors/kses/docs/whitelisted-url-protocols b/mod/kses/vendors/kses/docs/whitelisted-url-protocols
index a0032c4cc..a0032c4cc 100644
--- a/vendors/kses/docs/whitelisted-url-protocols
+++ b/mod/kses/vendors/kses/docs/whitelisted-url-protocols
diff --git a/vendors/kses/examples/filter.php b/mod/kses/vendors/kses/examples/filter.php
index 9a026795b..9a026795b 100644
--- a/vendors/kses/examples/filter.php
+++ b/mod/kses/vendors/kses/examples/filter.php
diff --git a/vendors/kses/examples/test.php b/mod/kses/vendors/kses/examples/test.php
index e0c6695c8..e0c6695c8 100644
--- a/vendors/kses/examples/test.php
+++ b/mod/kses/vendors/kses/examples/test.php
diff --git a/vendors/kses/kses.php b/mod/kses/vendors/kses/kses.php
index 65da29599..65da29599 100644
--- a/vendors/kses/kses.php
+++ b/mod/kses/vendors/kses/kses.php
diff --git a/vendors/kses/oop/oop.kses.changelog.txt b/mod/kses/vendors/kses/oop/oop.kses.changelog.txt
index a82daf4fe..a82daf4fe 100644
--- a/vendors/kses/oop/oop.kses.changelog.txt
+++ b/mod/kses/vendors/kses/oop/oop.kses.changelog.txt
diff --git a/vendors/kses/oop/oop.simple.api.txt b/mod/kses/vendors/kses/oop/oop.simple.api.txt
index 144308a93..144308a93 100644
--- a/vendors/kses/oop/oop.simple.api.txt
+++ b/mod/kses/vendors/kses/oop/oop.simple.api.txt
diff --git a/vendors/kses/oop/php4.class.kses.php b/mod/kses/vendors/kses/oop/php4.class.kses.php
index acb06cc59..acb06cc59 100644
--- a/vendors/kses/oop/php4.class.kses.php
+++ b/mod/kses/vendors/kses/oop/php4.class.kses.php
diff --git a/vendors/kses/oop/php5.class.kses.php b/mod/kses/vendors/kses/oop/php5.class.kses.php
index 541f1bd1e..541f1bd1e 100644
--- a/vendors/kses/oop/php5.class.kses.php
+++ b/mod/kses/vendors/kses/oop/php5.class.kses.php
diff --git a/vendors/kses/oop/test.oop.kses.php b/mod/kses/vendors/kses/oop/test.oop.kses.php
index 8c6e885d8..8c6e885d8 100644
--- a/vendors/kses/oop/test.oop.kses.php
+++ b/mod/kses/vendors/kses/oop/test.oop.kses.php
diff --git a/version.php b/version.php
index 7c172bca4..ac4b1dad3 100644
--- a/version.php
+++ b/version.php
@@ -13,7 +13,7 @@
 	 * @link http://elgg.org/

 	 */

 
-	   $version = 2009041502;  // YYYYMMDD   = Elgg Date
+	   $version = 2009041701;  // YYYYMMDD   = Elgg Date
 	                           //         XX = Interim incrementer

 	

 	   $release = '1.5';    // Human-friendly version name