[Fmsystem-commits] [14840] force purify on html

[Sigurd Nes]

Revision: 14840
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14840
Author:   sigurdne
Date:     2016-03-16 08:30:00 +0000 (Wed, 16 Mar 2016)
Log Message:
-----------
force purify on html

Modified Paths:
--------------
    trunk/admin/templates/base/config.tpl
    trunk/phpgwapi/inc/class.phpgw.inc.php

Modified: trunk/admin/templates/base/config.tpl
===================================================================
--- trunk/admin/templates/base/config.tpl       2016-03-15 12:57:03 UTC (rev 
14839)
+++ trunk/admin/templates/base/config.tpl       2016-03-16 08:30:00 UTC (rev 
14840)
@@ -274,15 +274,6 @@
        </select>
     </td>
    </tr>
-   <tr class="pure-table-odd">
-    <td>{lang_use_HTML_Filtering}:<br>
-    <td>
-     <select name="newsettings[html_filtering]">
-      <option value="" {selected_html_filtering_}>NO</option>
-      <option value="1" {selected_html_filtering_1}>YES</option>
-     </select>
-    </td>
-   </tr>
    <tr>
                <td>{lang_support_email_address}:</td>
                <td>

Modified: trunk/phpgwapi/inc/class.phpgw.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.phpgw.inc.php      2016-03-15 12:57:03 UTC (rev 
14839)
+++ trunk/phpgwapi/inc/class.phpgw.inc.php      2016-03-16 08:30:00 UTC (rev 
14840)
@@ -145,12 +145,6 @@
                 */
                public static function clean_html($html, $base_url = '')
                {
-                       if ( 
!isset($GLOBALS['phpgw_info']['server']['html_filtering']) 
-                               || 
!$GLOBALS['phpgw_info']['server']['html_filtering'])
-                       {
-                               return $html;
-                       }
-                       
                        if ( !$base_url )
                        {
                                $base_url = 
$GLOBALS['phpgw_info']['server']['webserver_url'];