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-682-Composer-Auto-include

Conflicts:
	src/index.php
	src/z-push-admin.php
	src/z-push-top.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/carddav/README

+This is a CardDAV backend based in the vcarddir backend.
+
+It supports DAViCal, Sogo, OwnCloud, SabreDav... and should works with any carddav server. So if it doesn't work with your server, please open a issue.
+
+It supports ChangesSink method that will detect and send faster changes to your device.
+
+DAViCal implements the SYNC operation, it's a very fast method to detect changes in your vcards.
+The others servers don't implement it, so the code will fallback to a slower method (suggest your carddav server developers to implement it!!).
+
+This is controlled with a flag in the config.php file.
+
+Also, it can autodetect multiple addressbooks and will present them to the mobile device as an unique addressbook (only iOS supports multiple addressbook).

src/backend/carddav/REQUIREMENTS

+REQUIREMENTS:
+php-curl
+php-xsl
+
+CardDAV server (DAViCal, Sabredav, Sogo, Owncloud...)
\ No newline at end of file

src/backend/carddav/THANKS

+*Drenalina SRL (www.drenalina.com)* sponsored the development of the following features in the BackendCardDAV, any existing bug it's my fault not theirs ;-)
+Thank you very much for helping to improve it!!
+
+
+ - Autodetecting addressbooks within a DAV principal.
+ - Merging multiple addressbooks so the device will see a unique one. Only iOS based devices support multiple addressbooks, so we will merge them for now.
+ - Selecting default addressbook to store new contacts created from the device.
+ - GAL addressbook and GAL search.
\ No newline at end of file

src/backend/carddav/config.php

+<?php
+/***********************************************
+* File      :   config.php
+* Project   :   Z-Push
+* Descr     :   CardDAV backend configuration file
+*
+* Created   :   16.03.2013
+*
+* Copyright 2013 - 2016 Francisco Miguel Biete
+*
+* 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
+************************************************/
+
+// ************************
+//  BackendCardDAV settings
+// ************************
+
+// Server protocol: http or https
+define('CARDDAV_PROTOCOL', 'https');
+
+// Server name
+define('CARDDAV_SERVER', 'localhost');
+
+// Server port
+define('CARDDAV_PORT', '443');
+
+// Server path to the addressbook, or the principal with the addressbooks
+//  If your user has more than 1 addressbook point it to the principal.
+//  Example: user test@domain.com will have 2 addressbooks
+//      http://localhost/caldav.php/test@domain.com/addresses/personal
+//      http://localhost/caldav.php/test@domain.com/addresses/work
+//      You set the CARDDAV_PATH to '/caldav.php/%u/addresses/' and personal and work will be autodiscovered
+// %u: replaced with the username
+// %d: replaced with the domain
+//   Add the trailing /
+define('CARDDAV_PATH', '/caldav.php/%u/');
+
+
+// Server path to the default addressbook
+//  Mobile device will create new contacts here. It must be under CARDDAV_PATH
+// %u: replaced with the username
+// %d: replaced with the domain
+//   Add the trailing /
+define('CARDDAV_DEFAULT_PATH', '/caldav.php/%u/addresses/');
+
+// Server path to the GAL addressbook. This addressbook is readonly and searchable by the user, but it will NOT be synced.
+// If you don't want GAL, comment it
+// %u: replaced with the username
+// %d: replaced with the domain
+//  Add the trailing /
+define('CARDDAV_GAL_PATH', '/caldav.php/%d/GAL/');
+
+// Minimal length for the search pattern to do the real search.
+define('CARDDAV_GAL_MIN_LENGTH', 5);
+
+// Addressbook display name, the name showed in the mobile device
+// %u: replaced with the username
+// %d: replaced with the domain
+define('CARDDAV_CONTACTS_FOLDER_NAME', '%u Addressbook');
+
+
+// If the CardDAV server supports the sync-collection operation
+// DAViCal and SabreDav support it, but Owncloud, SOGo don't
+// 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: 1 petition for the href of vcards, and 1 petition for each vcard
+define('CARDDAV_SUPPORTS_SYNC', false);
+
+
+// If the CardDAV server supports the FN attribute for searches
+// DAViCal supports it, but SabreDav, Owncloud and SOGo don't
+// Setting this to true will search by FN. If false will search by sn, givenName and email
+// It's safe to leave it as false
+define('CARDDAV_SUPPORTS_FN_SEARCH', false);
+
+
+// If your carddav server needs to use file extension to recover a vcard.
+//    Davical needs it
+//    SOGo official demo online needs it, but some SOGo installation don't need it, so test it
+define('CARDDAV_URL_VCARD_EXTENSION', '.vcf');
\ No newline at end of file

src/backend/combined/config.php

@@ -74,6 +74,15 @@ class BackendCombinedConfig {
                 'v' => array(
                     'name' => 'BackendVCardDir',
                 ),
+                'l' => array(
+                    'name' => 'BackendLDAP',
+                ),
+                '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/index.php

@@ -55,6 +55,7 @@ else {
 ignore_user_abort(true);
 
 require_once 'vendor/autoload.php';
+
 if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', 'config.php');
 include_once(ZPUSH_CONFIG);
 
@@ -92,7 +93,7 @@ include_once(ZPUSH_CONFIG);
         $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/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/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;
                     }