grommunio / grommunio-sync

lib/exceptions/httpreturncodeexception.php

Indentation +8 added lines, -8 removed lines

@@ -8,13 +8,13 @@
  * to the mobile.
  */
 class HTTPReturnCodeException extends FatalException {
-	protected $defaultLogLevel = LOGLEVEL_ERROR;
-	protected $showLegal = false;
+    protected $defaultLogLevel = LOGLEVEL_ERROR;
+    protected $showLegal = false;
 
-	public function __construct($message = "", $code = 0, $previous = null, $logLevel = false) {
-		if ($code) {
-			$this->httpReturnCode = $code;
-		}
-		parent::__construct($message, (int) $code, $previous, $logLevel);
-	}
+    public function __construct($message = "", $code = 0, $previous = null, $logLevel = false) {
+        if ($code) {
+            $this->httpReturnCode = $code;
+        }
+        parent::__construct($message, (int) $code, $previous, $logLevel);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -15,6 +15,6 @@
 		if ($code) {
 			$this->httpReturnCode = $code;
 		}
-		parent::__construct($message, (int) $code, $previous, $logLevel);
+		parent::__construct($message, (int)$code, $previous, $logLevel);
 	}
 }

lib/exceptions/nopostrequestexception.php

Indentation +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@
  * The code indicates if the request identified was a OPTIONS or GET request
  */
 class NoPostRequestException extends FatalException {
-	public const OPTIONS_REQUEST = 1;
-	public const GET_REQUEST = 2;
-	protected $defaultLogLevel = LOGLEVEL_DEBUG;
+    public const OPTIONS_REQUEST = 1;
+    public const GET_REQUEST = 2;
+    protected $defaultLogLevel = LOGLEVEL_DEBUG;
 }

lib/exceptions/serviceunavailableexception.php

Indentation +11 added lines, -11 removed lines

@@ -8,16 +8,16 @@
  */
 
 class ServiceUnavailableException extends HTTPReturnCodeException {
-	protected $defaultLogLevel = LOGLEVEL_INFO;
-	protected $httpReturnCode = HTTP_CODE_503;
-	protected $httpReturnMessage = "Service Unavailable";
-	protected $httpHeaders = [];
-	protected $showLegal = false;
+    protected $defaultLogLevel = LOGLEVEL_INFO;
+    protected $httpReturnCode = HTTP_CODE_503;
+    protected $httpReturnMessage = "Service Unavailable";
+    protected $httpHeaders = [];
+    protected $showLegal = false;
 
-	public function __construct($message = "", $code = 0, $previous = null, $logLevel = false) {
-		parent::__construct($message, $code, $previous, $logLevel);
-		if (RETRY_AFTER_DELAY !== false) {
-			$this->httpHeaders[] = 'Retry-After: ' . RETRY_AFTER_DELAY;
-		}
-	}
+    public function __construct($message = "", $code = 0, $previous = null, $logLevel = false) {
+        parent::__construct($message, $code, $previous, $logLevel);
+        if (RETRY_AFTER_DELAY !== false) {
+            $this->httpHeaders[] = 'Retry-After: ' . RETRY_AFTER_DELAY;
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	public function __construct($message = "", $code = 0, $previous = null, $logLevel = false) {
 		parent::__construct($message, $code, $previous, $logLevel);
 		if (RETRY_AFTER_DELAY !== false) {
-			$this->httpHeaders[] = 'Retry-After: ' . RETRY_AFTER_DELAY;
+			$this->httpHeaders[] = 'Retry-After: '.RETRY_AFTER_DELAY;
 		}
 	}
 }

config.php

Indentation +194 added lines, -194 removed lines

@@ -10,29 +10,29 @@ 
 /*
  *  Default settings
  */
-	// Defines the default time zone, change e.g. to "Europe/London" if necessary
-	define('TIMEZONE', '');
+    // Defines the default time zone, change e.g. to "Europe/London" if necessary
+    define('TIMEZONE', '');
 
-	// Defines the base path on the server
-	define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . '/');
+    // Defines the base path on the server
+    define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . '/');
 
-	// Try to set unlimited timeout
-	define('SCRIPT_TIMEOUT', 0);
+    // Try to set unlimited timeout
+    define('SCRIPT_TIMEOUT', 0);
 
-	// This should be solved on THE webserver level if there are proxies
-	// between mobile client and grommunio-sync.
-	// Use a custom header to determinate the remote IP of a client.
-	// By default, the server provided REMOTE_ADDR is used. If the header here set
-	// is available, the provided value will be used, else REMOTE_ADDR is maintained.
-	// set to false to disable this behaviour.
-	// common values: 'HTTP_X_FORWARDED_FOR', 'HTTP_X_REAL_IP' (casing is ignored)
-	define('USE_CUSTOM_REMOTE_IP_HEADER', false);
+    // This should be solved on THE webserver level if there are proxies
+    // between mobile client and grommunio-sync.
+    // Use a custom header to determinate the remote IP of a client.
+    // By default, the server provided REMOTE_ADDR is used. If the header here set
+    // is available, the provided value will be used, else REMOTE_ADDR is maintained.
+    // set to false to disable this behaviour.
+    // common values: 'HTTP_X_FORWARDED_FOR', 'HTTP_X_REAL_IP' (casing is ignored)
+    define('USE_CUSTOM_REMOTE_IP_HEADER', false);
 
-	// When using client certificates, we can check if the login sent matches the owner of the certificate.
-	// This setting specifies the owner parameter in the certificate to look at.
-	define("CERTIFICATE_OWNER_PARAMETER", "SSL_CLIENT_S_DN_CN");
+    // When using client certificates, we can check if the login sent matches the owner of the certificate.
+    // This setting specifies the owner parameter in the certificate to look at.
+    define("CERTIFICATE_OWNER_PARAMETER", "SSL_CLIENT_S_DN_CN");
 
-	/*
+    /*
 	 * Whether to use the complete email address as a login name
 	 * (e.g. user@company.com) or the username only (user).
 	 * This is required for grommunio-sync to work properly after autodiscover.
@@ -40,7 +40,7 @@ 
 	 *   false - use the username only.
 	 *   true  - string the mobile sends as username, e.g. full email address (default).
 	 */
-	define('USE_FULLEMAIL_FOR_LOGIN', true);
+    define('USE_FULLEMAIL_FOR_LOGIN', true);
 
 /*
  *  Logging settings
@@ -67,189 +67,189 @@ 
  *
  *  LOGAUTHFAIL is logged to the LOGBACKEND.
  */
