Try to get mime data before hashing (cpu intensive)

[quix0rs-gnu-social.git] / actions / sitenoticeadminpanel.php

diff --git a/actions/sitenoticeadminpanel.php b/actions/sitenoticeadminpanel.php
index 145ae80d0766cbd7fd3d1ddaf71174e4b3e74a8b..72c9f9a1289486fde08783bc69e4e52c116d7250 100644 (file)
--- a/actions/sitenoticeadminpanel.php
+++ b/actions/sitenoticeadminpanel.php
@@ -27,11 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Update the site-wide notice text
@@ -114,13 +110,9 @@ class SitenoticeadminpanelAction extends AdminPanelAction
         }
 
         // scrub HTML input
-
-        $config = array(
-            'safe' => 1,
-            'deny_attribute' => 'id,style,on*'
-        );
-
-        $siteNotice = htmLawed($siteNotice, $config);
+        require_once INSTALLDIR.'/extlib/HTMLPurifier/HTMLPurifier.auto.php';
+        $purifier = new HTMLPurifier();
+        $siteNotice = $purifier->purify($siteNotice);
     }
 }