From b6e5bf6eaade677187f99182e7face7c4b711bec Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 3 Jul 2009 12:56:29 -0700
Subject: Fix for ticket #400: Add HTMLPurifier to gallery3 and change
 p::clean() to call HTMLPurifier->purify()

---
 modules/gallery/libraries/HtmlPurifier.php | 43 ++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 modules/gallery/libraries/HtmlPurifier.php

(limited to 'modules/gallery/libraries/HtmlPurifier.php')

diff --git a/modules/gallery/libraries/HtmlPurifier.php b/modules/gallery/libraries/HtmlPurifier.php
new file mode 100644
index 00000000..f9d5353b
--- /dev/null
+++ b/modules/gallery/libraries/HtmlPurifier.php
@@ -0,0 +1,43 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class HtmlPurifier_Core {
+  private static $_instance;
+
+  public function __construct($name = NULL, $data = NULL, $type = NULL) {
+    parent::__construct($name, $data, $type);
+    $this->set_global("csrf", access::csrf_token());
+  }
+
+  static function instance($config=null) {
+    require_once(dirname(__file__) . "/HTMLPurifier/HTMLPurifier.auto.php");
+    if (self::$_instance == NULL) {
+      $config = isset($config) ? $config : Kohana::config('purifier');
+      $purifier_config = HTMLPurifier_Config::createDefault();
+      foreach ($config as $category => $key_value) {
+        foreach ($key_value as $key => $value) {
+          $purifier_config->set("$category.$key", $value);
+        }
+      }
+      self::$_instance = new HtmlPurifier($purifier_config);
+    }
+
+    return self::$_instance;
+  }
+}
-- 
cgit v1.2.3


From 94e33c821f28601b60d51581c632ba1e10288298 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 14 Jul 2009 06:42:50 -0700
Subject: Removed unnecessary contructor from the HTMLPurifier.php library
 class

---
 modules/gallery/libraries/HtmlPurifier.php | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'modules/gallery/libraries/HtmlPurifier.php')

diff --git a/modules/gallery/libraries/HtmlPurifier.php b/modules/gallery/libraries/HtmlPurifier.php
index f9d5353b..daa5896e 100644
--- a/modules/gallery/libraries/HtmlPurifier.php
+++ b/modules/gallery/libraries/HtmlPurifier.php
@@ -20,11 +20,6 @@
 class HtmlPurifier_Core {
   private static $_instance;
 
-  public function __construct($name = NULL, $data = NULL, $type = NULL) {
-    parent::__construct($name, $data, $type);
-    $this->set_global("csrf", access::csrf_token());
-  }
-
   static function instance($config=null) {
     require_once(dirname(__file__) . "/HTMLPurifier/HTMLPurifier.auto.php");
     if (self::$_instance == NULL) {
-- 
cgit v1.2.3