Merge pull request #184 in ZP/z-push from...

Merge pull request #184 in ZP/z-push from bugfix/ZP-864-user-with-umlauts-in-user-name-is to develop

* commit '7a5e3723':
  ZP-864 Do not convert UTF-8 only encoding. Updated copyright dates for changed files.
  ZP-864 Do not convert if charset encoding is already UTF-8.

src/lib/request/request.php

@@ -7,7 +7,7 @@
 *
 * Created   :   01.10.2007
 *
-* Copyright 2007 - 2013 Zarafa Deutschland GmbH
+* Copyright 2007 - 2016 Zarafa Deutschland GmbH
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License, version 3,
@@ -256,7 +256,7 @@ class Request {
                     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) {
+            if ($encoding && strtolower($encoding) != "utf-8") {
                 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

@@ -6,7 +6,7 @@
 *
 * Created   :   03.04.2008
 *
-* Copyright 2007 - 2013 Zarafa Deutschland GmbH
+* Copyright 2007 - 2016 Zarafa Deutschland GmbH
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License, version 3,