-	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:
-	//   $specialLogUsers = array('info@domain.com', 'myusername');
-	define('LOGUSERLEVEL', LOGLEVEL_DEVICEID);
-	$specialLogUsers = [];
-
-	// Filelog settings
-	define('LOGFILEDIR', '/var/log/grommunio-sync/');
-	define('LOGFILE', LOGFILEDIR . 'grommunio-sync.log');
-	define('LOGERRORFILE', LOGFILEDIR . 'grommunio-sync-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', 'grommunio-sync');
-	// 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.
-	// define('CAINFO', '/etc/ssl/certs/EmailCA.pem');
+    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:
+    //   $specialLogUsers = array('info@domain.com', 'myusername');
+    define('LOGUSERLEVEL', LOGLEVEL_DEVICEID);
+    $specialLogUsers = [];
+
+    // Filelog settings
+    define('LOGFILEDIR', '/var/log/grommunio-sync/');
+    define('LOGFILE', LOGFILEDIR . 'grommunio-sync.log');
+    define('LOGERRORFILE', LOGFILEDIR . 'grommunio-sync-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', 'grommunio-sync');
+    // 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.
+    // define('CAINFO', '/etc/ssl/certs/EmailCA.pem');
 
 /*
  *  Mobile settings
  */
-	// Device Provisioning
-	define('PROVISIONING', true);
-
-	// This option allows the 'loose enforcement' of the provisioning policies for older
-	// devices which don't support provisioning (like WM 5 and HTC Android Mail) - dw2412 contribution
-	// false (default) - Enforce provisioning for all devices
-	// true - allow older devices, but enforce policies on devices which support it
-	define('LOOSE_PROVISIONING', false);
-
-	// Retrieve polcies for a user from admin API using the following endpoint
-	define('ADMIN_API_POLICY_ENDPOINT', 'http://[::1]:8080/api/v1/service/syncPolicy/');
-
-	// Retrieve and update remote wipe status for a user and device from admin API using the following endpoint
-	define('ADMIN_API_WIPE_ENDPOINT', 'http://[::1]:8080/api/v1/service/wipe/');
-
-	// Default conflict preference
-	// Some devices allow to set if the server or PIM (mobile)
-	// should win in case of a synchronization conflict
-	//   SYNC_CONFLICT_OVERWRITE_SERVER - Server is overwritten, PIM wins
-	//   SYNC_CONFLICT_OVERWRITE_PIM    - PIM is overwritten, Server wins (default)
-	define('SYNC_CONFLICT_DEFAULT', SYNC_CONFLICT_OVERWRITE_PIM);
-
-	// Global limitation of items to be synchronized
-	// The mobile can define a sync back period for calendar and email items
-	// For large stores with many items the time period could be limited to a max value
-	// If the mobile transmits a wider time period, the defined max value is used
-	// Applicable values:
-	//   SYNC_FILTERTYPE_ALL (default, no limitation)
-	//   SYNC_FILTERTYPE_1DAY, SYNC_FILTERTYPE_3DAYS, SYNC_FILTERTYPE_1WEEK, SYNC_FILTERTYPE_2WEEKS,
-	//   SYNC_FILTERTYPE_1MONTH, SYNC_FILTERTYPE_3MONTHS, SYNC_FILTERTYPE_6MONTHS
-	define('SYNC_FILTERTIME_MAX', SYNC_FILTERTYPE_ALL);
-
-	// Interval in seconds before checking if there are changes on the server when in Ping.
-	// It means the highest time span before a change is pushed to a mobile. Set it to
-	// a higher value if you have a high load on the server.
-	define('PING_INTERVAL', 30);
-
-	// Set the fileas (save as) order for contacts in the webaccess/webapp/outlook.
-	// It will only affect new/modified contacts on the mobile which then are synced to the server.
-	// Possible values are:
-	// SYNC_FILEAS_FIRSTLAST    - fileas will be "Firstname Middlename Lastname"
-	// SYNC_FILEAS_LASTFIRST    - fileas will be "Lastname, Firstname Middlename"
-	// SYNC_FILEAS_COMPANYONLY  - fileas will be "Company"
-	// SYNC_FILEAS_COMPANYLAST  - fileas will be "Company (Lastname, Firstname Middlename)"
-	// SYNC_FILEAS_COMPANYFIRST - fileas will be "Company (Firstname Middlename Lastname)"
-	// SYNC_FILEAS_LASTCOMPANY  - fileas will be "Lastname, Firstname Middlename (Company)"
-	// SYNC_FILEAS_FIRSTCOMPANY - fileas will be "Firstname Middlename Lastname (Company)"
-	// The company-fileas will only be set if a contact has a company set. If one of
-	// company-fileas is selected and a contact doesn't have a company set, it will default
-	// to SYNC_FILEAS_FIRSTLAST or SYNC_FILEAS_LASTFIRST (depending on if last or first
-	// option is selected for company).
-	// If SYNC_FILEAS_COMPANYONLY is selected and company of the contact is not set
-	// SYNC_FILEAS_LASTFIRST will be used
-	define('FILEAS_ORDER', SYNC_FILEAS_LASTFIRST);
-
-	// Maximum amount of items to be synchronized per request.
-	// Normally this value is requested by the mobile. Common values are 5, 25, 50 or 100.
-	// Exporting too much items can cause mobile timeout on busy systems.
-	// grommunio-sync will use the lowest provided value, either set here or by the mobile.
-	// MS Outlook 2013+ request up to 512 items to accelerate the sync process.
-	// If you detect high load (also on subsystems) you could try a lower setting.
-	// max: 512 - value used if mobile does not limit amount of items
-	define('SYNC_MAX_ITEMS', 512);
-
-	// The devices usually send a list of supported properties for calendar and contact
-	// items. If a device does not includes such a supported property in Sync request,
-	// it means the property's value will be deleted on the server.
-	// However some devices do not send a list of supported properties. It is then impossible
-	// to tell if a property was deleted or it was not set at all if it does not appear in Sync.
-	// This parameter defines grommunio-sync behaviour during Sync if a device does not issue a list with
-	// supported properties.
-	// See also https://jira.z-hub.io/browse/ZP-302.
-	// Possible values:
-	// false - do not unset properties which are not sent during Sync (default)
-	// true  - unset properties which are not sent during Sync
-	define('UNSET_UNDEFINED_PROPERTIES', false);
-
-	// ActiveSync specifies that a contact photo may not exceed 48 KB. This value is checked
-	// in the semantic sanity checks and contacts with larger photos are not synchronized.
-	// This limitation is not being followed by the ActiveSync clients which set much bigger
-	// contact photos. You can override the default value of the max photo size.
-	// default: 5242880 - 5 MB default max photo size in bytes
-	define('SYNC_CONTACTS_MAXPICTURESIZE', 5242880);
-
-	// Users with many folders can use the 'partial foldersync' feature, where the server
-	// actively stops processing the folder list if it takes too long. Other requests are
-	// then redirected to the FolderSync to synchronize the remaining items.
-	// Device compatibility for this procedure is not fully understood.
-	// NOTE: THIS IS AN EXPERIMENTAL FEATURE WHICH COULD PREVENT YOUR MOBILES FROM SYNCHRONIZING.
-	define('USE_PARTIAL_FOLDERSYNC', false);
-
-	// The minimum accepted time in second that a ping command should last.
-	// It is strongly advised to keep this config to false. Some device
-	// might not be able to send a higher value than the one specified here and thus
-	// unable to start a push connection.
-	// If set to false, there will be no lower bound to the ping lifetime.
-	// The minimum accepted value is 1 second. The maximum accepted value is 3540 seconds (59 minutes).
-	define('PING_LOWER_BOUND_LIFETIME', false);
-
-	// The maximum accepted time in second that a ping command should last.
-	// If set to false, there will be no higher bound to the ping lifetime.
-	// The minimum accepted value is 1 second. The maximum accepted value is 3540 seconds (59 minutes).
-	define('PING_HIGHER_BOUND_LIFETIME', false);
-
-	// Maximum response time
-	// Mobiles implement different timeouts to their TCP/IP connections. Android devices for example
-	// have a hard timeout of 30 seconds. If the server is not able to answer a request within this timeframe,
-	// the answer will not be received and the device will send a new one overloading the server.
-	// There are three categories
-	//   - Short timeout  - server has up within 30 seconds - is automatically applied for not categorized types
-	//   - Medium timeout - server has up to 90 seconds to respond
-	//   - Long timeout   - server has up to 4 minutes to respond
-	// If a timeout is almost reached the server will break and sent the results it has until this
-	// point. You can add DeviceType strings to the categories.
-	// In general longer timeouts are better, because more data can be streamed at once.
-	define('SYNC_TIMEOUT_MEDIUM_DEVICETYPES', "SAMSUNGGTI");
-	define('SYNC_TIMEOUT_LONG_DEVICETYPES', "iPod, iPad, iPhone, WP, WindowsOutlook, WindowsMail");
-
-	// Time in seconds the device should wait whenever the service is unavailable,
-	// e.g. when a backend service is unavailable.
-	// grommunio-sync sends a "Retry-After" header in the response with the here defined value.
-	// It is up to the device to respect or not this directive so even if this option is set,
-	// the device might not wait requested time frame.
-	// Number of seconds before retry, to disable set to: false
-	define('RETRY_AFTER_DELAY', 300);
+    // Device Provisioning
+    define('PROVISIONING', true);
+
+    // This option allows the 'loose enforcement' of the provisioning policies for older
+    // devices which don't support provisioning (like WM 5 and HTC Android Mail) - dw2412 contribution
+    // false (default) - Enforce provisioning for all devices
+    // true - allow older devices, but enforce policies on devices which support it
+    define('LOOSE_PROVISIONING', false);
+
+    // Retrieve polcies for a user from admin API using the following endpoint
+    define('ADMIN_API_POLICY_ENDPOINT', 'http://[::1]:8080/api/v1/service/syncPolicy/');
+
+    // Retrieve and update remote wipe status for a user and device from admin API using the following endpoint
+    define('ADMIN_API_WIPE_ENDPOINT', 'http://[::1]:8080/api/v1/service/wipe/');
+
+    // Default conflict preference
+    // Some devices allow to set if the server or PIM (mobile)
+    // should win in case of a synchronization conflict
+    //   SYNC_CONFLICT_OVERWRITE_SERVER - Server is overwritten, PIM wins
+    //   SYNC_CONFLICT_OVERWRITE_PIM    - PIM is overwritten, Server wins (default)
+    define('SYNC_CONFLICT_DEFAULT', SYNC_CONFLICT_OVERWRITE_PIM);
+
+    // Global limitation of items to be synchronized
+    // The mobile can define a sync back period for calendar and email items
+    // For large stores with many items the time period could be limited to a max value
+    // If the mobile transmits a wider time period, the defined max value is used
+    // Applicable values:
+    //   SYNC_FILTERTYPE_ALL (default, no limitation)
+    //   SYNC_FILTERTYPE_1DAY, SYNC_FILTERTYPE_3DAYS, SYNC_FILTERTYPE_1WEEK, SYNC_FILTERTYPE_2WEEKS,
+    //   SYNC_FILTERTYPE_1MONTH, SYNC_FILTERTYPE_3MONTHS, SYNC_FILTERTYPE_6MONTHS
+    define('SYNC_FILTERTIME_MAX', SYNC_FILTERTYPE_ALL);
+
+    // Interval in seconds before checking if there are changes on the server when in Ping.
+    // It means the highest time span before a change is pushed to a mobile. Set it to
+    // a higher value if you have a high load on the server.
+    define('PING_INTERVAL', 30);
+
+    // Set the fileas (save as) order for contacts in the webaccess/webapp/outlook.
+    // It will only affect new/modified contacts on the mobile which then are synced to the server.
+    // Possible values are:
+    // SYNC_FILEAS_FIRSTLAST    - fileas will be "Firstname Middlename Lastname"
+    // SYNC_FILEAS_LASTFIRST    - fileas will be "Lastname, Firstname Middlename"
+    // SYNC_FILEAS_COMPANYONLY  - fileas will be "Company"
+    // SYNC_FILEAS_COMPANYLAST  - fileas will be "Company (Lastname, Firstname Middlename)"
+    // SYNC_FILEAS_COMPANYFIRST - fileas will be "Company (Firstname Middlename Lastname)"
+    // SYNC_FILEAS_LASTCOMPANY  - fileas will be "Lastname, Firstname Middlename (Company)"
+    // SYNC_FILEAS_FIRSTCOMPANY - fileas will be "Firstname Middlename Lastname (Company)"
+    // The company-fileas will only be set if a contact has a company set. If one of
+    // company-fileas is selected and a contact doesn't have a company set, it will default
+    // to SYNC_FILEAS_FIRSTLAST or SYNC_FILEAS_LASTFIRST (depending on if last or first
+    // option is selected for company).
+    // If SYNC_FILEAS_COMPANYONLY is selected and company of the contact is not set
+    // SYNC_FILEAS_LASTFIRST will be used
+    define('FILEAS_ORDER', SYNC_FILEAS_LASTFIRST);
+
+    // Maximum amount of items to be synchronized per request.
+    // Normally this value is requested by the mobile. Common values are 5, 25, 50 or 100.
+    // Exporting too much items can cause mobile timeout on busy systems.
+    // grommunio-sync will use the lowest provided value, either set here or by the mobile.
+    // MS Outlook 2013+ request up to 512 items to accelerate the sync process.
+    // If you detect high load (also on subsystems) you could try a lower setting.
+    // max: 512 - value used if mobile does not limit amount of items
+    define('SYNC_MAX_ITEMS', 512);
+
+    // The devices usually send a list of supported properties for calendar and contact
+    // items. If a device does not includes such a supported property in Sync request,
+    // it means the property's value will be deleted on the server.
+    // However some devices do not send a list of supported properties. It is then impossible
+    // to tell if a property was deleted or it was not set at all if it does not appear in Sync.
+    // This parameter defines grommunio-sync behaviour during Sync if a device does not issue a list with
+    // supported properties.
+    // See also https://jira.z-hub.io/browse/ZP-302.
+    // Possible values:
+    // false - do not unset properties which are not sent during Sync (default)
+    // true  - unset properties which are not sent during Sync
+    define('UNSET_UNDEFINED_PROPERTIES', false);
+
+    // ActiveSync specifies that a contact photo may not exceed 48 KB. This value is checked
+    // in the semantic sanity checks and contacts with larger photos are not synchronized.
+    // This limitation is not being followed by the ActiveSync clients which set much bigger
+    // contact photos. You can override the default value of the max photo size.
+    // default: 5242880 - 5 MB default max photo size in bytes
+    define('SYNC_CONTACTS_MAXPICTURESIZE', 5242880);
+
+    // Users with many folders can use the 'partial foldersync' feature, where the server
+    // actively stops processing the folder list if it takes too long. Other requests are
+    // then redirected to the FolderSync to synchronize the remaining items.
+    // Device compatibility for this procedure is not fully understood.
+    // NOTE: THIS IS AN EXPERIMENTAL FEATURE WHICH COULD PREVENT YOUR MOBILES FROM SYNCHRONIZING.
+    define('USE_PARTIAL_FOLDERSYNC', false);
+
+    // The minimum accepted time in second that a ping command should last.
+    // It is strongly advised to keep this config to false. Some device
+    // might not be able to send a higher value than the one specified here and thus
+    // unable to start a push connection.
+    // If set to false, there will be no lower bound to the ping lifetime.
+    // The minimum accepted value is 1 second. The maximum accepted value is 3540 seconds (59 minutes).
+    define('PING_LOWER_BOUND_LIFETIME', false);
+
+    // The maximum accepted time in second that a ping command should last.
+    // If set to false, there will be no higher bound to the ping lifetime.
+    // The minimum accepted value is 1 second. The maximum accepted value is 3540 seconds (59 minutes).
+    define('PING_HIGHER_BOUND_LIFETIME', false);
+
+    // Maximum response time
+    // Mobiles implement different timeouts to their TCP/IP connections. Android devices for example
+    // have a hard timeout of 30 seconds. If the server is not able to answer a request within this timeframe,
+    // the answer will not be received and the device will send a new one overloading the server.
+    // There are three categories
+    //   - Short timeout  - server has up within 30 seconds - is automatically applied for not categorized types
+    //   - Medium timeout - server has up to 90 seconds to respond
+    //   - Long timeout   - server has up to 4 minutes to respond
+    // If a timeout is almost reached the server will break and sent the results it has until this
+    // point. You can add DeviceType strings to the categories.
+    // In general longer timeouts are better, because more data can be streamed at once.
+    define('SYNC_TIMEOUT_MEDIUM_DEVICETYPES', "SAMSUNGGTI");
+    define('SYNC_TIMEOUT_LONG_DEVICETYPES', "iPod, iPad, iPhone, WP, WindowsOutlook, WindowsMail");
+
+    // Time in seconds the device should wait whenever the service is unavailable,
+    // e.g. when a backend service is unavailable.
+    // grommunio-sync sends a "Retry-After" header in the response with the here defined value.
+    // It is up to the device to respect or not this directive so even if this option is set,
+    // the device might not wait requested time frame.
+    // Number of seconds before retry, to disable set to: false
+    define('RETRY_AFTER_DELAY', 300);
 
 /*
  *  Grommunio settings
  */
