Releasing 1.2.2

Author: technicalguru

composer.json

@@ -15,7 +15,8 @@
 	"require" : {
 		"php" : ">=7.0.0",
 		"ext-mbstring" : "*",
-		"technicalguru/i18n" : "~1"
+		"technicalguru/i18n" : "~1",
+        "ezyang/htmlpurifier":"^4.13"
 	},
 	"autoload" : {
 		"psr-4" : {

src/TgUtils/AbstractStringFilter.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace TgUtils;
+
+/**
+ * Abstract string filter that traverses objects and arrays.
+ */
+abstract class AbstractStringFilter implements StringFilter {
+
+	public function __construct() {
+	}
+
+	/**
+	 * Filters the given string and returns sanitized value.
+	 * @param string $s - string to sanitize (can be null)
+	 * @return the sanitized string.
+	 */
+	public function filter($s) {
+		if ($s == NULL) return $s;
+		if (is_string($s)) {
+			return $this->filterString($s);
+		} else if (is_array($s)) {
+			foreach ($s AS $key => $value) {
+				$s[$key] = $this->filter($value);
+			}
+		} else if (is_object($s)) {
+			foreach (get_object_vars($s) AS $name => $value) {
+				$s->$name = $this->filter($value);
+			}
+		}
+		return $s;
+	}
+
+	protected function filterString($s) {
+		return $s;
+	}
+}
+

src/TgUtils/DummyStringFilter.php

@@ -1,25 +1,25 @@
 <?php
 
-package TgUtils;
+namespace TgUtils;
 
 /**
  * An interface for not filtering string at all.
  */
-public class DummyStringFilter implements StringFilter {
+class DummyStringFilter implements StringFilter {
 
-	public static $INSTANCE = new DummyStringFilter();
+	public static $INSTANCE;
 
-	public __construct() {
+	public function __construct() {
 	}
 
 	/**
 	 * Filters the given string and returns sanitized value.
 	 * @param string $s - string to sanitize (can be null)
 	 * @return the sanitized string.
 	 */
-	public filter($s) {
+	public function filter($s) {
 		return $s;
 	}
 
 }
-
+DummyStringFilter::$INSTANCE = new DummyStringFilter();

src/TgUtils/NoHtmlStringFilter.php

@@ -1,26 +1,21 @@
 <?php
 
-package TgUtils;
+namespace TgUtils;
 
 /**
  * An interface for filter strings from any HTML tags.
  */
-public class NoHtmlStringFilter implements StringFilter {
+class NoHtmlStringFilter extends AbstractStringFilter {
 
-	public static $INSTANCE = new NoHtmlStringFilter();
+	public static $INSTANCE;
 
-	public __construct() {
+	public function __construct() {
+		parent::__construct();
 	}
 
-	/**
-	 * Filters the given string and returns sanitized value.
-	 * @param string $s - string to sanitize (can be null)
-	 * @return the sanitized string.
-	 */
-	public filter($s) {
-		if ($s == NULL) return $s;
+	protected function filterString($s) {
 		return strip_tags($s);
 	}
-
 }
+NoHtmlStringFilter::$INSTANCE = new NoHtmlStringFilter();
 

src/TgUtils/PurifierStringFilter.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace TgUtils;
+
+class PurifierStringFilter extends AbstractStringFilter {
+
+	public static $INSTANCE;
+
+	protected $purifier;
+
+	public function __construct() {
+		parent::__construct();
+		$config = $this->getConfig();
+		$this->purifier = new \HTMLPurifier($config);
+	}
+
+	public function filterString($s) {
+		return $this->purifier->purify($s);
+	}
+
+	protected function getConfig() {
+		$config = \HTMLPurifier_Config::createDefault();
+		$config->set('HTML.DefinitionID', 'simple');
+		$config->set('HTML.DefinitionRev', 1);
+		$config->set('HTML.AllowedElements', array('br', 'p', 'div', 'li', 'ol', 'ul', 'i', 'b', 'strong', 'a', 'h4', 'h5','table','tr','td','th'));
+		$config->set('HTML.AllowedAttributes', array(
+			'a.href', 'a.class', 'a.style', 
+			'p.style', 'div.style', 
+			'li.style', 'ol.style', 'ul.style', 
+			'i.style', 'b.style', 'strong.style', 
+			'h4.style', 'h5.style',
+			'table.style','table.class','tr.style','td.colspan','td.rowspan','td.style','th.colspan','th.rowspan','th.style','tr.class','td.class',
+		));
+		return $config;
+	}
+}
+PurifierStringFilter::$INSTANCE = new PurifierStringFilter();
+

src/TgUtils/Request.php

@@ -193,7 +193,7 @@ public function hasGetParam($key) {
 	 */
 	public function getGetParam($key, $default = NULL, $filter = NULL) {
 		$params = $this->getParams;
-		if ($filter == NULL) $filter = StringFilters::$NO_HTML;
+		if ($filter == NULL) $filter = NoHtmlStringFilter::$INSTANCE;
 		return isset($params[$key]) ? $filter->filter($params[$key]) : $default;
 	}
 
@@ -223,7 +223,7 @@ public function hasPostParam($key) {
 	 */
 	public function getPostParam($key, $default = NULL, $filter = NULL) {
 		$params = $this->getPostParams();
-		if ($filter == NULL) $filter = StringFilters::$NO_HTML;
+		if ($filter == NULL) $filter = NoHtmlStringFilter::$INSTANCE;
 		return isset($params[$key]) ? $filter->filter($params[$key]) : $default;
 	}
 

src/TgUtils/StringFilter.php

@@ -1,18 +1,18 @@
 <?php
 
-package TgUtils;
+namespace TgUtils;
 
 /**
  * An interface for filter strings from evil input.
  */
-public interface StringFilter {
+interface StringFilter {
 
 	/**
 	 * Filters the given string and returns sanitized value.
 	 * @param string $s - string to sanitize (can be null)
 	 * @return the sanitized string.
 	 */
-	public filter($s);
+	public function filter($s);
 
 }
 

src/TgUtils/StringFilters.php

@@ -1,14 +1,18 @@
 <?php
 
-package TgUtils;
+namespace TgUtils;
 
 /**
  * Provides default string filters.
  */
-public class StringFilters {
+class StringFilters {
 
-	public static $DUMMY   = DummyStringFilter::$INSTANCE;
-	public static $NO_HTML = NoHtmlStringFilter::$INSTANCE;
+	public static $DUMMY;
+	public static $NO_HTML;
+	public static $TEXTBOX;
 
 }
+StringFilters::$DUMMY   = DummyStringFilter::$INSTANCE;
+StringFilters::$NO_HTML = NoHtmlStringFilter::$INSTANCE;
+StringFilters::$TEXTBOX = PurifierStringFilter::$INSTANCE;