Merge pull request #618 in ZP/z-push from bugfix/ZP-1234-code-refactoring to develop

* commit 'b37d8180':
  ZP-1313 Remove TNEF class.
  ZP-1260 Improve isset in ASDevice->GetFolderSyncStatus().
  ZP-1242 Check for cpid directly instead of getting charset.
  ZP-1235 Improve guessTZNameFromPHPName.
  ZP-1233 Get timezone from system if it's not set for a meeting request.

src/backend/kopano/mapiprovider.php

@@ -598,10 +598,12 @@ class MAPIProvider {
                 $message->meetingrequest->globalobjid = base64_encode($props[$meetingrequestproperties["goidtag"]]);
 
             // Set Timezone
-            if(isset($props[$meetingrequestproperties["timezonetag"]]))
+            if (isset($props[$meetingrequestproperties["timezonetag"]])) {
                 $tz = $this->getTZFromMAPIBlob($props[$meetingrequestproperties["timezonetag"]]);
-            else
-                $tz = $this->getGMTTZ();
+            }
+            else {
+                $tz = TimezoneUtil::GetFullTZ();
+            }
 
             $message->meetingrequest->timezone = base64_encode(TimezoneUtil::GetSyncBlobFromTZ($tz));
 
@@ -2504,7 +2506,7 @@ class MAPIProvider {
             }
             elseif (isset($message->internetcpid) && $bpReturnType == SYNC_BODYPREFERENCE_HTML) {
                 // if PR_HTML is UTF-8 we can stream it directly, else we have to convert to UTF-8 & wrap it
-                if (Utils::GetCodepageCharset($message->internetcpid) == "utf-8") {
+                if ($message->internetcpid == INTERNET_CPID_UTF8) {
                     $message->asbody->data = MAPIStreamWrapper::Open($stream, $truncateHtmlSafe);
                 }
                 else {

src/lib/core/asdevice.php

@@ -775,11 +775,11 @@ class ASDevice extends StateObject {
      * @return mixed/boolean        false means the status is not available
      */
     public function GetFolderSyncStatus($folderid) {
-        if (isset($this->contentData) && isset($this->contentData[$folderid]) &&
-            isset($this->contentData[$folderid][self::FOLDERUUID]) && $this->contentData[$folderid][self::FOLDERUUID] !== false &&
-            isset($this->contentData[$folderid][self::FOLDERSYNCSTATUS]) )
+        if (isset($this->contentData[$folderid][self::FOLDERUUID], $this->contentData[$folderid][self::FOLDERSYNCSTATUS]) &&
+                $this->contentData[$folderid][self::FOLDERUUID] !== false) {
 
             return $this->contentData[$folderid][self::FOLDERSYNCSTATUS];
+        }
 
         return false;
     }

src/lib/utils/timezoneutil.php

@@ -1178,7 +1178,7 @@ class TimezoneUtil {
     }
 
     /**
-     * Tries to find a AS timezone for a php timezone
+     * Tries to find a AS timezone for a php timezone.
      *
      * @param string    $phpname        a php timezone name
      *
@@ -1188,17 +1188,14 @@ class TimezoneUtil {
     static private function guessTZNameFromPHPName($phpname) {
         foreach (self::$phptimezones as $tzn => $phptzs) {
             if (in_array($phpname, $phptzs)) {
-                $tzname = $tzn;
+                if (!is_int($tzn)) {
+                    return $tzn;
+                }
                 break;
             }
         }
-
-        if (!isset($tzname) || is_int($tzname)) {
-            ZLog::Write(LOGLEVEL_ERROR, sprintf("TimezoneUtil::guessTZNameFromPHPName() no compatible timezone found for '%s'. Returning 'GMT Standard Time'. Please contact the Z-Push dev team.", $phpname));
-            return self::$mstzones["085"][0];
-        }
-
-        return $tzname;
+        ZLog::Write(LOGLEVEL_ERROR, sprintf("TimezoneUtil::guessTZNameFromPHPName() no compatible timezone found for '%s'. Returning 'GMT Standard Time'. Please contact the Z-Push dev team.", $phpname));
+        return self::$mstzones["085"][0];
     }
 
     /**

src/vendor/composer/autoload_classmap.php

@@ -172,7 +172,6 @@ return array(
     'SyncUserInformation' => $baseDir . '/lib/syncobjects/syncuserinformation.php',
     'SyncValidateCert' => $baseDir . '/lib/syncobjects/syncvalidatecert.php',
     'Syslog' => $baseDir . '/lib/log/syslog.php',
-    'TNEFParser' => $baseDir . '/backend/kopano/tnefparser.php',
     'TaskRecurrence' => $baseDir . '/backend/kopano/mapi/class.taskrecurrence.php',
     'TaskRequest' => $baseDir . '/backend/kopano/mapi/class.taskrequest.php',
     'TimezoneUtil' => $baseDir . '/lib/utils/timezoneutil.php',

src/vendor/composer/autoload_static.php

@@ -179,7 +179,6 @@ class ComposerStaticInitd6749fc2fb9944bbe86b2b7d79a7852f
         'SyncUserInformation' => __DIR__ . '/../..' . '/lib/syncobjects/syncuserinformation.php',
         'SyncValidateCert' => __DIR__ . '/../..' . '/lib/syncobjects/syncvalidatecert.php',
         'Syslog' => __DIR__ . '/../..' . '/lib/log/syslog.php',
-        'TNEFParser' => __DIR__ . '/../..' . '/backend/kopano/tnefparser.php',
         'TaskRecurrence' => __DIR__ . '/../..' . '/backend/kopano/mapi/class.taskrecurrence.php',
         'TaskRequest' => __DIR__ . '/../..' . '/backend/kopano/mapi/class.taskrequest.php',
         'TimezoneUtil' => __DIR__ . '/../..' . '/lib/utils/timezoneutil.php',