better regex

1 files changed, 5 insertions, 3 deletions

diff --git a/htmlpure/Filter/SafeIframe.php b/htmlpure/Filter/SafeIframe.php
index 370c89c..2b9a415 100644
--- a/htmlpure/Filter/SafeIframe.php
+++ b/htmlpure/Filter/SafeIframe.php
@@ -5,12 +5,14 @@ class HTMLPurifier_Filter_SafeIframe extends HTMLPurifier_Filter
     public $name = 'SafeIframe';
 
     public function preFilter($html, $config, $context) {
-        return preg_replace("/iframe/", "img class=\"SafeIframe\" ", preg_replace("/<\/iframe>/", "", $html));
+		$pre_regex = '#<iframe(.+?)>#';
+		$pre_replace = '<span class="safe-iframe">\1</span>';
+		return preg_replace($pre_regex, $pre_replace, preg_replace("/<\/iframe>/", "", $html));
     }
 
     public function postFilter($html, $config, $context) {
-       $post_regex = '#<img class="SafeIframe" ([^>]+)>#';
-        return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html);
+		$post_regex = '#<span class="safe-iframe">(.+?)</span>#';
+		return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html);
     }
 
     protected function postFilterCallback($matches) {