From 3bb7424f9d66d73cf2cc3f72a0a2ea7a6db9f889 Mon Sep 17 00:00:00 2001
From: nuxsmin <nuxsmin@syspass.org>
Date: Sat, 25 Apr 2015 11:20:37 +0200
Subject: [PATCH] * Fixed javascript compression behaviour with zlib module.
 Thanks to @tejadon * Fixed javascript header * Fixed UI on installation
 template style

---
 CHANGELOG          |  7 +++++++
 CHANGELOG-ES       |  6 ++++++
 css/styles.css     |  4 ++++
 inc/util.class.php | 19 +++++++++++++++----
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7d7cda5c..0ca5f687 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,11 @@
+=== ** v1.1.2.21 ===
+
+* Fixed javascript compression behaviour with zlib module. Thanks to @tejadon
+* Fixed javascript header
+* Fixed UI on installation template style
+
 === ** v1.1.2.20 ===
+
 * Added database connection port
 * Fixed some UI errors
 * Fixed error recursion on database connection error (needs more testing)
diff --git a/CHANGELOG-ES b/CHANGELOG-ES
index 077714d7..ad502793 100644
--- a/CHANGELOG-ES
+++ b/CHANGELOG-ES
@@ -1,3 +1,9 @@
+=== ** v1.1.2.21 ===
+
+* Corregido conflicto con módulo de compresión zlib. Gracias a @tejadon
+* Corregida cabecera javascript
+* Corregido estilo de la plantilla de instalación
+
 === ** v1.1.2.20 ===
 
 * Añadido puerto de conexión a la base de datos
diff --git a/css/styles.css b/css/styles.css
index f6388681..18d88ff7 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -1734,6 +1734,10 @@ fieldset.warning a {
     text-align: left;
 }
 
+#actions.installer form fieldset{
+    border: none;
+}
+
 #actions.installer form legend {
     text-align: left;
     border-bottom: 1px solid #DFDFDF;
diff --git a/inc/util.class.php b/inc/util.class.php
index c907ab28..221398ed 100644
--- a/inc/util.class.php
+++ b/inc/util.class.php
@@ -276,7 +276,7 @@ class SP_Util
      */
     public static function getVersion($retBuild = false)
     {
-        $build = '20';
+        $build = '21';
         $version = array(1, 1, 2);
 
         if ($retBuild) {
@@ -532,14 +532,15 @@ class SP_Util
         $path = SP_Init::$SERVERROOT . DIRECTORY_SEPARATOR;
 
         if ($type == 'js') {
-            header("Content-type: application/x-javascript; charset: UTF-8");
+            header("Content-type: application/javascript; charset: UTF-8");
         } elseif ($type == 'css') {
             header("Content-type: text/css; charset: UTF-8");
         }
 
         flush();
-//        ob_start('ob_gzhandler');
-        if(!ob_start("ob_gzhandler")) ob_start();
+        if(self::checkZlib() || !ob_start("ob_gzhandler")) {
+            ob_start();
+        }
 
         foreach ($files as $file) {
             $filePath = $path . $file['href'];
@@ -679,4 +680,14 @@ class SP_Util
         });
         return $array;
     }
+
+    /**
+     * Comprobar si la salida comprimida en con zlib está activada.
+     * No es compatible con ob_gzhandler()
+     *
+     * @return bool
+     */
+    public static function checkZlib(){
+        return self::boolval(ini_get('zlib.output_compression'));
+    }
 }
\ No newline at end of file