Merging in latest from upstream (ZP/z-push:refs/heads/develop)

* commit '179d735c':
  ZP-77 Add BASE_PATH to the policies file, fixed typo.
  ZP-864 Cleaning up code for Seb.
  ZP-864 User with umlauts in user name is not able to login in Outlook.
  ZP-77 use policies.ini from z-push directory.

src/config.php

@@ -144,7 +144,7 @@
     define('LOOSE_PROVISIONING', false);
 
     // The file containing the policies' settings.
-    define('PROVISIONING_POLICYFILE', '/etc/z-push/policies.ini');
+    define('PROVISIONING_POLICYFILE', BASE_PATH . 'policies.ini');
 
     // Default conflict preference
     // Some devices allow to set if the server or PIM (mobile)

src/lib/core/asdevice.php

@@ -63,7 +63,7 @@ class ASDevice extends StateObject {
                                     'lastupdatetime' => 0,
                                     'conversationmode' => false,
                                     'policyhash' => false,
-                                    'policyname' > self::DEFAULTPOLICYNAME,
+                                    'policyname' => self::DEFAULTPOLICYNAME,
                                     'policykey' => self::UNDEFINED,
                                     'forcesave' => false,
                                     'asversion' => false,

src/lib/request/request.php

@@ -250,6 +250,29 @@ class Request {
                 ZLog::Write(LOGLEVEL_INFO, sprintf("'X-Forwarded-for' indicates remote IP: %s", self::$remoteAddr));
             }
         }
+
+        // Mobile devices send Authorization header using UTF-8 charset. Outlook sends it using ISO-8859-1 encoding.
+        // For the successful authentication the user and password must be UTF-8 encoded. Try to determine which
+        // charset was sent by the client and convert it to UTF-8. See https://jira.z-hub.io/browse/ZP-864.
+        if (isset($_SERVER['PHP_AUTH_USER'])) {
+            $encoding = mb_detect_encoding(self::$authUser, "UTF-8, ISO-8859-1");
+            if (!$encoding) {
+                $encoding = mb_detect_encoding(self::$authUser, Utils::GetAvailableCharacterEncodings());
+                if ($encoding) {
+                    ZLog::Write(LOGLEVEL_WARN,
+                            sprintf("Request->ProcessHeaders(): mb_detect_encoding detected '%s' charset. This charset is not in the default detect list. Please report it to Z-Push developers.",
+                                    $encoding));
+                }
+                else {
+                    ZLog::Write(LOGLEVEL_ERROR, "Request->ProcessHeaders(): mb_detect_encoding failed to detect the Authorization header charset. It's possible that user won't be able to login.");
+                }
+            }
+            if ($encoding) {
+                ZLog::Write(LOGLEVEL_DEBUG, sprintf("Request->ProcessHeaders(): mb_detect_encoding detected '%s' charset. Authorization header will be converted to UTF-8 from it.", $encoding));
+                self::$authUser = mb_convert_encoding(self::$authUser, "UTF-8", $encoding);
+                self::$authPassword = mb_convert_encoding(self::$authPassword, "UTF-8", $encoding);
+            }
+        }
     }
 
     /**

src/lib/utils/utils.php

@@ -994,6 +994,97 @@ class Utils {
         $pow = pow(1024, $base - $fBase);
         return sprintf ("%.{$precision}f %s", $pow, $units[$fBase]);
     }
+
+    public static function GetAvailableCharacterEncodings() {
+        return array(
+                'UCS-4',
+                'UCS-4BE',
+                'UCS-4LE',
+                'UCS-2',
+                'UCS-2BE',
+                'UCS-2LE',
+                'UTF-32',
+                'UTF-32BE',
+                'UTF-32LE',
+                'UTF-16',
+                'UTF-16BE',
+                'UTF-16LE',
+                'UTF-7',
+                'UTF7-IMAP',
+                'UTF-8',
+                'ASCII',
+                'EUC-JP',
+                'SJIS',
+                'eucJP-win',
+                'SJIS-win',
+                'ISO-2022-JP',
+                'ISO-2022-JP-MS',
+                'CP932',
+                'CP51932',
+                'SJIS-mac',
+                'MacJapanese',
+                'SJIS-Mobile#DOCOMO',
+                'SJIS-DOCOMO',
+                'SJIS-Mobile#KDDI',
+                'SJIS-KDDI',
+                'SJIS-Mobile#SOFTBANK',
+                'SJIS-SOFTBANK',
+                'UTF-8-Mobile#DOCOMO',
+                'UTF-8-DOCOMO',
+                'UTF-8-Mobile#KDDI-A',
+                'UTF-8-Mobile#KDDI-B',
+                'UTF-8-KDDI',
+                'UTF-8-Mobile#SOFTBANK',
+                'UTF-8-SOFTBANK',
+                'ISO-2022-JP-MOBILE#KDDI',
+                'ISO-2022-JP-KDDI',
+                'JIS',
+                'JIS-ms',
+                'CP50220',
+                'CP50220raw',
+                'CP50221',
+                'CP50222',
+                'ISO-8859-1',
+                'ISO-8859-2',
+                'ISO-8859-3',
+                'ISO-8859-4',
+                'ISO-8859-5',
+                'ISO-8859-6',
+                'ISO-8859-7',
+                'ISO-8859-8',
+                'ISO-8859-9',
+                'ISO-8859-10',
+                'ISO-8859-13',
+                'ISO-8859-14',
+                'ISO-8859-15',
+                'byte2be',
+                'byte2le',
+                'byte4be',
+                'byte4le',
+                'BASE64',
+                'HTML-ENTITIES',
+                '7bit',
+                '8bit',
+                'EUC-CN',
+                'CP936',
+                'GB18030',
+                'HZ',
+                'EUC-TW',
+                'CP950',
+                'BIG-5',
+                'EUC-KR',
+                'UHC (CP949)',
+                'ISO-2022-KR',
+                'Windows-1251',
+                'CP1251',
+                'Windows-1252',
+                'CP1252',
+                'CP866 (IBM866)',
+                'KOI8-R',
+                'ArmSCII-8',
+                'ArmSCII8',
+        );
+    }
 }