stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-19 19:09:13 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move HTMLPurifier from core to contrib and make it optional. Delete the modules/gallery/lib and HTMLPurifier.php

Browse Source
This commit is contained in:
Tim Almdal
2009-09-02 07:06:28 -07:00
parent dc6167bffa
commit 7fbd012d71
324 changed files with 16 additions and 24253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/gallery/libraries/SafeString.php
View File

@@ -83,7 +83,7 @@ class SafeString_Core {
* Safe for use in HTML.
*
* Example:<pre>
* <div><?= $php_var ?>
* <div><?= $php_var ?>
* </pre>
* @return the string escaped for use in HTML.
*/
@@ -128,7 +128,7 @@ class SafeString_Core {
* Safe for use HTML (purified HTML)
*
* Example:<pre>
* <div><?= $php_var->purified_html() ?>
* <div><?= $php_var->purified_html() ?>
* </pre>
* @return the string escaped for use in HTML.
*/
@@ -154,16 +154,22 @@ class SafeString_Core {
// Purifies the string, removing any potentially malicious or unsafe HTML / JavaScript.
private static function _purify_for_html($dirty_html) {
if (empty(self::$_purifier)) {
require_once(dirname(__file__) . "/../lib/HTMLPurifier/HTMLPurifier.auto.php");
$config = HTMLPurifier_Config::createDefault();
foreach (Kohana::config('purifier') as $category => $key_value) {
foreach ($key_value as $key => $value) {
$config->set("$category.$key", $value);
if (module::is_active("htmlpurifier")) {
if (empty(self::$_purifier)) {
require_once(MODPATH . "htmlpurifier/lib/HTMLPurifier/HTMLPurifier.auto.php");
$config = HTMLPurifier_Config::createDefault();
foreach (Kohana::config('purifier') as $category => $key_value) {
foreach ($key_value as $key => $value) {
$config->set("$category.$key", $value);
}
}
self::$_purifier = new HTMLPurifier($config);
}
self::$_purifier = new HTMLPurifier($config);
Kohana::log("error", "Purify: " . $dirty_html);
return self::$_purifier->purify($dirty_html);
} else {
Kohana::log("error", "revert to clean: " . $dirty_html);
return self::_escape_for_html($dirty_html);
}
return self::$_purifier->purify($dirty_html);
}
}