-	// Defines the server to which we want to connect.
-	define('MAPI_SERVER', 'default:');
+    // Defines the server to which we want to connect.
+    define('MAPI_SERVER', 'default:');
 
-	// Hidden state folder in store
-	define('STORE_STATE_FOLDER', 'GS-SyncState');
+    // Hidden state folder in store
+    define('STORE_STATE_FOLDER', 'GS-SyncState');
 
-	// Redis host
-	define('REDIS_HOST', 'localhost');
+    // Redis host
+    define('REDIS_HOST', 'localhost');
 
-	// Redis port
-	define('REDIS_PORT', 6379);
+    // Redis port
+    define('REDIS_PORT', 6379);
 
-	// Redis authentication - leave empty to connect without authentication (default)
-	define('REDIS_AUTH', '');
+    // Redis authentication - leave empty to connect without authentication (default)
+    define('REDIS_AUTH', '');
 
-	// Time in seconds for the server search. Setting it too high might result in timeout.
-	// Setting it too low might not return all results. Default is 10.
-	define('SEARCH_WAIT', 10);
-	// The maximum number of results to send to the client. Setting it too high
-	// might result in timeout. Default is 10.
-	define('SEARCH_MAXRESULTS', 10);
+    // Time in seconds for the server search. Setting it too high might result in timeout.
+    // Setting it too low might not return all results. Default is 10.
+    define('SEARCH_WAIT', 10);
+    // The maximum number of results to send to the client. Setting it too high
+    // might result in timeout. Default is 10.
+    define('SEARCH_MAXRESULTS', 10);
 
 /*
  *  Synchronize additional folders to all mobiles
@@ -294,10 +294,10 @@ 
  *    added/modified folders.
  */
 
