* [FIX] Fixed issue when installing sysPass. Solves #272

* [FIX] Fixed issue when retrieving HTTP headers on non-Apache environments.
nuxsmin · Sep 17, 2016 · 5b6232c · 5b6232c
1 parent ad20454
commit 5b6232c
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+=== ** v1.2.0.14 ===
+
+* [FIX] Fixed issue when installing sysPass. Solves #272
+* [FIX] Fixed issue when retrieving HTTP headers on non-Apache environments.
+
 === ** v1.2.0.13 ===
 
 * [FIX] Fixed issue when pressing copy-to-clipboard icon.

diff --git a/CHANGELOG-ES b/CHANGELOG-ES
@@ -1,3 +1,8 @@
+=== ** v1.2.0.14 ===
+
+* [FIX] Corregido error en la instalación de sysPass. Solves #272
+* [FIX] Corregido error al obtener las cabeceras HTTP en entornos no-Apache.
+
 === ** v1.2.0.13 ===
 
 * [FIX] Corregido error cuando se pulsaba el icono de copiar a portapapeles.

diff --git a/inc/Installer.class.php b/inc/Installer.class.php
@@ -316,8 +316,7 @@ private static function createDBUser()
             $query = 'CREATE USER `' . self::$_dbuser . '`@`' . self::getAdminHost() . '`';
         } else {
             $query = 'CREATE USER `' . self::$_dbuser . '`@`' . self::getAdminHost() . '`' .
-                ' IDENTIFIED WITH mysql_native_password' .
-                ' BY \'' . self::$_dbpass . '\'';
+                ' IDENTIFIED BY \'' . self::$_dbpass . '\'';
         }
 
         try {

diff --git a/inc/Request.class.php b/inc/Request.class.php
@@ -159,10 +159,15 @@ public static function getRequestHeaders($header = '')
     {
         if (!function_exists('\apache_request_headers')) {
             foreach ($_SERVER as $key => $value) {
-                if (substr($key, 0, 5) === 'HTTP_') {
-                    $key = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($key, 5)))));
-                    $headers[$key] = $value;
-                } else {
+                if (strpos($key, 'HTTP_') !== false) {
+                    $parts = explode('_', substr($key, 5));
+
+                    foreach ($parts as &$string) {
+                        $string = ucwords(strtolower($string));
+                    }
+
+                    $key = implode('-', $parts);
+
                     $headers[$key] = $value;
                 }
             }

diff --git a/inc/Util.class.php b/inc/Util.class.php
@@ -309,7 +309,7 @@ public static function curlIsAvailable()
      */
     public static function getVersion($retBuild = false)
     {
-        $version = array(1, 2, 0, '13');
+        $version = array(1, 2, 0, '14');
 
         if (!$retBuild) {
             array_pop($version);