Merge branch 'strftime' into 'master'

compat: get rid of deprecated strftime (and fix GetFormattedTime return)

See merge request grommunio/grommunio-sync!102

Author: gromandreas

grommunio-sync-top.php

@@ -311,7 +311,7 @@ private function scrOverview() {
 			"grommunio-sync-top live stats (%s, Gromox %s) %s\n",
 			$this->getVersion(),
 			phpversion("mapi"),
-			@strftime("%x %T")
+			date("Y-m-d H:i:s")
 		));
 		++$lc;
 

lib/core/devicemanager.php

@@ -1011,7 +1011,7 @@ public function AnnounceIgnoredMessage($folderid, $id, SyncObject $message, $rea
 			$info .= sprintf(" - From: '%s'", $message->from);
 		}
 		if (isset($message->starttime)) {
-			$info .= sprintf(" - On: '%s'", strftime("%Y-%m-%d %H:%M", $message->starttime));
+			$info .= sprintf(" - On: '%s'", date("Y-m-d H:i", $message->starttime));
 		}
 		$brokenMessage->info = $info;
 		$brokenMessage->reasonString = SLog::GetLastMessage(LOGLEVEL_WARN);

lib/utils/utils.php

@@ -563,10 +563,10 @@ public static function getDayStartOfTimestamp($timestamp) {
 	 */
 	public static function GetFormattedTime($timestamp = false) {
 		if (!$timestamp) {
-			return @strftime("%d/%m/%Y %H:%M:%S");
+			$timestamp = time();
 		}
 
-		return @strftime("%d/%m/%Y %H:%M:%S", $timestamp);
+		return date("d/m/Y H:i:s", $timestamp);
 	}
 
 	/**