-	$additionalFolders = [
-		// demo entry for the synchronization of contacts from the public folder.
-		// uncomment (remove '/*' '*/') and fill in the folderid
-		/*
+    $additionalFolders = [
+        // demo entry for the synchronization of contacts from the public folder.
+        // uncomment (remove '/*' '*/') and fill in the folderid
+        /*
 		[
 			'store'     => "SYSTEM",
 			'folderid'  => "",
@@ -306,4 +306,4 @@ 
 			'flags'     => DeviceManager::FLD_FLAGS_NONE,
 		],
 		*/
-	];
+    ];

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
 	define('TIMEZONE', '');
 
 	// Defines the base path on the server
-	define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . '/');
+	define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
 
 	// Try to set unlimited timeout
 	define('SCRIPT_TIMEOUT', 0);
@@ -80,8 +80,8 @@ 
 
 	// Filelog settings
 	define('LOGFILEDIR', '/var/log/grommunio-sync/');
-	define('LOGFILE', LOGFILEDIR . 'grommunio-sync.log');
-	define('LOGERRORFILE', LOGFILEDIR . 'grommunio-sync-error.log');
+	define('LOGFILE', LOGFILEDIR.'grommunio-sync.log');
+	define('LOGERRORFILE', LOGFILEDIR.'grommunio-sync-error.log');
 
 	// Syslog settings
 	// false will log to local syslog, otherwise put the remote syslog IP here

