Allow CSS comments in customised skins. Bug 1369830

Change-Id: I0734ce56a2adee1659150c14f03659e261adde06

htdocs/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.PreserveCSS.txt

+Filter.ExtractStyleBlocks.PreserveCSS
+TYPE: bool
+VERSION: 3.1.0
+DEFAULT: false
+EXTERNAL: CSSTidy
+--DESCRIPTION--
+<p>
+  If it turns on, HTML Purifier will attempt to preserve CSS comments.
+</p>
+--# vim: et sw=4 sts=4

htdocs/lib/htmlpurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php

@@ -118,6 +118,9 @@ class HTMLPurifier_Filter_ExtractStyleBlocks extends HTMLPurifier_Filter
      */
     public function cleanCSS($css, $config, $context)
     {
+        if ($config->get('Filter.ExtractStyleBlocks.PreserveCSS')) {
+            $this->_tidy->set_cfg('preserve_css', true);
+        }
         // prepare scope
         $scope = $config->get('Filter.ExtractStyleBlocks.Scope');
         if ($scope !== null) {

htdocs/lib/htmlpurifier/README.Mahara

@@ -9,4 +9,4 @@ content.
 
 Changes:
 
-  * None
+  * Add the configuration directive Filter.ExtractStyleBlocks.PreserveCSS to allow the comments while cleaning CSS

htdocs/lib/web.php

@@ -3353,9 +3353,10 @@ function clean_html($text, $xhtml=false) {
  * http://stackoverflow.com/questions/3241616/sanitize-user-defined-css-in-php#5209050
  *
  * @param string $input_css
+ * @param string $preserve_css, if turns on the CSS comments will be preserved
  * @return string The cleaned CSS
  */
-function clean_css($input_css) {
+function clean_css($input_css, $preserve_css=false) {
     require_once('htmlpurifier/HTMLPurifier.auto.php');
     require_once('csstidy/class.csstidy.php');
 
@@ -3365,6 +3366,7 @@ function clean_css($input_css) {
     $config->set('Cache.SerializerPath', get_config('dataroot') . 'htmlpurifier');
 
     $config->set('Filter.ExtractStyleBlocks', true);
+    $config->set('Filter.ExtractStyleBlocks.PreserveCSS', $preserve_css);
 
     if (get_config('disableexternalresources')) {
         $config->set('URI.DisableExternalResources', true);

htdocs/skin/design.php

@@ -659,7 +659,7 @@ function designskinform_submit(Pieform $form, $values) {
     $skin['view_button_normal_color'] = $values['view_button_normal_color'];
     $skin['view_button_hover_color'] = $values['view_button_hover_color'];
     $skin['view_button_text_color'] = $values['view_button_text_color'];
-    $skin['view_custom_css'] = clean_css($values['view_custom_css']);
+    $skin['view_custom_css'] = clean_css($values['view_custom_css'], $preserve_css=true);
 
     $viewskin = array();
     $viewskin['id'] = $values['id'];

htdocs/skin/import.php

@@ -196,7 +196,7 @@ function importskinform_submit(Pieform $form, $values) {
         // Custom CSS element...
         $items = $skindata->getElementsByTagName('customcss');
         foreach ($items as $item) {
-            $skin['view_custom_css'] = clean_css(unserialize($item->getAttribute('contents')));
+            $skin['view_custom_css'] = clean_css(unserialize($item->getAttribute('contents')), $preserve_css=true);
         }
 
         // Image element...