Merge branch 'develop' of https://stash.z-hub.io/scm/zp/z-push into...

Merge branch 'develop' of https://stash.z-hub.io/scm/zp/z-push into feature/ZP-684-New-backend-CardDAV

Conflicts:
	src/backend/combined/config.php

src/backend/caldav/AUTHOR

+The Author of this backend is dupondje, I could have modified it.
+You can find the original code here:
+https://github.com/dupondje/PHP-Push-2

src/backend/caldav/REQUIREMENTS

+REQUIREMENTS:
+php-curl
+libawl-php
+
+INSTALL:
+Add your awl folder to the include_path variable (/etc/php.ini or similar)
+
+CalDAV server (DAViCal, Sabredav, Sogo, Owncloud...)

src/backend/caldav/config.php

+<?php
+/***********************************************
+* File      :   config.php
+* Project   :   Z-Push
+* Descr     :   CalDAV backend configuration file
+*
+* Created   :   27.11.2012
+*
+* Copyright 2012 - 2014 Jean-Louis Dupond
+*
+* Jean-Louis Dupond released this code as AGPLv3 here: https://github.com/dupondje/PHP-Push-2/issues/93
+*
+* 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,
+* as published by the Free Software Foundation with the following additional
+* term according to sec. 7:
+*
+* According to sec. 7 of the GNU Affero General Public License, version 3,
+* the terms of the AGPL are supplemented with the following terms:
+*
+* "Zarafa" is a registered trademark of Zarafa B.V.
+* "Z-Push" is a registered trademark of Zarafa Deutschland GmbH
+* The licensing of the Program under the AGPL does not imply a trademark license.
+* Therefore any rights, title and interest in our trademarks remain entirely with us.
+*
+* However, if you propagate an unmodified version of the Program you are
+* allowed to use the term "Z-Push" to indicate that you distribute the Program.
+* Furthermore you may use our trademarks where it is necessary to indicate
+* the intended purpose of a product or service provided you use it in accordance
+* with honest practices in industrial or commercial matters.
+* If you want to propagate modified versions of the Program under the name "Z-Push",
+* you may only do so if you have a written permission by Zarafa Deutschland GmbH
+* (to acquire a permission please contact Zarafa at trademark@zarafa.com).
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* Consult LICENSE file for details
+************************************************/
+
+// ************************
+//  BackendCalDAV settings
+// ************************
+
+// Server protocol: http or https
+define('CALDAV_PROTOCOL', 'https');
+
+// Server name
+define('CALDAV_SERVER', 'caldavserver.domain.com');
+
+// Server port
+define('CALDAV_PORT', '443');
+
+// Path
+define('CALDAV_PATH', '/caldav.php/%u/');
+
+// Default CalDAV folder (calendar folder/principal). This will be marked as the default calendar in the mobile
+define('CALDAV_PERSONAL', 'PRINCIPAL');
+
+// If the CalDAV server supports the sync-collection operation
+// DAViCal, SOGo and SabreDav support it
+// SabreDav version must be at least 1.9.0, otherwise set this to false
+// Setting this to false will work with most servers, but it will be slower
+define('CALDAV_SUPPORTS_SYNC', false);
+
+
+// Maximum period to sync.
+// Some servers don't support more than 10 years so you will need to change this
+define('CALDAV_MAX_SYNC_PERIOD', 2147483647);
\ No newline at end of file

src/backend/combined/config.php

@@ -77,6 +77,9 @@ class BackendCombinedConfig {
                 'd' => array(
                     'name' => 'BackendCardDAV',
                 ),
+                'c' => array(
+                    'name' => 'BackendCalDAV',
+                ),
             ),
             'delimiter' => '/',
             //force one type of folder to one backend

src/backend/imap/imap.php