index.php

Indentation +243 added lines, -243 removed lines

@@ -15,250 +15,250 @@
 require_once 'vendor/autoload.php';
 
 if (!defined('GSYNC_CONFIG')) {
-	define('GSYNC_CONFIG', 'config.php');
+    define('GSYNC_CONFIG', 'config.php');
 }
 
 include_once GSYNC_CONFIG;
 
-	// Attempt to set maximum execution time
-	ini_set('max_execution_time', SCRIPT_TIMEOUT);
-	set_time_limit(SCRIPT_TIMEOUT);
-
-	try {
-		// check config & initialize the basics
-		GSync::CheckConfig();
-		Request::Initialize();
-		SLog::Initialize();
-
-		SLog::Write(LOGLEVEL_DEBUG, "-------- Start");
-		SLog::Write(
-			LOGLEVEL_DEBUG,
-			sprintf(
-				"cmd='%s' devType='%s' devId='%s' getUser='%s' from='%s' version='%s' method='%s'",
-				Request::GetCommand(),
-				Request::GetDeviceType(),
-				Request::GetDeviceID(),
-				Request::GetGETUser(),
-				Request::GetRemoteAddr(),
-				@constant('GROMMUNIOSYNC_VERSION'),
-				Request::GetMethod()
-			)
-		);
-
-		// always request the authorization header
-		if (!Request::HasAuthenticationInfo() || !Request::GetGETUser()) {
-			throw new AuthenticationRequiredException("Access denied. Please send authorisation information");
-		}
-
-		GSync::CheckAdvancedConfig();
-
-		// Process request headers and look for AS headers
-		Request::ProcessHeaders();
-
-		// Stop here if this is an OPTIONS request
-		if (Request::IsMethodOPTIONS()) {
-			RequestProcessor::Authenticate();
-
-			throw new NoPostRequestException("Options request", NoPostRequestException::OPTIONS_REQUEST);
-		}
-
-		// Check required GET parameters
-		if (Request::IsMethodPOST() && (Request::GetCommandCode() === false || !Request::GetDeviceID() || !Request::GetDeviceType())) {
-			throw new FatalException("Requested the grommunio-sync URL without the required GET parameters");
-		}
-
-		// Load the backend
-		$backend = GSync::GetBackend();
-
-		// check the provisioning information
-		if (
-				PROVISIONING === true &&
-				Request::IsMethodPOST() &&
-				GSync::CommandNeedsProvisioning(Request::GetCommandCode()) &&
-				(
-					(Request::WasPolicyKeySent() && Request::GetPolicyKey() == 0) ||
-					GSync::GetProvisioningManager()->ProvisioningRequired(Request::GetPolicyKey())
-				) && (
-					LOOSE_PROVISIONING === false ||
-					(LOOSE_PROVISIONING === true && Request::WasPolicyKeySent())
-				)) {
-			// TODO for AS 14 send a wbxml response
-			throw new ProvisioningRequiredException();
-		}
-
-		// most commands require an authenticated user
-		if (GSync::CommandNeedsAuthentication(Request::GetCommandCode())) {
-			RequestProcessor::Authenticate();
-		}
-
-		// Do the actual processing of the request
-		if (Request::IsMethodGET()) {
-			throw new NoPostRequestException("This is the grommunio-sync location and can only be accessed by Microsoft ActiveSync-capable devices", NoPostRequestException::GET_REQUEST);
-		}
-
-		// Do the actual request
-		header(GSync::GetServerHeader());
-
-		if (RequestProcessor::isUserAuthenticated()) {
-			header("X-Grommunio-Sync-Version: " . @constant('GROMMUNIOSYNC_VERSION'));
-
-			// announce the supported AS versions (if not already sent to device)
-			if (GSync::GetDeviceManager()->AnnounceASVersion()) {
-				$versions = GSync::GetSupportedProtocolVersions(true);
-				SLog::Write(LOGLEVEL_INFO, sprintf("Announcing latest AS version to device: %s", $versions));
-				header("X-MS-RP: " . $versions);
-			}
-		}
-
-		RequestProcessor::Initialize();
-		RequestProcessor::HandleRequest();
-
-		// eventually the RequestProcessor wants to send other headers to the mobile
-		foreach (RequestProcessor::GetSpecialHeaders() as $header) {
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("Special header: %s", $header));
-			header($header);
-		}
-
-		// stream the data
-		$len = ob_get_length();
-		$data = ob_get_contents();
-		ob_end_clean();
-
-		// log amount of data transferred
-		// TODO check $len when streaming more data (e.g. Attachments), as the data will be send chunked
-		if (GSync::GetDeviceManager(false)) {
-			GSync::GetDeviceManager()->SentData($len);
-		}
-
-		// Unfortunately, even though grommunio-sync can stream the data to the client
-		// with a chunked encoding, using chunked encoding breaks the progress bar
-		// on the PDA. So the data is de-chunk here, written a content-length header and
-		// data send as a 'normal' packet. If the output packet exceeds 1MB (see ob_start)
-		// then it will be sent as a chunked packet anyway because PHP will have to flush
-		// the buffer.
-		if (!headers_sent()) {
-			header("Content-Length: {$len}");
-		}
-
-		// send vnd.ms-sync.wbxml content type header if there is no content
-		// otherwise text/html content type is added which might break some devices
-		if (!headers_sent() && $len == 0) {
-			header("Content-Type: application/vnd.ms-sync.wbxml");
-		}
-
-		echo $data;
-
-		// destruct backend after all data is on the stream
-		$backend->Logoff();
-	}
-	catch (NoPostRequestException $nopostex) {
-		if ($nopostex->getCode() == NoPostRequestException::OPTIONS_REQUEST) {
-			header(GSync::GetServerHeader());
-			header(GSync::GetSupportedProtocolVersions());
-			header(GSync::GetSupportedCommands());
-			SLog::Write(LOGLEVEL_INFO, $nopostex->getMessage());
-		}
-		elseif ($nopostex->getCode() == NoPostRequestException::GET_REQUEST) {
-			if (Request::GetUserAgent()) {
-				SLog::Write(LOGLEVEL_INFO, sprintf("User-agent: '%s'", Request::GetUserAgent()));
-			}
-			if (!headers_sent() && $nopostex->showLegalNotice()) {
-				GSync::PrintGrommunioSyncLegal('GET not supported', $nopostex->getMessage());
-			}
-		}
-	}
-	catch (Exception $ex) {
-		// Extract any previous exception message for logging purpose.
-		$exclass = get_class($ex);
-		$exception_message = $ex->getMessage();
-		if ($ex->getPrevious()) {
-			do {
-				$current_exception = $ex->getPrevious();
-				$exception_message .= ' -> ' . $current_exception->getMessage();
-			}
-			while ($current_exception->getPrevious());
-		}
-
-		if (Request::GetUserAgent()) {
-			SLog::Write(LOGLEVEL_INFO, sprintf("User-agent: '%s'", Request::GetUserAgent()));
-		}
-
-		SLog::Write(LOGLEVEL_FATAL, sprintf('Exception: (%s) - %s', $exclass, $exception_message));
-
-		if (!headers_sent()) {
-			if ($ex instanceof GSyncException) {
-				header('HTTP/1.1 ' . $ex->getHTTPCodeString());
-				foreach ($ex->getHTTPHeaders() as $h) {
-					header($h);
-				}
-			}
-			// something really unexpected happened!
-			else {
-				header('HTTP/1.1 500 Internal Server Error');
-			}
-		}
-
-		if ($ex instanceof AuthenticationRequiredException) {
-			// Only print GSync legal message for GET requests because
-			// some devices send unauthorized OPTIONS requests
-			// and don't expect anything in the response body
-			if (Request::IsMethodGET()) {
-				GSync::PrintGrommunioSyncLegal($exclass, sprintf('<pre>%s</pre>', $ex->getMessage()));
-			}
-
-			// log the failed login attempt e.g. for fail2ban
-			if (defined('LOGAUTHFAIL') && LOGAUTHFAIL != false) {
-				SLog::Write(LOGLEVEL_WARN, sprintf("IP: %s failed to authenticate user '%s'", Request::GetRemoteAddr(), Request::GetAuthUser() ? Request::GetAuthUser() : Request::GetGETUser()));
-			}
-		}
-
-		// This could be a WBXML problem.. try to get the complete request
-		elseif ($ex instanceof WBXMLException) {
-			SLog::Write(LOGLEVEL_FATAL, "Request could not be processed correctly due to a WBXMLException. Please report this including the 'WBXML debug data' logged. Be aware that the debug data could contain confidential information.");
-		}
-
-		// Try to output some kind of error information. This is only possible if
-		// the output had not started yet. If it has started already, we can't show the user the error, and
-		// the device will give its own (useless) error message.
-		elseif (!($ex instanceof GSyncException) || $ex->showLegalNotice()) {
-			$cmdinfo = (Request::GetCommand()) ? sprintf(" processing command <i>%s</i>", Request::GetCommand()) : "";
-			$extrace = $ex->getTrace();
-			$trace = (!empty($extrace)) ? "\n\nTrace:\n" . print_r($extrace, 1) : "";
-			GSync::PrintGrommunioSyncLegal($exclass . $cmdinfo, sprintf('<pre>%s</pre>', $ex->getMessage() . $trace));
-		}
-
-		// Announce exception to process loop detection
-		if (GSync::GetDeviceManager(false)) {
-			GSync::GetDeviceManager()->AnnounceProcessException($ex);
-		}
-
-		// Announce exception if the TopCollector if available
-		GSync::GetTopCollector()->AnnounceInformation(get_class($ex), true);
-	}
-
-	// save device data if the DeviceManager is available
-	if (GSync::GetDeviceManager(false)) {
-		GSync::GetDeviceManager()->Save();
-	}
-
-	// end gracefully
-	SLog::Write(
-		LOGLEVEL_INFO,
-		sprintf(
-			"cmd='%s' memory='%s/%s' time='%ss' devType='%s' devId='%s' getUser='%s' from='%s' idle='%ss' version='%s' method='%s' httpcode='%s'",
-			Request::GetCommand(),
-			Utils::FormatBytes(memory_get_peak_usage(false)),
-			Utils::FormatBytes(memory_get_peak_usage(true)),
-			number_format(microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"], 2),
-			Request::GetDeviceType(),
-			Request::GetDeviceID(),
-			Request::GetGETUser(),
-			Request::GetRemoteAddr(),
-			RequestProcessor::GetWaitTime(),
-			@constant('GROMMUNIOSYNC_VERSION'),
-			Request::GetMethod(),
-			http_response_code()
-		)
-	);
-
-	SLog::Write(LOGLEVEL_DEBUG, "-------- End");
+    // Attempt to set maximum execution time
+    ini_set('max_execution_time', SCRIPT_TIMEOUT);
+    set_time_limit(SCRIPT_TIMEOUT);
+
+    try {
+        // check config & initialize the basics
+        GSync::CheckConfig();
+        Request::Initialize();
+        SLog::Initialize();
+
+        SLog::Write(LOGLEVEL_DEBUG, "-------- Start");
+        SLog::Write(
+            LOGLEVEL_DEBUG,
+            sprintf(
+                "cmd='%s' devType='%s' devId='%s' getUser='%s' from='%s' version='%s' method='%s'",
+                Request::GetCommand(),
+                Request::GetDeviceType(),
+                Request::GetDeviceID(),
+                Request::GetGETUser(),
+                Request::GetRemoteAddr(),
+                @constant('GROMMUNIOSYNC_VERSION'),
+                Request::GetMethod()
+            )
+        );
+
+        // always request the authorization header
+        if (!Request::HasAuthenticationInfo() || !Request::GetGETUser()) {
+            throw new AuthenticationRequiredException("Access denied. Please send authorisation information");
+        }
+
+        GSync::CheckAdvancedConfig();
+
+        // Process request headers and look for AS headers
+        Request::ProcessHeaders();
+
+        // Stop here if this is an OPTIONS request
+        if (Request::IsMethodOPTIONS()) {
+            RequestProcessor::Authenticate();
+
+            throw new NoPostRequestException("Options request", NoPostRequestException::OPTIONS_REQUEST);
+        }
+
+        // Check required GET parameters
+        if (Request::IsMethodPOST() && (Request::GetCommandCode() === false || !Request::GetDeviceID() || !Request::GetDeviceType())) {
+            throw new FatalException("Requested the grommunio-sync URL without the required GET parameters");
+        }
+
+        // Load the backend
+        $backend = GSync::GetBackend();
+
+        // check the provisioning information
+        if (
+                PROVISIONING === true &&
+                Request::IsMethodPOST() &&
+                GSync::CommandNeedsProvisioning(Request::GetCommandCode()) &&
+                (
+                    (Request::WasPolicyKeySent() && Request::GetPolicyKey() == 0) ||
+                    GSync::GetProvisioningManager()->ProvisioningRequired(Request::GetPolicyKey())
+                ) && (
+                    LOOSE_PROVISIONING === false ||
+                    (LOOSE_PROVISIONING === true && Request::WasPolicyKeySent())
+                )) {
+            // TODO for AS 14 send a wbxml response
+            throw new ProvisioningRequiredException();
+        }
+
+        // most commands require an authenticated user
+        if (GSync::CommandNeedsAuthentication(Request::GetCommandCode())) {
+            RequestProcessor::Authenticate();
+        }
+
+        // Do the actual processing of the request
+        if (Request::IsMethodGET()) {
+            throw new NoPostRequestException("This is the grommunio-sync location and can only be accessed by Microsoft ActiveSync-capable devices", NoPostRequestException::GET_REQUEST);
+        }
+
+        // Do the actual request
+        header(GSync::GetServerHeader());
+
+        if (RequestProcessor::isUserAuthenticated()) {
+            header("X-Grommunio-Sync-Version: " . @constant('GROMMUNIOSYNC_VERSION'));
+
+            // announce the supported AS versions (if not already sent to device)
+            if (GSync::GetDeviceManager()->AnnounceASVersion()) {
+                $versions = GSync::GetSupportedProtocolVersions(true);
+                SLog::Write(LOGLEVEL_INFO, sprintf("Announcing latest AS version to device: %s", $versions));
+                header("X-MS-RP: " . $versions);
+            }
+        }
+
+        RequestProcessor::Initialize();
+        RequestProcessor::HandleRequest();
+
+        // eventually the RequestProcessor wants to send other headers to the mobile
+        foreach (RequestProcessor::GetSpecialHeaders() as $header) {
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("Special header: %s", $header));
+            header($header);
+        }
+
+        // stream the data
+        $len = ob_get_length();
+        $data = ob_get_contents();
+        ob_end_clean();
+
+        // log amount of data transferred
+        // TODO check $len when streaming more data (e.g. Attachments), as the data will be send chunked
+        if (GSync::GetDeviceManager(false)) {
+            GSync::GetDeviceManager()->SentData($len);
+        }
+
+        // Unfortunately, even though grommunio-sync can stream the data to the client
+        // with a chunked encoding, using chunked encoding breaks the progress bar
+        // on the PDA. So the data is de-chunk here, written a content-length header and
+        // data send as a 'normal' packet. If the output packet exceeds 1MB (see ob_start)
+        // then it will be sent as a chunked packet anyway because PHP will have to flush
+        // the buffer.
+        if (!headers_sent()) {
+            header("Content-Length: {$len}");
+        }
+
+        // send vnd.ms-sync.wbxml content type header if there is no content
+        // otherwise text/html content type is added which might break some devices
+        if (!headers_sent() && $len == 0) {
+            header("Content-Type: application/vnd.ms-sync.wbxml");
+        }
+
+        echo $data;
+
+        // destruct backend after all data is on the stream
+        $backend->Logoff();
+    }
+    catch (NoPostRequestException $nopostex) {
+        if ($nopostex->getCode() == NoPostRequestException::OPTIONS_REQUEST) {
+            header(GSync::GetServerHeader());
+            header(GSync::GetSupportedProtocolVersions());
+            header(GSync::GetSupportedCommands());
+            SLog::Write(LOGLEVEL_INFO, $nopostex->getMessage());
+        }
+        elseif ($nopostex->getCode() == NoPostRequestException::GET_REQUEST) {
+            if (Request::GetUserAgent()) {
+                SLog::Write(LOGLEVEL_INFO, sprintf("User-agent: '%s'", Request::GetUserAgent()));
+            }
+            if (!headers_sent() && $nopostex->showLegalNotice()) {
+                GSync::PrintGrommunioSyncLegal('GET not supported', $nopostex->getMessage());
+            }
+        }
+    }
+    catch (Exception $ex) {
+        // Extract any previous exception message for logging purpose.
+        $exclass = get_class($ex);
+        $exception_message = $ex->getMessage();
+        if ($ex->getPrevious()) {
+            do {
+                $current_exception = $ex->getPrevious();
+                $exception_message .= ' -> ' . $current_exception->getMessage();
+            }
+            while ($current_exception->getPrevious());
+        }
+
+        if (Request::GetUserAgent()) {
+            SLog::Write(LOGLEVEL_INFO, sprintf("User-agent: '%s'", Request::GetUserAgent()));
+        }
+
+        SLog::Write(LOGLEVEL_FATAL, sprintf('Exception: (%s) - %s', $exclass, $exception_message));
+
+        if (!headers_sent()) {
+            if ($ex instanceof GSyncException) {
+                header('HTTP/1.1 ' . $ex->getHTTPCodeString());
+                foreach ($ex->getHTTPHeaders() as $h) {
+                    header($h);
+                }
+            }
+            // something really unexpected happened!
+            else {
+                header('HTTP/1.1 500 Internal Server Error');
+            }
+        }
+
+        if ($ex instanceof AuthenticationRequiredException) {
+            // Only print GSync legal message for GET requests because
+            // some devices send unauthorized OPTIONS requests
+            // and don't expect anything in the response body
+            if (Request::IsMethodGET()) {
+                GSync::PrintGrommunioSyncLegal($exclass, sprintf('<pre>%s</pre>', $ex->getMessage()));
+            }
+
+            // log the failed login attempt e.g. for fail2ban
+            if (defined('LOGAUTHFAIL') && LOGAUTHFAIL != false) {
+                SLog::Write(LOGLEVEL_WARN, sprintf("IP: %s failed to authenticate user '%s'", Request::GetRemoteAddr(), Request::GetAuthUser() ? Request::GetAuthUser() : Request::GetGETUser()));
+            }
+        }
+
+        // This could be a WBXML problem.. try to get the complete request
+        elseif ($ex instanceof WBXMLException) {
+            SLog::Write(LOGLEVEL_FATAL, "Request could not be processed correctly due to a WBXMLException. Please report this including the 'WBXML debug data' logged. Be aware that the debug data could contain confidential information.");
+        }
+
+        // Try to output some kind of error information. This is only possible if
+        // the output had not started yet. If it has started already, we can't show the user the error, and
+        // the device will give its own (useless) error message.
+        elseif (!($ex instanceof GSyncException) || $ex->showLegalNotice()) {
+            $cmdinfo = (Request::GetCommand()) ? sprintf(" processing command <i>%s</i>", Request::GetCommand()) : "";
+            $extrace = $ex->getTrace();
+            $trace = (!empty($extrace)) ? "\n\nTrace:\n" . print_r($extrace, 1) : "";
+            GSync::PrintGrommunioSyncLegal($exclass . $cmdinfo, sprintf('<pre>%s</pre>', $ex->getMessage() . $trace));
+        }
+
+        // Announce exception to process loop detection
+        if (GSync::GetDeviceManager(false)) {
+            GSync::GetDeviceManager()->AnnounceProcessException($ex);
+        }
+
+        // Announce exception if the TopCollector if available
+        GSync::GetTopCollector()->AnnounceInformation(get_class($ex), true);
+    }
+
+    // save device data if the DeviceManager is available
+    if (GSync::GetDeviceManager(false)) {
+        GSync::GetDeviceManager()->Save();
+    }
+
+    // end gracefully
+    SLog::Write(
+        LOGLEVEL_INFO,
+        sprintf(
+            "cmd='%s' memory='%s/%s' time='%ss' devType='%s' devId='%s' getUser='%s' from='%s' idle='%ss' version='%s' method='%s' httpcode='%s'",
+            Request::GetCommand(),
+            Utils::FormatBytes(memory_get_peak_usage(false)),
+            Utils::FormatBytes(memory_get_peak_usage(true)),
+            number_format(microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"], 2),
+            Request::GetDeviceType(),
+            Request::GetDeviceID(),
+            Request::GetGETUser(),
+            Request::GetRemoteAddr(),
+            RequestProcessor::GetWaitTime(),
+            @constant('GROMMUNIOSYNC_VERSION'),
+            Request::GetMethod(),
+            http_response_code()
+        )
+    );
+
+    SLog::Write(LOGLEVEL_DEBUG, "-------- End");

Spacing +6 added lines, -6 removed lines

@@ -100,13 +100,13 @@ 
 		header(GSync::GetServerHeader());
 
 		if (RequestProcessor::isUserAuthenticated()) {
-			header("X-Grommunio-Sync-Version: " . @constant('GROMMUNIOSYNC_VERSION'));
+			header("X-Grommunio-Sync-Version: ".@constant('GROMMUNIOSYNC_VERSION'));
 
 			// announce the supported AS versions (if not already sent to device)
 			if (GSync::GetDeviceManager()->AnnounceASVersion()) {
 				$versions = GSync::GetSupportedProtocolVersions(true);
 				SLog::Write(LOGLEVEL_INFO, sprintf("Announcing latest AS version to device: %s", $versions));
-				header("X-MS-RP: " . $versions);
+				header("X-MS-RP: ".$versions);
 			}
 		}
 
@@ -174,7 +174,7 @@ 
 		if ($ex->getPrevious()) {
 			do {
 				$current_exception = $ex->getPrevious();
-				$exception_message .= ' -> ' . $current_exception->getMessage();
+				$exception_message .= ' -> '.$current_exception->getMessage();
 			}
 			while ($current_exception->getPrevious());
 		}
@@ -187,7 +187,7 @@ 
 
 		if (!headers_sent()) {
 			if ($ex instanceof GSyncException) {
-				header('HTTP/1.1 ' . $ex->getHTTPCodeString());
+				header('HTTP/1.1 '.$ex->getHTTPCodeString());
 				foreach ($ex->getHTTPHeaders() as $h) {
 					header($h);
 				}
@@ -223,8 +223,8 @@ 
 		elseif (!($ex instanceof GSyncException) || $ex->showLegalNotice()) {
 			$cmdinfo = (Request::GetCommand()) ? sprintf(" processing command <i>%s</i>", Request::GetCommand()) : "";
 			$extrace = $ex->getTrace();
-			$trace = (!empty($extrace)) ? "\n\nTrace:\n" . print_r($extrace, 1) : "";
-			GSync::PrintGrommunioSyncLegal($exclass . $cmdinfo, sprintf('<pre>%s</pre>', $ex->getMessage() . $trace));
+			$trace = (!empty($extrace)) ? "\n\nTrace:\n".print_r($extrace, 1) : "";
+			GSync::PrintGrommunioSyncLegal($exclass.$cmdinfo, sprintf('<pre>%s</pre>', $ex->getMessage().$trace));
 		}
 
 		// Announce exception to process loop detection

Braces +3 added lines, -6 removed lines

@@ -150,15 +150,13 @@ 
 
 		// destruct backend after all data is on the stream
 		$backend->Logoff();
-	}
-	catch (NoPostRequestException $nopostex) {
+	} catch (NoPostRequestException $nopostex) {
 		if ($nopostex->getCode() == NoPostRequestException::OPTIONS_REQUEST) {
 			header(GSync::GetServerHeader());
 			header(GSync::GetSupportedProtocolVersions());
 			header(GSync::GetSupportedCommands());
 			SLog::Write(LOGLEVEL_INFO, $nopostex->getMessage());
-		}
-		elseif ($nopostex->getCode() == NoPostRequestException::GET_REQUEST) {
+		} elseif ($nopostex->getCode() == NoPostRequestException::GET_REQUEST) {
 			if (Request::GetUserAgent()) {
 				SLog::Write(LOGLEVEL_INFO, sprintf("User-agent: '%s'", Request::GetUserAgent()));
 			}
@@ -166,8 +164,7 @@ 
 				GSync::PrintGrommunioSyncLegal('GET not supported', $nopostex->getMessage());
 			}
 		}
-	}
-	catch (Exception $ex) {
+	} catch (Exception $ex) {
 		// Extract any previous exception message for logging purpose.
 		$exclass = get_class($ex);
 		$exception_message = $ex->getMessage();