@@ -1192,7 +1192,7 @@ class BackendIMAP extends BackendDiff {
 
                             $attachment = new SyncBaseAttachment();
 
-                            $attachment->estimatedDataSize = isset($part->d_parameters['size']) ? $part->d_parameters['size'] : isset($part->body) ? strlen($part->body) : 0;
+                            $attachment->estimatedDataSize = isset($part->d_parameters['size']) ? $part->d_parameters['size'] : (isset($part->body) ? strlen($part->body) : 0);
 
                             $attachment->displayname = $attname;
                             $attachment->filereference = $folderid . ":" . $id . ":" . $i;
@@ -1213,7 +1213,7 @@ class BackendIMAP extends BackendDiff {
 
                             $attachment = new SyncAttachment();
 
-                            $attachment->attsize = isset($part->d_parameters['size']) ? $part->d_parameters['size'] : isset($part->body) ? strlen($part->body) : 0;
+                            $attachment->attsize = isset($part->d_parameters['size']) ? $part->d_parameters['size'] : (isset($part->body) ? strlen($part->body) : 0);
 
                             $attachment->displayname = $attname;
                             $attachment->attname = $folderid . ":" . $id . ":" . $i;

src/backend/zarafa/mapimapping.php

@@ -186,6 +186,7 @@ class MAPIMapping {
             "nativebodytype"        => PR_NATIVE_BODY_INFO,
             "lastverbexecuted"      => PR_LAST_VERB_EXECUTED,
             "lastverbexectime"      => PR_LAST_VERB_EXECUTION_TIME,
+            "categories"            => "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords",
             );
     }
 
@@ -459,7 +460,7 @@ class MAPIMapping {
     public static function GetNoteMapping() {
         return array(
             "categories"            => "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords",
-            "lastmodificationtime"  => PR_LAST_MODIFICATION_TIME,
+            "lastmodified"          => PR_LAST_MODIFICATION_TIME,
             "messageclass"          => PR_MESSAGE_CLASS,
             "subject"               => PR_SUBJECT,
         );

src/backend/zarafa/mapiprovider.php

@@ -1053,6 +1053,11 @@ class MAPIProvider {
      * @param SyncMail          $message
      */
     private function setEmail($mapimessage, $message) {
+        // update categories
+        if (!isset($message->categories)) $message->categories = array();
+        $emailmap = MAPIMapping::GetEmailMapping();
+        $this->setPropsInMAPI($mapimessage, $message, array("categories" => $emailmap["categories"]));
+
         $flagmapping = MAPIMapping::GetMailFlagsMapping();
         $flagprops = MAPIMapping::GetMailFlagsProperties();
         $flagprops = array_merge($this->getPropIdsFromStrings($flagmapping), $this->getPropIdsFromStrings($flagprops));

src/config.php

@@ -6,7 +6,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,
@@ -78,6 +78,12 @@
 
 /**********************************************************************************
  *  Logging settings
+ *
+ *  The LOGBACKEND specifies where the logs are sent to.
+ *  Either to file ("filelog") or to a "syslog" server or a custom log class in core/log/logclass.
+ *  filelog and syslog have several options that can be set below.
+ *  For more information about the syslog configuration, see https://wiki.z-hub.io/x/HIAT
+
  *  Possible LOGLEVEL and LOGUSERLEVEL values are:
  *  LOGLEVEL_OFF            - no logging
  *  LOGLEVEL_FATAL          - log only critical errors
@@ -92,14 +98,13 @@
  *  The verbosity increases from top to bottom. More verbose levels include less verbose
  *  ones, e.g. setting to LOGLEVEL_DEBUG will also output LOGLEVEL_FATAL, LOGLEVEL_ERROR,
  *  LOGLEVEL_WARN and LOGLEVEL_INFO level entries.
+ *
+ *  LOGAUTHFAIL is logged to the LOGBACKEND.
  */
-    define('LOGFILEDIR', '/var/log/z-push/');
-    define('LOGFILE', LOGFILEDIR . 'z-push.log');
-    define('LOGERRORFILE', LOGFILEDIR . 'z-push-error.log');
+    define('LOGBACKEND', 'filelog');
     define('LOGLEVEL', LOGLEVEL_WBXML);
     define('LOGAUTHFAIL', false);
 
-
     // To save e.g. WBXML data only for selected users, add the usernames to the array
     // The data will be saved into a dedicated file per user in the LOGFILEDIR
     // Users have to be encapusulated in quotes, several users are comma separated, like:
@@ -107,15 +112,20 @@
     define('LOGUSERLEVEL', LOGLEVEL_DEVICEID);
     $specialLogUsers = array();
 
-    // If you want to disable log to file, and log to syslog instead
-    define('LOG_SYSLOG_ENABLED', false);
+    // Filelog settings
+    define('LOGFILEDIR', '/var/log/z-push/');
+    define('LOGFILE', LOGFILEDIR . 'z-push.log');
+    define('LOGERRORFILE', LOGFILEDIR . 'z-push-error.log');
+
+    // Syslog settings
     // false will log to local syslog, otherwise put the remote syslog IP here
     define('LOG_SYSLOG_HOST', false);
     // Syslog port
     define('LOG_SYSLOG_PORT', 514);
     // Program showed in the syslog. Useful if you have more than one instance login to the same syslog
-    define('LOG_SYSLOG_PROGRAM', '[z-push]');
-
+    define('LOG_SYSLOG_PROGRAM', 'z-push');
+    // Syslog facility - use LOG_USER when running on Windows
+    define('LOG_SYSLOG_FACILITY', LOG_LOCAL0);
 
     // Location of the trusted CA, e.g. '/etc/ssl/certs/EmailCA.pem'
     // Uncomment and modify the following line if the validation of the certificates fails.

src/include/z_syslog.php

-<?php
-/*
- * Copyright 2015 Leon van Kammen / Coder of Salvation. All rights reserved.
- * Modifications 2015 - Francisco Miguel Biete
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY Leon van Kammen / Coder of Salvation AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Leon van Kammen / Coder of Salvation OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of Leon van Kammen / Coder of Salvation
- *
- * https://github.com/coderofsalvation/syslog-flexible
- */
-
-class ZSyslog {
-    private static $hostname   = false;
-    private static $port       = 514;
-    private static $program    = "[z-push]";
-
-    /**
-     * Initializes the logging
-     *
-     * @access public
-     * @return boolean
-     */
-    public static function Initialize() {
-        if (defined('LOG_SYSLOG_HOST'))
-            self::$hostname = LOG_SYSLOG_HOST;
-        if (defined('LOG_SYSLOG_PORT'))
-            self::$port = LOG_SYSLOG_PORT;
-        if (defined('LOG_SYSLOG_PROGRAM'))
-            self::$program = LOG_SYSLOG_PROGRAM;
-    }
-
-    /**
-     * Send a message in the syslog facility.
-     *
-     * @params int      $zlog_level     Z-Push LogLevel
-     * @params string   $message
-     *
-     * @access public
-     * @return boolean
-     */
-    public static function send($zlog_level, $message) {
-        $level = self::zlogLevel2SyslogLevel($zlog_level);
-        if ($level === false) {
-            return false;
-        }
-
-        if (self::$hostname === false) {
-            return syslog($level, $message);
-        }
-        else {
-            $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-            $facility = 1; // user level
-            $pri = ($facility*8) + $level; // multiplying the Facility number by 8 + adding the level
-            foreach (explode("\n", $message) as $line) {
-                if (strlen(trim($line)) > 0) {
-                    $syslog_message = "<{$pri}>" . date('M d H:i:s ') . self::$program . ': ' . $line;
-                    socket_sendto($sock, $syslog_message, strlen($syslog_message), 0, self::$hostname, self::$port);
-                }
-            }
-            socket_close($sock);
-        }
-
-        return true;
-    }
-
-    /**
-     * Converts the ZLog level to SYSLOG level.
-     *
-     * @params int      $loglevel     Z-Push LogLevel
-     *
-     * @access private
-     * @return SYSLOG_LEVEL or false
-     */
-    private static function zlogLevel2SyslogLevel($loglevel) {
-        switch($loglevel) {
-            case LOGLEVEL_OFF:   return false; break;
-            case LOGLEVEL_FATAL: return LOG_ALERT; break;
-            case LOGLEVEL_ERROR: return LOG_ERR; break;
-            case LOGLEVEL_WARN:  return LOG_WARNING; break;
-            case LOGLEVEL_INFO:  return LOG_INFO; break;
-            case LOGLEVEL_DEBUG: return LOG_DEBUG; break;
-            case LOGLEVEL_WBXML: return LOG_DEBUG; break;
-            case LOGLEVEL_DEVICEID: return LOG_DEBUG; break;
-            case LOGLEVEL_WBXMLSTACK: return LOG_DEBUG; break;
-        }
-    }
-}

src/index.php

@@ -69,8 +69,10 @@ include_once('lib/core/asdevice.php');
 include_once('lib/core/statemanager.php');
 include_once('lib/core/devicemanager.php');
 include_once('lib/core/zpush.php');
-include_once('include/z_syslog.php');
 include_once('lib/core/zlog.php');
+include_once('lib/log/log.php');
+include_once('lib/log/filelog.php');
+include_once('lib/log/syslog.php');
 include_once('lib/interface/ibackend.php');
 include_once('lib/interface/ichanges.php');
 include_once('lib/interface/iexportchanges.php');
@@ -165,7 +167,7 @@ include_once('version.php');
         $backend = ZPush::GetBackend();
 
         // always request the authorization header
-        if (! Request::AuthenticationInfo() || !Request::GetGETUser())
+        if (! Request::HasAuthenticationInfo() || !Request::GetGETUser())
             throw new AuthenticationRequiredException("Access denied. Please send authorisation information");
 
         // check the provisioning information

src/lib/core/loopdetection.php

@@ -108,7 +108,7 @@ class LoopDetection extends InterProcessData {
      */
     public static function GetProcessIdentifier() {
         if (!isset(self::$processident))
-            self::$processident = sprintf('%04x%04', mt_rand(0, 0xffff), mt_rand(0, 0xffff));
+            self::$processident = sprintf('%04x%04x', mt_rand(0, 0xffff), mt_rand(0, 0xffff));
 
         return self::$processident;
     }

src/lib/core/statemanager.php

@@ -316,8 +316,8 @@ class StateManager {
      */
     public function SetBackendStorage($data, $type = self::BACKENDSTORAGE_PERMANENT) {
         if ($type == self::BACKENDSTORAGE_STATE) {
-        if (!$this->uuid)
-            throw new StateNotYetAvailableException();
+            if (!$this->uuid)
+                throw new StateNotYetAvailableException();
 
             // TODO serialization should be done in the StateMachine
             return $this->statemachine->SetState($data, $this->device->GetDeviceId(), IStateMachine::BACKENDSTORAGE, $this->uuid, $this->newStateCounter);

src/lib/core/streamimporter.php

@@ -111,20 +111,23 @@ class ImportChangesStream implements IImportChanges {
         if ($message->flags === false || $message->flags === SYNC_NEWMESSAGE)
             $this->encoder->startTag(SYNC_ADD);
         else {
-            // on update of an SyncEmail we only export the flags
-            if($message instanceof SyncMail && isset($message->flag) && $message->flag instanceof SyncMailFlags) {
+            // on update of an SyncEmail we only export the flags and categories
+            if($message instanceof SyncMail && ((isset($message->flag) && $message->flag instanceof SyncMailFlags) || isset($message->categories))) {
                 $newmessage = new SyncMail();
                 $newmessage->read = $message->read;
-                $newmessage->flag = $message->flag;
-                if (isset($message->lastverbexectime)) $newmessage->lastverbexectime = $message->lastverbexectime;
-                if (isset($message->lastverbexecuted)) $newmessage->lastverbexecuted = $message->lastverbexecuted;
+                if (isset($message->flag))              $newmessage->flag = $message->flag;
+                if (isset($message->lastverbexectime))  $newmessage->lastverbexectime = $message->lastverbexectime;
+                if (isset($message->lastverbexecuted))  $newmessage->lastverbexecuted = $message->lastverbexecuted;
+                if (isset($message->categories))        $newmessage->categories = $message->categories;
                 $message = $newmessage;
                 unset($newmessage);
-                ZLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesStream->ImportMessageChange('%s'): SyncMail message updated. Message content is striped, only flags are streamed.", $id));
+                ZLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesStream->ImportMessageChange('%s'): SyncMail message updated. Message content is striped, only flags/categories are streamed.", $id));
             }
 
             $this->encoder->startTag(SYNC_MODIFY);
         }
+
+        // TAG: SYNC_ADD / SYNC_MODIFY
             $this->encoder->startTag(SYNC_SERVERENTRYID);
                 $this->encoder->content($id);
             $this->encoder->endTag();

src/lib/core/zlog.php

@@ -42,15 +42,13 @@
 ************************************************/
 
 class ZLog {
-    static private $devid = '';
-    static private $user = '';
-    static private $authUser = false;
-    static private $pidstr;
     static private $wbxmlDebug = '';
     static private $lastLogs = array();
     static private $userLog = false;
-    static private $unAuthCache = array();
-    static private $syslogEnabled = false;
+    /**
+     * @var Log $logger
+     */
+    static private $logger = null;
 
     /**
      * Initializes the logging
@@ -59,12 +57,7 @@ class ZLog {
      * @return boolean
      */
     static public function Initialize() {
-        global $specialLogUsers;
-
-        if (defined('LOG_SYSLOG_ENABLED') && LOG_SYSLOG_ENABLED) {
-            self::$syslogEnabled = true;
-            ZSyslog::Initialize();
-        }
+        $logger = self::getLogger();
 
         // define some constants for the logging
         if (!defined('LOGUSERLEVEL'))
@@ -73,27 +66,14 @@ class ZLog {
         if (!defined('LOGLEVEL'))
             define('LOGLEVEL', LOGLEVEL_OFF);
 
-        list($user,) = Utils::SplitDomainUser(strtolower(Request::GetGETUser()));
-        self::$userLog = in_array($user, $specialLogUsers);
-        if (!defined('WBXML_DEBUG') && $user) {
+        if (!defined('WBXML_DEBUG')) {
             // define the WBXML_DEBUG mode on user basis depending on the configurations
-            if (LOGLEVEL >= LOGLEVEL_WBXML || (LOGUSERLEVEL >= LOGLEVEL_WBXML && self::$userLog))
+            if (LOGLEVEL >= LOGLEVEL_WBXML || (LOGUSERLEVEL >= LOGLEVEL_WBXML && $logger->HasSpecialLogUsers()))
                 define('WBXML_DEBUG', true);
             else
                 define('WBXML_DEBUG', false);
         }
 
-        if ($user)
-            self::$user = '['. $user .'] ';
-        else
-            self::$user = '';
-
-        // log the device id if the global loglevel is set to log devid or the user is in  and has the right log level
-        if (Request::GetDeviceID() != "" && (LOGLEVEL >= LOGLEVEL_DEVICEID || (LOGUSERLEVEL >= LOGLEVEL_DEVICEID && self::$userLog)))
-            self::$devid = '['. Request::GetDeviceID() .'] ';
-        else
-            self::$devid = '';
-
         return true;
     }
 
@@ -114,39 +94,17 @@ class ZLog {
             $message = substr($message, 0, 10240) . sprintf(" <log message with %d bytes truncated>", $messagesize);
 
         self::$lastLogs[$loglevel] = $message;
-        $data = self::buildLogString($loglevel) . $message . "\n";
 
-        if ($loglevel <= LOGLEVEL) {
-            self::writeToLog($loglevel, $data, LOGFILE);
-        }
-
-        // should we write this into the user log?
-        if ($loglevel <= LOGUSERLEVEL && self::$userLog) {
-            // padd level for better reading
-            $data = str_replace(self::getLogLevelString($loglevel), self::getLogLevelString($loglevel,true), $data);
-
-            // is the user authenticated?
-            if (self::logToUserFile()) {
-                // something was logged before the user was authenticated, write this to the log
-                if (!empty(self::$unAuthCache)) {
-                    self::writeToLog($loglevel, implode('', self::$unAuthCache), LOGFILEDIR . self::logToUserFile() . ".log");
-                    self::$unAuthCache = array();
-                }
-                // only use plain old a-z characters for the generic log file
-                self::writeToLog($loglevel, $data, LOGFILEDIR . self::logToUserFile() . ".log");
-            }
-            // the user is not authenticated yet, we save the log into memory for now
-            else {
-                self::$unAuthCache[] = $data;
-            }
+        try {
+            self::getLogger()->Log($loglevel, $message);
         }
-
-        if (($loglevel & LOGLEVEL_FATAL) || ($loglevel & LOGLEVEL_ERROR)) {
-            self::writeToLog($loglevel, $data, LOGERRORFILE);
+        catch (\Exception $e) {
+            //@TODO How should we handle logging error ?
+            // Ignore any error.
         }
 
         if ($loglevel & LOGLEVEL_WBXMLSTACK) {
-            self::$wbxmlDebug .= $message. "\n";
+            self::$wbxmlDebug .= $message . PHP_EOL;
         }
     }
 
@@ -193,101 +151,38 @@ class ZLog {
         }
     }
 
-    /**----------------------------------------------------------------------------------------------------------
-     * private log stuff
-     */
-
     /**
-     * Returns the filename logs for a WBXML debug log user should be saved to
+     * Returns the logger object. If no logger has been initialized, FileLog will be initialized and returned.
      *
      * @access private
-     * @return string
+     * @return Log
+     * @throws Exception thrown if the logger class cannot be instantiated.
      */
-    static private function logToUserFile() {
-        global $specialLogUsers;
-
-        if (self::$authUser === false) {
-            if (RequestProcessor::isUserAuthenticated()) {
-                $authuser = Request::GetAuthUser();
-                if ($authuser && in_array($authuser, $specialLogUsers))
-                    self::$authUser = preg_replace('/[^a-z0-9]/', '_', strtolower($authuser));
+    static private function getLogger() {
+        if (!self::$logger) {
+            global $specialLogUsers; // This variable comes from the configuration file (config.php)
+            $logger = LOGBACKEND;
+            if (!class_exists($logger)) {
+                throw new FatalNotImplementedException('The logging class `'.$logger.'` does not exist.');
             }
-        }
-        return self::$authUser;
-    }
 
-    /**
-     * Returns the string to be logged
-     *
-     * @access private
-     * @return string
-     */
-    static private function buildLogString($loglevel) {
-        if (!isset(self::$pidstr))
-            self::$pidstr = '[' . str_pad(@getmypid(),5," ",STR_PAD_LEFT) . '] ';
-
-        if (!isset(self::$user))
-            self::$user = '';
-
-        if (!isset(self::$devid))
-            self::$devid = '';
-
-        if (self::$syslogEnabled)
-            return self::$pidstr . self::getLogLevelString($loglevel, (LOGLEVEL > LOGLEVEL_INFO)) . " " . self::$user . self::$devid;
-        else
-            return Utils::GetFormattedTime() . " " . self::$pidstr . self::getLogLevelString($loglevel, (LOGLEVEL > LOGLEVEL_INFO)) . " " . self::$user . self::$devid;
-    }
+            list($user) = Utils::SplitDomainUser(strtolower(Request::GetGETUser()));
+            $user = '['.$user.']';
 
-    /**
-     * Returns the string representation of the LOGLEVEL.
-     * String can be padded
-     *
-     * @param int       $loglevel           one of the LOGLEVELs
-     * @param boolean   $pad
-     *
-     * @access private
-     * @return string
-     */
-    static private function getLogLevelString($loglevel, $pad = false) {
-        if ($pad) $s = " ";
-        else      $s = "";
-        switch($loglevel) {
-            case LOGLEVEL_OFF:   return ""; break;
-            case LOGLEVEL_FATAL: return "[FATAL]"; break;
-            case LOGLEVEL_ERROR: return "[ERROR]"; break;
-            case LOGLEVEL_WARN:  return "[".$s."WARN]"; break;
-            case LOGLEVEL_INFO:  return "[".$s."INFO]"; break;
-            case LOGLEVEL_DEBUG: return "[DEBUG]"; break;
-            case LOGLEVEL_WBXML: return "[WBXML]"; break;
-            case LOGLEVEL_DEVICEID: return "[DEVICEID]"; break;
-            case LOGLEVEL_WBXMLSTACK: return "[WBXMLSTACK]"; break;
+            self::$logger = new $logger();
+            self::$logger->SetUser($user);
+            self::$logger->SetAuthUser(Request::GetAuthUser());
+            self::$logger->SetSpecialLogUsers($specialLogUsers);
+            self::$logger->SetDevid('['. Request::GetDeviceID() .']');
+            self::$logger->SetPidstr('[' . str_pad(@getmypid(),5," ",STR_PAD_LEFT) . ']');
+            self::$logger->AfterInitialize();
         }
+        return self::$logger;
     }
 
-    /**
-     * Write the message to the log facility.
-     *
-     * @param int       $loglevel
-     * @param string    $data
-     * @param string    $logfile
-     *
-     * @access private
-     * @return void
+    /**----------------------------------------------------------------------------------------------------------
+     * private log stuff
      */
-    static private function writeToLog($loglevel, $data, $logfile = null) {
-        if (self::$syslogEnabled) {
-            if (ZSyslog::send($loglevel, $data) === false) {
-                error_log("Unable to send to syslog");
-                error_log($data);
-            }
-        }
-        else {
-            if (@file_put_contents($logfile, $data, FILE_APPEND) === false) {
-                error_log(sprintf("Unable to write in %s", $logfile));
-                error_log($data);
-            }
-        }
-    }
 }
 
 /**----------------------------------------------------------------------------------------------------------

src/lib/core/zpush.php

@@ -220,24 +220,57 @@ class ZPush {
         else
             define('REAL_BASE_PATH', BASE_PATH);
 
-        if (!defined('LOGFILEDIR'))
-            throw new FatalMisconfigurationException("The LOGFILEDIR is not configured. Check if the config.php file is in place.");
+        if (!defined('LOGBACKEND')) {
+            define('LOGBACKEND', 'filelog');
+        }
 
-        if (substr(LOGFILEDIR, -1,1) != "/")
-            throw new FatalMisconfigurationException("The LOGFILEDIR should terminate with a '/'");
+        if (LOGBACKEND == 'syslog') {
 
-        if (!file_exists(LOGFILEDIR))
-            throw new FatalMisconfigurationException("The configured LOGFILEDIR does not exist or can not be accessed.");
+            if (!defined('LOG_SYSLOG_FACILITY')) {
+                define('LOG_SYSLOG_FACILITY', LOG_LOCAL0);
+            }
 
-        if ((!file_exists(LOGFILE) && !touch(LOGFILE)) || !is_writable(LOGFILE))
-            throw new FatalMisconfigurationException("The configured LOGFILE can not be modified.");
+            if (!defined('LOG_SYSLOG_HOST')) {
+                define('LOG_SYSLOG_HOST', false);
+            }
 
-        if ((!file_exists(LOGERRORFILE) && !touch(LOGERRORFILE)) || !is_writable(LOGERRORFILE))
-            throw new FatalMisconfigurationException("The configured LOGERRORFILE can not be modified.");
+            if (!defined('LOG_SYSLOG_PORT')) {
+                define('LOG_SYSLOG_PORT', 514);
+            }
 
-        // check ownership on the (eventually) just created files
-        Utils::FixFileOwner(LOGFILE);
-        Utils::FixFileOwner(LOGERRORFILE);
+            if (!defined('LOG_SYSLOG_PROGRAM')) {
+                define('LOG_SYSLOG_PROGRAM', 'z-push');
+            }
+
+            if (!is_numeric(LOG_SYSLOG_PORT)) {
+                throw new FatalMisconfigurationException("The LOG_SYSLOG_PORT must a be a number.");
+            }
+
+            if (LOG_SYSLOG_HOST && LOG_SYSLOG_PORT <= 0) {
+                throw new FatalMisconfigurationException("LOG_SYSLOG_HOST is defined but the LOG_SYSLOG_PORT does not seem to be valid.");
+            }
+        }
+        elseif (LOGBACKEND == 'filelog') {
+
+            if (!defined('LOGFILEDIR'))
+                throw new FatalMisconfigurationException("The LOGFILEDIR is not configured. Check if the config.php file is in place.");
+
+            if (substr(LOGFILEDIR, -1,1) != "/")
+                throw new FatalMisconfigurationException("The LOGFILEDIR should terminate with a '/'");
+
+            if (!file_exists(LOGFILEDIR))
+                throw new FatalMisconfigurationException("The configured LOGFILEDIR does not exist or can not be accessed.");
+
+            if ((!file_exists(LOGFILE) && !touch(LOGFILE)) || !is_writable(LOGFILE))
+                throw new FatalMisconfigurationException("The configured LOGFILE can not be modified.");
+
+            if ((!file_exists(LOGERRORFILE) && !touch(LOGERRORFILE)) || !is_writable(LOGERRORFILE))
+                throw new FatalMisconfigurationException("The configured LOGERRORFILE can not be modified.");
+
+            // check ownership on the (eventually) just created files
+            Utils::FixFileOwner(LOGFILE);
+            Utils::FixFileOwner(LOGERRORFILE);
+        }
 
         // set time zone
         // code contributed by Robert Scheck (rsc)

src/lib/default/backend.php

@@ -303,7 +303,7 @@ abstract class Backend implements IBackend {
         }
         if (isset($this->stateStorage)) {
             try {
-                $this->storage_state = ZPush::GetDeviceManager()->GetStateManager()->SetBackendStorage($this->stateStorage, StateManager::BACKENDSTORAGE_STATE);
+                ZPush::GetDeviceManager()->GetStateManager()->SetBackendStorage($this->stateStorage, StateManager::BACKENDSTORAGE_STATE);
             }
             catch (StateNotYetAvailableException $snyae) { }
             catch(StateNotFoundException $snfe) { }

src/lib/default/filestatemachine.php

@@ -154,7 +154,7 @@ class FileStateMachine implements IStateMachine {
         $state = serialize($state);
 
         $filename = $this->getFullFilePath($devid, $type, $key, $counter);
-        if (($bytes = file_put_contents($filename, $state)) === false)
+        if (($bytes = Utils::SafePutContents($filename, $state)) === false)
             throw new FatalMisconfigurationException(sprintf("FileStateMachine->SetState(): Could not write state '%s'",$filename));
 
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("FileStateMachine->SetState() written %d bytes on file: '%s'", $bytes, $filename));
@@ -233,7 +233,7 @@ class FileStateMachine implements IStateMachine {
             }
 
             if ($changed) {
-                $bytes = file_put_contents($this->userfilename, serialize($users));
+                $bytes = Utils::SafePutContents($this->userfilename, serialize($users));
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("FileStateMachine->LinkUserDevice(): wrote %d bytes to users file", $bytes));
             }
             else
@@ -282,7 +282,7 @@ class FileStateMachine implements IStateMachine {
             }
 
             if ($changed) {
-                $bytes = file_put_contents($this->userfilename, serialize($users));
+                $bytes = Utils::SafePutContents($this->userfilename, serialize($users));
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("FileStateMachine->UnLinkUserDevice(): wrote %d bytes to users file", $bytes));
             }
             else
@@ -370,7 +370,7 @@ class FileStateMachine implements IStateMachine {
 
         $settings[self::VERSION] = $version;
         ZLog::Write(LOGLEVEL_INFO, sprintf("FileStateMachine->SetStateVersion() saving supported state version, value '%d'", $version));
-        $status = file_put_contents($this->settingsfilename, serialize($settings));
+        $status = Utils::SafePutContents($this->settingsfilename, serialize($settings));
         Utils::FixFileOwner($this->settingsfilename);
         return $status;
     }

src/lib/log/filelog.php

+<?php
+/***********************************************
+ * File      :   filelog.php
+ * Project   :   Z-Push
+ * Descr     :   Logging functionalities
+ *
+ * Created   :   13.11.2015
+ *
+ * Copyright 2007 - 2015 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,
+ * as published by the Free Software Foundation with the following additional
+ * term according to sec. 7:
+ *
+ * According to sec. 7 of the GNU Affero General Public License, version 3,
+ * the terms of the AGPL are supplemented with the following terms:
+ *
+ * "Zarafa" is a registered trademark of Zarafa B.V.
+ * "Z-Push" is a registered trademark of Zarafa Deutschland GmbH
+ * The licensing of the Program under the AGPL does not imply a trademark license.
+ * Therefore any rights, title and interest in our trademarks remain entirely with us.
+ *
+ * However, if you propagate an unmodified version of the Program you are
+ * allowed to use the term "Z-Push" to indicate that you distribute the Program.
+ * Furthermore you may use our trademarks where it is necessary to indicate
+ * the intended purpose of a product or service provided you use it in accordance
+ * with honest practices in industrial or commercial matters.
+ * If you want to propagate modified versions of the Program under the name "Z-Push",
+ * you may only do so if you have a written permission by Zarafa Deutschland GmbH
+ * (to acquire a permission please contact Zarafa at trademark@zarafa.com).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Consult LICENSE file for details
+ ************************************************/
+class FileLog extends Log {
+
+    /**
+     * @var string|bool
+     */
+    private $log_to_user_file = false;
+
+    /**
+     * Get the log user file.
+     *
+     * @access private
+     * @return string
+     */
+    private function getLogToUserFile() {
+        if ($this->log_to_user_file === false) {
+            $this->setLogToUserFile(preg_replace('/[^a-z0-9]/', '_', strtolower($this->GetAuthUser())) . '.log');
+        }
+        return $this->log_to_user_file;
+    }
+
+    /**
+     * @param string $value
+     */
+    private function setLogToUserFile($value) {
+        $this->log_to_user_file = $value;
+    }
+
+    public function __construct() {
+    }
+
+    /**
+     * Returns the string to be logged
+     *
+     * @param int $loglevel
+     * @param string $message
+     *
+     * @access public
+     * @return string
+     */
+    public function BuildLogString($loglevel, $message) {
+        $log = Utils::GetFormattedTime() . ' ' . $this->GetPidstr() . ' ' . $this->GetLogLevelString($loglevel, $loglevel >= LOGLEVEL_INFO) . ' ' . $this->GetUser();
+        if (LOGLEVEL >= LOGLEVEL_DEVICEID || (LOGUSERLEVEL >= LOGLEVEL_DEVICEID && $this->IsAuthUserInSpecialLogUsers())) {
+            $log .= ' ' . $this->GetDevid();
+        }
+        $log .= ' ' . $message;
+        return $log;
+    }
+
+    //
+    // Implementation of Log
+    //
+
+    protected function Write($loglevel, $message) {
+        $data = $this->buildLogString($loglevel, $message) . PHP_EOL;
+        @file_put_contents(LOGFILE, $data, FILE_APPEND);
+
+        if (($loglevel & LOGLEVEL_FATAL) || ($loglevel & LOGLEVEL_ERROR)) {
+            @file_put_contents(LOGERRORFILE, $data, FILE_APPEND);
+        }
+    }
+
+    public function WriteForUser($loglevel, $message) {
+        $data = $this->buildLogString($loglevel, $message) . PHP_EOL;
+        @file_put_contents(LOGFILEDIR . $this->getLogToUserFile(), $data, FILE_APPEND);
+    }
+
+    protected function afterLog($loglevel, $message) {
+        if (($loglevel & LOGLEVEL_FATAL) || ($loglevel & LOGLEVEL_ERROR)) {
+            $data = $this->buildLogString($loglevel, $message) . PHP_EOL;
+            @file_put_contents(LOGERRORFILE, $data, FILE_APPEND);
+        }
+    }
+}

src/lib/request/foldersync.php

@@ -52,9 +52,6 @@ class FolderSync extends RequestProcessor {
      * @return boolean
      */
     public function Handle ($commandCode) {
-        // Maps serverid -> clientid for items that are received from the PIM
-        $map = array();
-
         // Parse input
         if(!self::$decoder->getElementStartTag(SYNC_FOLDERHIERARCHY_FOLDERSYNC))
             return false;
@@ -141,10 +138,6 @@ class FolderSync extends RequestProcessor {
                                 $serverid = $changesMem->ImportFolderDeletion($folder);
                                 break;
                         }
-
-                        // TODO what does $map??
-                        if($serverid)
-                            $map[$serverid] = $folder->clientid;
                     }
                     else {
                         ZLog::Write(LOGLEVEL_WARN, sprintf("Request->HandleFolderSync(): ignoring incoming folderchange for folder '%s' as status indicates problem.", $folder->displayname));
@@ -219,7 +212,7 @@ class FolderSync extends RequestProcessor {
                         // say that we are done with partial synching
                         self::$deviceManager->SetFolderSyncComplete(true);
                         // reset the loop data to prevent any loop detection to kick in now
-                        self::$deviceManager->ClearLoopDetectionData(Request::GetAuthUser(), Request::GetDeviceId());
+                        self::$deviceManager->ClearLoopDetectionData(Request::GetAuthUser(), Request::GetDeviceID());
                         ZLog::Write(LOGLEVEL_INFO, "Request->HandleFolderSync(): Chunked exporting of folders completed successfully");
                     }
 

src/lib/request/getitemestimate.php

@@ -91,7 +91,7 @@ class GetItemEstimate extends RequestProcessor {
                 elseif(self::$decoder->getElementStartTag(SYNC_CONVERSATIONMODE)) {
                     $spa->SetConversationMode(true);
                     if(($conversationmode = self::$decoder->getElementContent()) !== false) {
-                        $spa->SetConversationMode((boolean)$conversationmode);
+                        $spa->SetConversationMode((bool)$conversationmode);
                         if(!self::$decoder->getElementEndTag())
                             return false;
                     }

src/lib/request/itemoperations.php

@@ -213,7 +213,7 @@ class ItemOperations extends RequestProcessor {
                         if(self::$decoder->getElementStartTag(SYNC_ITEMOPERATIONS_DELETESUBFOLDERS)) {
                             $operation['deletesubfolders'] = true;
                             if (($dsf = self::$decoder->getElementContent()) !== false) {
-                                $operation['deletesubfolders'] = (boolean)$dsf;
+                                $operation['deletesubfolders'] = (bool)$dsf;
                                 if(!self::$decoder->getElementEndTag())
                                     return false;
                             }

src/lib/request/request.php

@@ -74,9 +74,7 @@ class Request {
     static private $input;
     static private $output;
     static private $headers;
-    static private $getparameters;
     static private $command;
-    static private $device;
     static private $method;
     static private $remoteAddr;
     static private $getUser;
@@ -91,7 +89,7 @@ class Request {
     static private $attachmentName;
     static private $collectionId;
     static private $itemId;
-    static private $longId; //TODO
+    static private $longId; // TODO
     static private $occurence; //TODO
     static private $saveInSent;
     static private $acceptMultipart;
@@ -186,6 +184,16 @@ class Request {
                 self::$getUser = Utils::GetLocalPartFromEmail(self::$getUser);
             }
         }
+
+        // authUser & authPassword are unfiltered!
+        // split username & domain if received as one
+        if (isset($_SERVER['PHP_AUTH_USER'])) {
+            list(self::$authUser, self::$authDomain) = Utils::SplitDomainUser($_SERVER['PHP_AUTH_USER']);
+            self::$authPassword = (isset($_SERVER['PHP_AUTH_PW']))?$_SERVER['PHP_AUTH_PW'] : "";
+        }
+        if(defined('USE_FULLEMAIL_FOR_LOGIN') && ! USE_FULLEMAIL_FOR_LOGIN) {
+            self::$authUser = Utils::GetLocalPartFromEmail(self::$authUser);
+        }
     }
 
     /**
@@ -234,21 +242,10 @@ class Request {
     }
 
     /**
-     * Reads and parses the HTTP-Basic-Auth data
-     *
      * @access public
      * @return boolean      data sent or not
      */
-    static public function AuthenticationInfo() {
-        // split username & domain if received as one
-        if (isset($_SERVER['PHP_AUTH_USER'])) {
-            list(self::$authUser, self::$authDomain) = Utils::SplitDomainUser($_SERVER['PHP_AUTH_USER']);
-            self::$authPassword = (isset($_SERVER['PHP_AUTH_PW']))?$_SERVER['PHP_AUTH_PW'] : "";
-        }
-        if(defined('USE_FULLEMAIL_FOR_LOGIN') && ! USE_FULLEMAIL_FOR_LOGIN) {
-            self::$authUser = Utils::GetLocalPartFromEmail(self::$authUser);
-        }
-        // authUser & authPassword are unfiltered!
+    static public function HasAuthenticationInfo() {
         return (self::$authUser != "" && self::$authPassword != "");
     }
 

src/lib/syncobjects/syncappointment.php

@@ -210,8 +210,8 @@ class SyncAppointment extends SyncObject {
             }
         }
 
-        // do not sync a recurrent appointment without a timezone
-        if (isset($this->recurrence) && !isset($this->timezone)) {
+        // do not sync a recurrent appointment without a timezone (except all day events)
+        if (isset($this->recurrence) && !isset($this->timezone) && empty($this->alldayevent)) {
             ZLog::Write(LOGLEVEL_ERROR, "SyncAppointment->Check(): timezone for a recurring appointment is not set.");
             return false;
         }

src/lib/syncobjects/syncmail.php

@@ -86,6 +86,7 @@ class SyncMail extends SyncObject {
     public $lastverbexectime;
     public $receivedasbcc;
     public $sender;
+    public $categories;
 
     function SyncMail() {
         $mapping = array (

src/lib/utils/zpushadmin.php

@@ -759,7 +759,7 @@ class ZPushAdmin {
             $users = self::ListUsers($devid);
             foreach ($users as $username) {
                 $seen++;
-                ZLog::Write(LOGLEVEL_DEBUG, sprintf("ZPushAdmin::FixStatesDeviceToUserLinking(): linking user '%s' to device '%d'", $username, $devid));
+                ZLog::Write(LOGLEVEL_DEBUG, sprintf("ZPushAdmin::FixStatesDeviceToUserLinking(): linking user '%s' to device '%s'", $username, $devid));
 
                 if (ZPush::GetStateMachine()->LinkUserDevice($username, $devid))
                     $fixed++;

src/lib/wbxml/wbxmldecoder.php

@@ -384,7 +384,7 @@ class WBXMLDecoder extends WBXMLDefs {
             switch($byte) {
                 case WBXML_SWITCH_PAGE:
                     $this->tagcp = $this->getByte();
-                    continue;
+                    break;
 
                 case WBXML_END:
                     $element[EN_TYPE] = EN_TYPE_ENDTAG;