grommunio / grommunio-sync

lib/syncobjects/syncresolverecipientsoptions.php

Indentation +21 added lines, -21 removed lines

@@ -10,27 +10,27 @@
  */
 
 class SyncResolveRecipientsOptions extends SyncObject {
-	public $certificateretrieval;
-	public $maxcertificates;
-	public $maxambiguousrecipients;
-	public $availability;
-	public $picture;
+    public $certificateretrieval;
+    public $maxcertificates;
+    public $maxambiguousrecipients;
+    public $availability;
+    public $picture;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_RESOLVERECIPIENTS_CERTIFICATERETRIEVAL => [self::STREAMER_VAR => "certificateretrieval"],
-			SYNC_RESOLVERECIPIENTS_MAXCERTIFICATES => [self::STREAMER_VAR => "maxcertificates"],
-			SYNC_RESOLVERECIPIENTS_MAXAMBIGUOUSRECIPIENTS => [self::STREAMER_VAR => "maxambiguousrecipients"],
-			SYNC_RESOLVERECIPIENTS_AVAILABILITY => [
-				self::STREAMER_VAR => "availability",
-				self::STREAMER_TYPE => "SyncResolveRecipientsAvailability",
-			],
-			SYNC_RESOLVERECIPIENTS_PICTURE => [
-				self::STREAMER_VAR => "picture",
-				self::STREAMER_TYPE => "SyncResolveRecipientsPicture",
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_RESOLVERECIPIENTS_CERTIFICATERETRIEVAL => [self::STREAMER_VAR => "certificateretrieval"],
+            SYNC_RESOLVERECIPIENTS_MAXCERTIFICATES => [self::STREAMER_VAR => "maxcertificates"],
+            SYNC_RESOLVERECIPIENTS_MAXAMBIGUOUSRECIPIENTS => [self::STREAMER_VAR => "maxambiguousrecipients"],
+            SYNC_RESOLVERECIPIENTS_AVAILABILITY => [
+                self::STREAMER_VAR => "availability",
+                self::STREAMER_TYPE => "SyncResolveRecipientsAvailability",
+            ],
+            SYNC_RESOLVERECIPIENTS_PICTURE => [
+                self::STREAMER_VAR => "picture",
+                self::STREAMER_TYPE => "SyncResolveRecipientsPicture",
+            ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

lib/syncobjects/synctaskrecurrence.php

Indentation +156 added lines, -156 removed lines

@@ -11,171 +11,171 @@
 
 // Exactly the same as SyncRecurrence, but then with SYNC_POOMTASKS_*
 class SyncTaskRecurrence extends SyncObject {
-	public $start;
-	public $type;
-	public $until;
-	public $occurrences;
-	public $interval;
-	public $dayofweek;
-	public $dayofmonth;
-	public $weekofmonth;
-	public $monthofyear;
-	public $regenerate;
-	public $deadoccur;
-	public $calendartype;
-	public $firstdayofweek;
+    public $start;
+    public $type;
+    public $until;
+    public $occurrences;
+    public $interval;
+    public $dayofweek;
+    public $dayofmonth;
+    public $weekofmonth;
+    public $monthofyear;
+    public $regenerate;
+    public $deadoccur;
+    public $calendartype;
+    public $firstdayofweek;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_POOMTASKS_START => [self::STREAMER_VAR => "start",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
-				self::STREAMER_RONOTIFY => true, ],
+    public function __construct() {
+        $mapping = [
+            SYNC_POOMTASKS_START => [self::STREAMER_VAR => "start",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
+                self::STREAMER_RONOTIFY => true, ],
 
-			// Recurrence type
-			// 0 = Recurs daily
-			// 1 = Recurs weekly
-			// 2 = Recurs monthly
-			// 3 = Recurs monthly on the nth day
-			// 5 = Recurs yearly
-			// 6 = Recurs yearly on the nth day
-			SYNC_POOMTASKS_TYPE => [
-				self::STREAMER_VAR => "type",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
-					self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3, 5, 6],
-				],
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_UNTIL => [
-				self::STREAMER_VAR => "until",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_OCCURRENCES => [
-				self::STREAMER_VAR => "occurrences",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_CMPHIGHER => 0,
-					self::STREAMER_CHECK_CMPLOWER => 1000,
-				],
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_INTERVAL => [
-				self::STREAMER_VAR => "interval",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_CMPHIGHER => 0,
-					self::STREAMER_CHECK_CMPLOWER => 1000,
-				],
-				self::STREAMER_RONOTIFY => true,
-			],
-			// TODO: check iOS5 sends deadoccur inside of the recurrence
-			SYNC_POOMTASKS_DEADOCCUR => [
-				self::STREAMER_VAR => "deadoccur",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_REGENERATE => [
-				self::STREAMER_VAR => "regenerate",
-				self::STREAMER_RONOTIFY => true,
-			],
-			// DayOfWeek values
-			//   1 = Sunday
-			//   2 = Monday
-			//   4 = Tuesday
-			//   8 = Wednesday
-			//  16 = Thursday
-			//  32 = Friday
-			//  62 = Weekdays  // TODO check: value set by WA with daily weekday recurrence
-			//  64 = Saturday
-			// 127 = The last day of the month. Value valid only in monthly or yearly recurrences.
-			SYNC_POOMTASKS_DAYOFWEEK => [
-				self::STREAMER_VAR => "dayofweek",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_CMPHIGHER => 0,
-					self::STREAMER_CHECK_CMPLOWER => 128,
-				],
-				self::STREAMER_RONOTIFY => true,
-			],
-			// DayOfMonth values
-			// 1-31 representing the day
-			SYNC_POOMTASKS_DAYOFMONTH => [
-				self::STREAMER_VAR => "dayofmonth",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_CMPHIGHER => 0,
-					self::STREAMER_CHECK_CMPLOWER => 32,
-				],
-				self::STREAMER_RONOTIFY => true,
-			],
-			// WeekOfMonth
-			// 1-4 = Y st/nd/rd/th week of month
-			// 5 = last week of month
-			SYNC_POOMTASKS_WEEKOFMONTH => [
-				self::STREAMER_VAR => "weekofmonth",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [1, 2, 3, 4, 5]],
-				self::STREAMER_RONOTIFY => true,
-			],
-			// MonthOfYear
-			// 1-12 representing the month
-			SYNC_POOMTASKS_MONTHOFYEAR => [
-				self::STREAMER_VAR => "monthofyear",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]],
-				self::STREAMER_RONOTIFY => true,
-			],
-		];
+            // Recurrence type
+            // 0 = Recurs daily
+            // 1 = Recurs weekly
+            // 2 = Recurs monthly
+            // 3 = Recurs monthly on the nth day
+            // 5 = Recurs yearly
+            // 6 = Recurs yearly on the nth day
+            SYNC_POOMTASKS_TYPE => [
+                self::STREAMER_VAR => "type",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
+                    self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3, 5, 6],
+                ],
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_UNTIL => [
+                self::STREAMER_VAR => "until",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_OCCURRENCES => [
+                self::STREAMER_VAR => "occurrences",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_CMPHIGHER => 0,
+                    self::STREAMER_CHECK_CMPLOWER => 1000,
+                ],
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_INTERVAL => [
+                self::STREAMER_VAR => "interval",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_CMPHIGHER => 0,
+                    self::STREAMER_CHECK_CMPLOWER => 1000,
+                ],
+                self::STREAMER_RONOTIFY => true,
+            ],
+            // TODO: check iOS5 sends deadoccur inside of the recurrence
+            SYNC_POOMTASKS_DEADOCCUR => [
+                self::STREAMER_VAR => "deadoccur",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_REGENERATE => [
+                self::STREAMER_VAR => "regenerate",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            // DayOfWeek values
+            //   1 = Sunday
+            //   2 = Monday
+            //   4 = Tuesday
+            //   8 = Wednesday
+            //  16 = Thursday
+            //  32 = Friday
+            //  62 = Weekdays  // TODO check: value set by WA with daily weekday recurrence
+            //  64 = Saturday
+            // 127 = The last day of the month. Value valid only in monthly or yearly recurrences.
+            SYNC_POOMTASKS_DAYOFWEEK => [
+                self::STREAMER_VAR => "dayofweek",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_CMPHIGHER => 0,
+                    self::STREAMER_CHECK_CMPLOWER => 128,
+                ],
+                self::STREAMER_RONOTIFY => true,
+            ],
+            // DayOfMonth values
+            // 1-31 representing the day
+            SYNC_POOMTASKS_DAYOFMONTH => [
+                self::STREAMER_VAR => "dayofmonth",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_CMPHIGHER => 0,
+                    self::STREAMER_CHECK_CMPLOWER => 32,
+                ],
+                self::STREAMER_RONOTIFY => true,
+            ],
+            // WeekOfMonth
+            // 1-4 = Y st/nd/rd/th week of month
+            // 5 = last week of month
+            SYNC_POOMTASKS_WEEKOFMONTH => [
+                self::STREAMER_VAR => "weekofmonth",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [1, 2, 3, 4, 5]],
+                self::STREAMER_RONOTIFY => true,
+            ],
+            // MonthOfYear
+            // 1-12 representing the month
+            SYNC_POOMTASKS_MONTHOFYEAR => [
+                self::STREAMER_VAR => "monthofyear",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]],
+                self::STREAMER_RONOTIFY => true,
+            ],
+        ];
 
-		if (Request::GetProtocolVersion() >= 14.0) {
-			$mapping[SYNC_POOMTASKS_CALENDARTYPE] = [
-				self::STREAMER_VAR => "calendartype",
-				self::STREAMER_RONOTIFY => true,
-			];
-		}
+        if (Request::GetProtocolVersion() >= 14.0) {
+            $mapping[SYNC_POOMTASKS_CALENDARTYPE] = [
+                self::STREAMER_VAR => "calendartype",
+                self::STREAMER_RONOTIFY => true,
+            ];
+        }
 
-		if (Request::GetProtocolVersion() >= 14.1) {
-			// First day of the calendar week for recurrence.
-			// FirstDayOfWeek values:
-			//   0 = Sunday
-			//   1 = Monday
-			//   2 = Tuesday
-			//   3 = Wednesday
-			//   4 = Thursday
-			//   5 = Friday
-			//   6 = Saturday
-			$mapping[SYNC_POOMTASKS_FIRSTDAYOFWEEK] = [
-				self::STREAMER_VAR => "firstdayofweek",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3, 4, 5, 6]],
-				self::STREAMER_RONOTIFY => true,
-			];
-		}
+        if (Request::GetProtocolVersion() >= 14.1) {
+            // First day of the calendar week for recurrence.
+            // FirstDayOfWeek values:
+            //   0 = Sunday
+            //   1 = Monday
+            //   2 = Tuesday
+            //   3 = Wednesday
+            //   4 = Thursday
+            //   5 = Friday
+            //   6 = Saturday
+            $mapping[SYNC_POOMTASKS_FIRSTDAYOFWEEK] = [
+                self::STREAMER_VAR => "firstdayofweek",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3, 4, 5, 6]],
+                self::STREAMER_RONOTIFY => true,
+            ];
+        }
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 
-	/**
-	 * Method checks if the object has the minimum of required parameters
-	 * and fulfills semantic dependencies.
-	 *
-	 * This overloads the general check() with special checks to be executed
-	 *
-	 * @param bool $logAsDebug (opt) default is false, so messages are logged in WARN log level
-	 *
-	 * @return bool
-	 */
-	public function Check($logAsDebug = false) {
-		$ret = parent::Check($logAsDebug);
+    /**
+     * Method checks if the object has the minimum of required parameters
+     * and fulfills semantic dependencies.
+     *
+     * This overloads the general check() with special checks to be executed
+     *
+     * @param bool $logAsDebug (opt) default is false, so messages are logged in WARN log level
+     *
+     * @return bool
+     */
+    public function Check($logAsDebug = false) {
+        $ret = parent::Check($logAsDebug);
 
-		// semantic checks general "turn off switch"
-		if (defined("DO_SEMANTIC_CHECKS") && DO_SEMANTIC_CHECKS === false) {
-			return $ret;
-		}
+        // semantic checks general "turn off switch"
+        if (defined("DO_SEMANTIC_CHECKS") && DO_SEMANTIC_CHECKS === false) {
+            return $ret;
+        }
 
-		if (!$ret) {
-			return false;
-		}
+        if (!$ret) {
+            return false;
+        }
 
-		if (isset($this->start, $this->until) && $this->until < $this->start) {
-			SLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter 'start' is HIGHER than 'until'. Check failed!", get_class($this)));
+        if (isset($this->start, $this->until) && $this->until < $this->start) {
+            SLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter 'start' is HIGHER than 'until'. Check failed!", get_class($this)));
 
-			return false;
-		}
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

lib/syncobjects/syncbasebodypart.php

Indentation +33 added lines, -33 removed lines

@@ -10,40 +10,40 @@
  */
 
 class SyncBaseBodyPart extends SyncObject {
-	public $status;
-	public $type; // Should be html (2)
-	public $estimatedDataSize;
-	public $truncated;
-	public $data;
-	public $preview;
+    public $status;
+    public $type; // Should be html (2)
+    public $estimatedDataSize;
+    public $truncated;
+    public $data;
+    public $preview;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_AIRSYNCBASE_STATUS => [self::STREAMER_VAR => "status"],
-			SYNC_AIRSYNCBASE_TYPE => [self::STREAMER_VAR => "type"],
-			SYNC_AIRSYNCBASE_ESTIMATEDDATASIZE => [
-				self::STREAMER_VAR => "estimatedDataSize",
-				// when stripping private we set the body to self::STRIP_PRIVATE_SUBSTITUTE, so the size needs to be its length
-				self::STREAMER_PRIVATE => strlen(self::STRIP_PRIVATE_SUBSTITUTE),
-			],
-			SYNC_AIRSYNCBASE_TRUNCATED => [self::STREAMER_VAR => "truncated"],
-			SYNC_AIRSYNCBASE_DATA => [
-				self::STREAMER_VAR => "data",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASPLAIN,
-				self::STREAMER_PROP => self::STREAMER_TYPE_MULTIPART,
-				self::STREAMER_RONOTIFY => true,
-				// replace the body with self::STRIP_PRIVATE_SUBSTITUTE when stripping private
-				self::STREAMER_PRIVATE => StringStreamWrapper::Open(self::STRIP_PRIVATE_SUBSTITUTE),
-			],
-			SYNC_AIRSYNCBASE_PREVIEW => [
-				self::STREAMER_VAR => "preview",
-				self::STREAMER_PRIVATE => self::STRIP_PRIVATE_SUBSTITUTE,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_AIRSYNCBASE_STATUS => [self::STREAMER_VAR => "status"],
+            SYNC_AIRSYNCBASE_TYPE => [self::STREAMER_VAR => "type"],
+            SYNC_AIRSYNCBASE_ESTIMATEDDATASIZE => [
+                self::STREAMER_VAR => "estimatedDataSize",
+                // when stripping private we set the body to self::STRIP_PRIVATE_SUBSTITUTE, so the size needs to be its length
+                self::STREAMER_PRIVATE => strlen(self::STRIP_PRIVATE_SUBSTITUTE),
+            ],
+            SYNC_AIRSYNCBASE_TRUNCATED => [self::STREAMER_VAR => "truncated"],
+            SYNC_AIRSYNCBASE_DATA => [
+                self::STREAMER_VAR => "data",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASPLAIN,
+                self::STREAMER_PROP => self::STREAMER_TYPE_MULTIPART,
+                self::STREAMER_RONOTIFY => true,
+                // replace the body with self::STRIP_PRIVATE_SUBSTITUTE when stripping private
+                self::STREAMER_PRIVATE => StringStreamWrapper::Open(self::STRIP_PRIVATE_SUBSTITUTE),
+            ],
+            SYNC_AIRSYNCBASE_PREVIEW => [
+                self::STREAMER_VAR => "preview",
+                self::STREAMER_PRIVATE => self::STRIP_PRIVATE_SUBSTITUTE,
+            ],
+        ];
 
-		parent::__construct($mapping);
+        parent::__construct($mapping);
 
-		// Indicates that this SyncObject supports the private flag and stripping of private data.
-		$this->supportsPrivateStripping = true;
-	}
+        // Indicates that this SyncObject supports the private flag and stripping of private data.
+        $this->supportsPrivateStripping = true;
+    }
 }

lib/syncobjects/syncemailaddresses.php

Indentation +12 added lines, -12 removed lines

@@ -10,18 +10,18 @@
  */
 
 class SyncEmailAddresses extends SyncObject {
-	public $smtpaddress;
-	public $primarysmtpaddress;
+    public $smtpaddress;
+    public $primarysmtpaddress;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_SETTINGS_SMPTADDRESS => [
-				self::STREAMER_VAR => "smtpaddress",
-				self::STREAMER_PROP => self::STREAMER_TYPE_NO_CONTAINER,
-				self::STREAMER_ARRAY => SYNC_SETTINGS_SMPTADDRESS, ],
-			SYNC_SETTINGS_PRIMARYSMTPADDRESS => [self::STREAMER_VAR => "primarysmtpaddress"],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_SETTINGS_SMPTADDRESS => [
+                self::STREAMER_VAR => "smtpaddress",
+                self::STREAMER_PROP => self::STREAMER_TYPE_NO_CONTAINER,
+                self::STREAMER_ARRAY => SYNC_SETTINGS_SMPTADDRESS, ],
+            SYNC_SETTINGS_PRIMARYSMTPADDRESS => [self::STREAMER_VAR => "primarysmtpaddress"],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

lib/syncobjects/syncprovisioning.php

Indentation +323 added lines, -323 removed lines

@@ -10,339 +10,339 @@
  */
 
 class SyncProvisioning extends SyncObject {
-	// AS 12.0, 12.1 and 14.0 props
-	public $devpwenabled;
-	public $alphanumpwreq;
-	public $devencenabled;
-	public $pwrecoveryenabled;
-	public $docbrowseenabled;
-	public $attenabled;
-	public $mindevpwlenngth;
-	public $maxinacttimedevlock;
-	public $maxdevpwfailedattempts;
-	public $maxattsize;
-	public $allowsimpledevpw;
-	public $devpwexpiration;
-	public $devpwhistory;
+    // AS 12.0, 12.1 and 14.0 props
+    public $devpwenabled;
+    public $alphanumpwreq;
+    public $devencenabled;
+    public $pwrecoveryenabled;
+    public $docbrowseenabled;
+    public $attenabled;
+    public $mindevpwlenngth;
+    public $maxinacttimedevlock;
+    public $maxdevpwfailedattempts;
+    public $maxattsize;
+    public $allowsimpledevpw;
+    public $devpwexpiration;
+    public $devpwhistory;
 
-	// AS 12.1 and 14.0 props
-	public $allowstoragecard;
-	public $allowcam;
-	public $reqdevenc;
-	public $allowunsignedapps;
-	public $allowunsigninstallpacks;
-	public $mindevcomplexchars;
-	public $allowwifi;
-	public $allowtextmessaging;
-	public $allowpopimapemail;
-	public $allowbluetooth;
-	public $allowirda;
-	public $reqmansyncroam;
-	public $allowdesktopsync;
-	public $maxcalagefilter;
-	public $allowhtmlemail;
-	public $maxemailagefilter;
-	public $maxemailbodytruncsize;
-	public $maxemailhtmlbodytruncsize;
-	public $reqsignedsmimemessages;
-	public $reqencsmimemessages;
-	public $reqsignedsmimealgorithm;
-	public $reqencsmimealgorithm;
-	public $allowsmimeencalgneg;
-	public $allowsmimesoftcerts;
-	public $allowbrowser;
-	public $allowconsumeremail;
-	public $allowremotedesk;
-	public $allowinternetsharing;
-	public $unapprovedinromapplist;
-	public $approvedapplist;
+    // AS 12.1 and 14.0 props
+    public $allowstoragecard;
+    public $allowcam;
+    public $reqdevenc;
+    public $allowunsignedapps;
+    public $allowunsigninstallpacks;
+    public $mindevcomplexchars;
+    public $allowwifi;
+    public $allowtextmessaging;
+    public $allowpopimapemail;
+    public $allowbluetooth;
+    public $allowirda;
+    public $reqmansyncroam;
+    public $allowdesktopsync;
+    public $maxcalagefilter;
+    public $allowhtmlemail;
+    public $maxemailagefilter;
+    public $maxemailbodytruncsize;
+    public $maxemailhtmlbodytruncsize;
+    public $reqsignedsmimemessages;
+    public $reqencsmimemessages;
+    public $reqsignedsmimealgorithm;
+    public $reqencsmimealgorithm;
+    public $allowsmimeencalgneg;
+    public $allowsmimesoftcerts;
+    public $allowbrowser;
+    public $allowconsumeremail;
+    public $allowremotedesk;
+    public $allowinternetsharing;
+    public $unapprovedinromapplist;
+    public $approvedapplist;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_PROVISION_DEVPWENABLED => [
-				self::STREAMER_VAR => "devpwenabled",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-			],
-			SYNC_PROVISION_ALPHANUMPWREQ => [
-				self::STREAMER_VAR => "alphanumpwreq",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-			],
-			SYNC_PROVISION_PWRECOVERYENABLED => [
-				self::STREAMER_VAR => "pwrecoveryenabled",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-			],
-			SYNC_PROVISION_DEVENCENABLED => [
-				self::STREAMER_VAR => "devencenabled",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-			],
-			// deprecated
-			SYNC_PROVISION_DOCBROWSEENABLED => [self::STREAMER_VAR => "docbrowseenabled"],
-			SYNC_PROVISION_ATTENABLED => [
-				self::STREAMER_VAR => "attenabled",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-			],
-			SYNC_PROVISION_MINDEVPWLENGTH => [
-				self::STREAMER_VAR => "mindevpwlenngth",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_CMPHIGHER => 0,
-					self::STREAMER_CHECK_CMPLOWER => 17,
-				],
-			],
-			SYNC_PROVISION_MAXINACTTIMEDEVLOCK => [self::STREAMER_VAR => "maxinacttimedevlock"],
-			SYNC_PROVISION_MAXDEVPWFAILEDATTEMPTS => [
-				self::STREAMER_VAR => "maxdevpwfailedattempts",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_CMPHIGHER => 3,
-					self::STREAMER_CHECK_CMPLOWER => 17,
-				],
-			],
-			SYNC_PROVISION_MAXATTSIZE => [
-				self::STREAMER_VAR => "maxattsize",
-				self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -1],
-			],
-			SYNC_PROVISION_ALLOWSIMPLEDEVPW => [
-				self::STREAMER_VAR => "allowsimpledevpw",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-			],
-			SYNC_PROVISION_DEVPWEXPIRATION => [
-				self::STREAMER_VAR => "devpwexpiration",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -1],
-			],
-			SYNC_PROVISION_DEVPWHISTORY => [
-				self::STREAMER_VAR => "devpwhistory",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -1],
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_PROVISION_DEVPWENABLED => [
+                self::STREAMER_VAR => "devpwenabled",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+            ],
+            SYNC_PROVISION_ALPHANUMPWREQ => [
+                self::STREAMER_VAR => "alphanumpwreq",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+            ],
+            SYNC_PROVISION_PWRECOVERYENABLED => [
+                self::STREAMER_VAR => "pwrecoveryenabled",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+            ],
+            SYNC_PROVISION_DEVENCENABLED => [
+                self::STREAMER_VAR => "devencenabled",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+            ],
+            // deprecated
+            SYNC_PROVISION_DOCBROWSEENABLED => [self::STREAMER_VAR => "docbrowseenabled"],
+            SYNC_PROVISION_ATTENABLED => [
+                self::STREAMER_VAR => "attenabled",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+            ],
+            SYNC_PROVISION_MINDEVPWLENGTH => [
+                self::STREAMER_VAR => "mindevpwlenngth",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_CMPHIGHER => 0,
+                    self::STREAMER_CHECK_CMPLOWER => 17,
+                ],
+            ],
+            SYNC_PROVISION_MAXINACTTIMEDEVLOCK => [self::STREAMER_VAR => "maxinacttimedevlock"],
+            SYNC_PROVISION_MAXDEVPWFAILEDATTEMPTS => [
+                self::STREAMER_VAR => "maxdevpwfailedattempts",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_CMPHIGHER => 3,
+                    self::STREAMER_CHECK_CMPLOWER => 17,
+                ],
+            ],
+            SYNC_PROVISION_MAXATTSIZE => [
+                self::STREAMER_VAR => "maxattsize",
+                self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -1],
+            ],
+            SYNC_PROVISION_ALLOWSIMPLEDEVPW => [
+                self::STREAMER_VAR => "allowsimpledevpw",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+            ],
+            SYNC_PROVISION_DEVPWEXPIRATION => [
+                self::STREAMER_VAR => "devpwexpiration",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -1],
+            ],
+            SYNC_PROVISION_DEVPWHISTORY => [
+                self::STREAMER_VAR => "devpwhistory",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -1],
+            ],
+        ];
 
-		if (Request::GetProtocolVersion() >= 12.1) {
-			$mapping += [
-				SYNC_PROVISION_ALLOWSTORAGECARD => [
-					self::STREAMER_VAR => "allowstoragecard",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_ALLOWCAM => [
-					self::STREAMER_VAR => "allowcam",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_REQDEVENC => [
-					self::STREAMER_VAR => "reqdevenc",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_ALLOWUNSIGNEDAPPS => [
-					self::STREAMER_VAR => "allowunsignedapps",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_ALLOWUNSIGNEDINSTALLATIONPACKAGES => [
-					self::STREAMER_VAR => "allowunsigninstallpacks",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_MINDEVPWCOMPLEXCHARS => [
-					self::STREAMER_VAR => "mindevcomplexchars",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [1, 2, 3, 4]],
-				],
-				SYNC_PROVISION_ALLOWWIFI => [
-					self::STREAMER_VAR => "allowwifi",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_ALLOWTEXTMESSAGING => [
-					self::STREAMER_VAR => "allowtextmessaging",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_ALLOWPOPIMAPEMAIL => [
-					self::STREAMER_VAR => "allowpopimapemail",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_ALLOWBLUETOOTH => [
-					self::STREAMER_VAR => "allowbluetooth",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2]],
-				],
-				SYNC_PROVISION_ALLOWIRDA => [
-					self::STREAMER_VAR => "allowirda",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_REQMANUALSYNCWHENROAM => [
-					self::STREAMER_VAR => "reqmansyncroam",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_ALLOWDESKTOPSYNC => [
-					self::STREAMER_VAR => "allowdesktopsync",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_MAXCALAGEFILTER => [
-					self::STREAMER_VAR => "maxcalagefilter",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 4, 5, 6, 7]],
-				],
-				SYNC_PROVISION_ALLOWHTMLEMAIL => [
-					self::STREAMER_VAR => "allowhtmlemail",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_MAXEMAILAGEFILTER => [
-					self::STREAMER_VAR => "maxemailagefilter",
-					self::STREAMER_CHECKS => [
-						self::STREAMER_CHECK_CMPHIGHER => -1,
-						self::STREAMER_CHECK_CMPLOWER => 6,
-					],
-				],
-				SYNC_PROVISION_MAXEMAILBODYTRUNCSIZE => [
-					self::STREAMER_VAR => "maxemailbodytruncsize",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -2],
-				],
-				SYNC_PROVISION_MAXEMAILHTMLBODYTRUNCSIZE => [
-					self::STREAMER_VAR => "maxemailhtmlbodytruncsize",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -2],
-				],
-				SYNC_PROVISION_REQSIGNEDSMIMEMESSAGES => [
-					self::STREAMER_VAR => "reqsignedsmimemessages",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_REQENCSMIMEMESSAGES => [
-					self::STREAMER_VAR => "reqencsmimemessages",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_REQSIGNEDSMIMEALGORITHM => [
-					self::STREAMER_VAR => "reqsignedsmimealgorithm",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_REQENCSMIMEALGORITHM => [
-					self::STREAMER_VAR => "reqencsmimealgorithm",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3, 4]],
-				],
-				SYNC_PROVISION_ALLOWSMIMEENCALGORITHNEG => [
-					self::STREAMER_VAR => "allowsmimeencalgneg",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2]],
-				],
-				SYNC_PROVISION_ALLOWSMIMESOFTCERTS => [
-					self::STREAMER_VAR => "allowsmimesoftcerts",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_ALLOWBROWSER => [
-					self::STREAMER_VAR => "allowbrowser",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_ALLOWCONSUMEREMAIL => [
-					self::STREAMER_VAR => "allowconsumeremail",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_ALLOWREMOTEDESKTOP => [
-					self::STREAMER_VAR => "allowremotedesk",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_ALLOWINTERNETSHARING => [
-					self::STREAMER_VAR => "allowinternetsharing",
-					self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-				],
-				SYNC_PROVISION_UNAPPROVEDINROMAPPLIST => [
-					self::STREAMER_VAR => "unapprovedinromapplist",
-					self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
-					self::STREAMER_ARRAY => SYNC_PROVISION_APPNAME,
-				],  // TODO check
-				SYNC_PROVISION_APPROVEDAPPLIST => [
-					self::STREAMER_VAR => "approvedapplist",
-					self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
-					self::STREAMER_ARRAY => SYNC_PROVISION_HASH,
-				], // TODO check
-			];
-		}
+        if (Request::GetProtocolVersion() >= 12.1) {
+            $mapping += [
+                SYNC_PROVISION_ALLOWSTORAGECARD => [
+                    self::STREAMER_VAR => "allowstoragecard",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_ALLOWCAM => [
+                    self::STREAMER_VAR => "allowcam",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_REQDEVENC => [
+                    self::STREAMER_VAR => "reqdevenc",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_ALLOWUNSIGNEDAPPS => [
+                    self::STREAMER_VAR => "allowunsignedapps",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_ALLOWUNSIGNEDINSTALLATIONPACKAGES => [
+                    self::STREAMER_VAR => "allowunsigninstallpacks",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_MINDEVPWCOMPLEXCHARS => [
+                    self::STREAMER_VAR => "mindevcomplexchars",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [1, 2, 3, 4]],
+                ],
+                SYNC_PROVISION_ALLOWWIFI => [
+                    self::STREAMER_VAR => "allowwifi",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_ALLOWTEXTMESSAGING => [
+                    self::STREAMER_VAR => "allowtextmessaging",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_ALLOWPOPIMAPEMAIL => [
+                    self::STREAMER_VAR => "allowpopimapemail",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_ALLOWBLUETOOTH => [
+                    self::STREAMER_VAR => "allowbluetooth",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2]],
+                ],
+                SYNC_PROVISION_ALLOWIRDA => [
+                    self::STREAMER_VAR => "allowirda",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_REQMANUALSYNCWHENROAM => [
+                    self::STREAMER_VAR => "reqmansyncroam",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_ALLOWDESKTOPSYNC => [
+                    self::STREAMER_VAR => "allowdesktopsync",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_MAXCALAGEFILTER => [
+                    self::STREAMER_VAR => "maxcalagefilter",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 4, 5, 6, 7]],
+                ],
+                SYNC_PROVISION_ALLOWHTMLEMAIL => [
+                    self::STREAMER_VAR => "allowhtmlemail",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_MAXEMAILAGEFILTER => [
+                    self::STREAMER_VAR => "maxemailagefilter",
+                    self::STREAMER_CHECKS => [
+                        self::STREAMER_CHECK_CMPHIGHER => -1,
+                        self::STREAMER_CHECK_CMPLOWER => 6,
+                    ],
+                ],
+                SYNC_PROVISION_MAXEMAILBODYTRUNCSIZE => [
+                    self::STREAMER_VAR => "maxemailbodytruncsize",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -2],
+                ],
+                SYNC_PROVISION_MAXEMAILHTMLBODYTRUNCSIZE => [
+                    self::STREAMER_VAR => "maxemailhtmlbodytruncsize",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -2],
+                ],
+                SYNC_PROVISION_REQSIGNEDSMIMEMESSAGES => [
+                    self::STREAMER_VAR => "reqsignedsmimemessages",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_REQENCSMIMEMESSAGES => [
+                    self::STREAMER_VAR => "reqencsmimemessages",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_REQSIGNEDSMIMEALGORITHM => [
+                    self::STREAMER_VAR => "reqsignedsmimealgorithm",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_REQENCSMIMEALGORITHM => [
+                    self::STREAMER_VAR => "reqencsmimealgorithm",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3, 4]],
+                ],
+                SYNC_PROVISION_ALLOWSMIMEENCALGORITHNEG => [
+                    self::STREAMER_VAR => "allowsmimeencalgneg",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2]],
+                ],
+                SYNC_PROVISION_ALLOWSMIMESOFTCERTS => [
+                    self::STREAMER_VAR => "allowsmimesoftcerts",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_ALLOWBROWSER => [
+                    self::STREAMER_VAR => "allowbrowser",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_ALLOWCONSUMEREMAIL => [
+                    self::STREAMER_VAR => "allowconsumeremail",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_ALLOWREMOTEDESKTOP => [
+                    self::STREAMER_VAR => "allowremotedesk",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_ALLOWINTERNETSHARING => [
+                    self::STREAMER_VAR => "allowinternetsharing",
+                    self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+                ],
+                SYNC_PROVISION_UNAPPROVEDINROMAPPLIST => [
+                    self::STREAMER_VAR => "unapprovedinromapplist",
+                    self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
+                    self::STREAMER_ARRAY => SYNC_PROVISION_APPNAME,
+                ],  // TODO check
+                SYNC_PROVISION_APPROVEDAPPLIST => [
+                    self::STREAMER_VAR => "approvedapplist",
+                    self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
+                    self::STREAMER_ARRAY => SYNC_PROVISION_HASH,
+                ], // TODO check
+            ];
+        }
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 
-	/**
-	 * Loads provisioning policies into a SyncProvisioning object.
-	 *
-	 * @param array $policies    array with policies' names and values
-	 * @param bool  $logPolicies optional, determines if the policies and values should be logged. Default: false
-	 */
-	public function Load($policies = [], $logPolicies = false) {
-		$this->LoadDefaultPolicies();
+    /**
+     * Loads provisioning policies into a SyncProvisioning object.
+     *
+     * @param array $policies    array with policies' names and values
+     * @param bool  $logPolicies optional, determines if the policies and values should be logged. Default: false
+     */
+    public function Load($policies = [], $logPolicies = false) {
+        $this->LoadDefaultPolicies();
 
-		$streamerVars = $this->GetStreamerVars();
-		foreach ($policies as $p => $v) {
-			if (!in_array($p, $streamerVars)) {
-				SLog::Write(LOGLEVEL_INFO, sprintf("Policy '%s' not supported by the device, ignoring", $p));
+        $streamerVars = $this->GetStreamerVars();
+        foreach ($policies as $p => $v) {
+            if (!in_array($p, $streamerVars)) {
+                SLog::Write(LOGLEVEL_INFO, sprintf("Policy '%s' not supported by the device, ignoring", $p));
 
-				continue;
-			}
-			if ($logPolicies) {
-				SLog::Write(LOGLEVEL_WBXML, sprintf("Policy '%s' enforced with: %s (%s)", $p, (is_array($v)) ? Utils::PrintAsString(implode(',', $v)) : Utils::PrintAsString($v), gettype($v)));
-			}
-			$this->{$p} = (is_array($v) && empty($v)) ? [] : $v;
-		}
-	}
+                continue;
+            }
+            if ($logPolicies) {
+                SLog::Write(LOGLEVEL_WBXML, sprintf("Policy '%s' enforced with: %s (%s)", $p, (is_array($v)) ? Utils::PrintAsString(implode(',', $v)) : Utils::PrintAsString($v), gettype($v)));
+            }
+            $this->{$p} = (is_array($v) && empty($v)) ? [] : $v;
+        }
+    }
 
-	/**
-	 * Loads default policies' values into a SyncProvisioning object.
-	 */
-	public function LoadDefaultPolicies() {
-		// AS 12.0, 12.1 and 14.0 props
-		$this->devpwenabled = 0;
-		$this->alphanumpwreq = 0;
-		$this->devencenabled = 0;
-		$this->pwrecoveryenabled = 0;
-		$this->attenabled = 1;
-		$this->mindevpwlenngth = 4;
-		$this->maxinacttimedevlock = 900;
-		$this->maxdevpwfailedattempts = 8;
-		$this->maxattsize = '';
-		$this->allowsimpledevpw = 1;
-		$this->devpwexpiration = 0;
-		$this->devpwhistory = 0;
+    /**
+     * Loads default policies' values into a SyncProvisioning object.
+     */
+    public function LoadDefaultPolicies() {
+        // AS 12.0, 12.1 and 14.0 props
+        $this->devpwenabled = 0;
+        $this->alphanumpwreq = 0;
+        $this->devencenabled = 0;
+        $this->pwrecoveryenabled = 0;
+        $this->attenabled = 1;
+        $this->mindevpwlenngth = 4;
+        $this->maxinacttimedevlock = 900;
+        $this->maxdevpwfailedattempts = 8;
+        $this->maxattsize = '';
+        $this->allowsimpledevpw = 1;
+        $this->devpwexpiration = 0;
+        $this->devpwhistory = 0;
 
-		// AS 12.1 and 14.0 props
-		$this->allowstoragecard = 1;
-		$this->allowcam = 1;
-		$this->reqdevenc = 0;
-		$this->allowunsignedapps = 1;
-		$this->allowunsigninstallpacks = 1;
-		$this->mindevcomplexchars = 3;
-		$this->allowwifi = 1;
-		$this->allowtextmessaging = 1;
-		$this->allowpopimapemail = 1;
-		$this->allowbluetooth = 2;
-		$this->allowirda = 1;
-		$this->reqmansyncroam = 0;
-		$this->allowdesktopsync = 1;
-		$this->maxcalagefilter = 0;
-		$this->allowhtmlemail = 1;
-		$this->maxemailagefilter = 0;
-		$this->maxemailbodytruncsize = -1;
-		$this->maxemailhtmlbodytruncsize = -1;
-		$this->reqsignedsmimemessages = 0;
-		$this->reqencsmimemessages = 0;
-		$this->reqsignedsmimealgorithm = 0;
-		$this->reqencsmimealgorithm = 0;
-		$this->allowsmimeencalgneg = 2;
-		$this->allowsmimesoftcerts = 1;
-		$this->allowbrowser = 1;
-		$this->allowconsumeremail = 1;
-		$this->allowremotedesk = 1;
-		$this->allowinternetsharing = 1;
-		$this->unapprovedinromapplist = [];
-		$this->approvedapplist = [];
-	}
+        // AS 12.1 and 14.0 props
+        $this->allowstoragecard = 1;
+        $this->allowcam = 1;
+        $this->reqdevenc = 0;
+        $this->allowunsignedapps = 1;
+        $this->allowunsigninstallpacks = 1;
+        $this->mindevcomplexchars = 3;
+        $this->allowwifi = 1;
+        $this->allowtextmessaging = 1;
+        $this->allowpopimapemail = 1;
+        $this->allowbluetooth = 2;
+        $this->allowirda = 1;
+        $this->reqmansyncroam = 0;
+        $this->allowdesktopsync = 1;
+        $this->maxcalagefilter = 0;
+        $this->allowhtmlemail = 1;
+        $this->maxemailagefilter = 0;
+        $this->maxemailbodytruncsize = -1;
+        $this->maxemailhtmlbodytruncsize = -1;
+        $this->reqsignedsmimemessages = 0;
+        $this->reqencsmimemessages = 0;
+        $this->reqsignedsmimealgorithm = 0;
+        $this->reqencsmimealgorithm = 0;
+        $this->allowsmimeencalgneg = 2;
+        $this->allowsmimesoftcerts = 1;
+        $this->allowbrowser = 1;
+        $this->allowconsumeremail = 1;
+        $this->allowremotedesk = 1;
+        $this->allowinternetsharing = 1;
+        $this->unapprovedinromapplist = [];
+        $this->approvedapplist = [];
+    }
 
-	/**
-	 * Returns the policy hash.
-	 *
-	 * @return string
-	 */
-	public function GetPolicyHash() {
-		return md5(serialize($this));
-	}
+    /**
+     * Returns the policy hash.
+     *
+     * @return string
+     */
+    public function GetPolicyHash() {
+        return md5(serialize($this));
+    }
 
-	/**
-	 * Returns the SyncProvisioning instance.
-	 *
-	 * @param array $policies    array with policies' names and values
-	 * @param bool  $logPolicies optional, determines if the policies and values should be logged. Default: false
-	 *
-	 * @return SyncProvisioning
-	 */
-	public static function GetObjectWithPolicies($policies = [], $logPolicies = false) {
-		$p = new SyncProvisioning();
-		$p->Load($policies, $logPolicies);
+    /**
+     * Returns the SyncProvisioning instance.
+     *
+     * @param array $policies    array with policies' names and values
+     * @param bool  $logPolicies optional, determines if the policies and values should be logged. Default: false
+     *
+     * @return SyncProvisioning
+     */
+    public static function GetObjectWithPolicies($policies = [], $logPolicies = false) {
+        $p = new SyncProvisioning();
+        $p->Load($policies, $logPolicies);
 
-		return $p;
-	}
+        return $p;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -236,7 +236,7 @@
 					self::STREAMER_VAR => "unapprovedinromapplist",
 					self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
 					self::STREAMER_ARRAY => SYNC_PROVISION_APPNAME,
-				],  // TODO check
+				], // TODO check
 				SYNC_PROVISION_APPROVEDAPPLIST => [
 					self::STREAMER_VAR => "approvedapplist",
 					self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,

lib/syncobjects/syncobject.php

Indentation +470 added lines, -470 removed lines

@@ -10,474 +10,474 @@
  */
 
 abstract class SyncObject extends Streamer {
-	public const STREAMER_CHECKS = 6;
-	public const STREAMER_CHECK_REQUIRED = 7;
-	public const STREAMER_CHECK_ZEROORONE = 8;
-	public const STREAMER_CHECK_NOTALLOWED = 9;
-	public const STREAMER_CHECK_ONEVALUEOF = 10;
-	public const STREAMER_CHECK_SETZERO = "setToValue0";
-	public const STREAMER_CHECK_SETONE = "setToValue1";
-	public const STREAMER_CHECK_SETTWO = "setToValue2";
-	public const STREAMER_CHECK_SETEMPTY = "setToValueEmpty";
-	public const STREAMER_CHECK_CMPLOWER = 13;
-	public const STREAMER_CHECK_CMPHIGHER = 14;
-	public const STREAMER_CHECK_LENGTHMAX = 15;
-	public const STREAMER_CHECK_EMAIL = 16;
-
-	protected $unsetVars;
-	protected $supportsPrivateStripping;
-
-	public function __construct($mapping) {
-		$this->unsetVars = [];
-		$this->supportsPrivateStripping = false;
-		parent::__construct($mapping);
-	}
-
-	/**
-	 * Sets all supported but not transmitted variables
-	 * of this SyncObject to an "empty" value, so they are deleted when being saved.
-	 *
-	 * @param array $supportedFields array with all supported fields, if available
-	 *
-	 * @return bool
-	 */
-	public function emptySupported($supportedFields) {
-		// Some devices do not send supported tag. In such a case remove all not set properties.
-		if (($supportedFields === false || !is_array($supportedFields) || (empty($supportedFields)))) {
-			if (defined('UNSET_UNDEFINED_PROPERTIES') &&
-					UNSET_UNDEFINED_PROPERTIES &&
-					(
-						$this instanceof SyncContact ||
-						$this instanceof SyncAppointment ||
-						$this instanceof SyncTask
-					)) {
-				SLog::Write(LOGLEVEL_INFO, sprintf("%s->emptySupported(): no supported list available, emptying all not set parameters", get_class($this)));
-				$supportedFields = array_keys($this->mapping);
-			}
-			else {
-				return false;
-			}
-		}
-
-		foreach ($supportedFields as $field) {
-			if (!isset($this->mapping[$field])) {
-				SLog::Write(LOGLEVEL_WARN, sprintf("Field '%s' is supposed to be emptied but is not defined for '%s'", $field, get_class($this)));
-
-				continue;
-			}
-			$var = $this->mapping[$field][self::STREAMER_VAR];
-			// add var to $this->unsetVars if $var is not set
-			if (!isset($this->{$var})) {
-				$this->unsetVars[] = $var;
-			}
-		}
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("Supported variables to be unset: %s", implode(',', $this->unsetVars)));
-
-		return true;
-	}
-
-	/**
-	 * Compares this a SyncObject to another.
-	 * In case that all available mapped fields are exactly EQUAL, it returns true.
-	 *
-	 * @see SyncObject
-	 *
-	 * @param SyncObject $odo               other SyncObject
-	 * @param bool       $log               flag to turn on logging
-	 * @param bool       $strictTypeCompare to enforce type matching
-	 *
-	 * @return bool
-	 */
-	public function equals($odo, $log = false, $strictTypeCompare = false) {
-		if ($odo === false) {
-			return false;
-		}
-
-		// check objecttype
-		if (!($odo instanceof SyncObject)) {
-			SLog::Write(LOGLEVEL_DEBUG, "SyncObject->equals() the target object is not a SyncObject");
-
-			return false;
-		}
-
-		// check for mapped fields
-		foreach ($this->mapping as $v) {
-			$val = $v[self::STREAMER_VAR];
-			// array of values?
-			if (isset($v[self::STREAMER_ARRAY])) {
-				// if neither array is created then don't fail the comparison
-				if (!isset($this->{$val}) && !isset($odo->{$val})) {
-					SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() array '%s' is NOT SET in either object", $val));
-
-					continue;
-				}
-				if (is_array($this->{$val}) && is_array($odo->{$val})) {
-					// if both arrays exist then seek for differences in the arrays
-					if (count(array_diff($this->{$val}, $odo->{$val})) + count(array_diff($odo->{$val}, $this->{$val})) > 0) {
-						SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() items in array '%s' differ", $val));
-
-						return false;
-					}
-				}
-				else {
-					SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() array '%s' is set in one but not the other object", $val));
-
-					return false;
-				}
-			}
-			else {
-				if (isset($this->{$val}, $odo->{$val})) {
-					if ($strictTypeCompare) {
-						if ($this->{$val} !== $odo->{$val}) {
-							SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() false on field '%s': '%s' != '%s' using strictTypeCompare", $val, Utils::PrintAsString($this->{$val}), Utils::PrintAsString($odo->{$val})));
-
-							return false;
-						}
-					}
-					else {
-						if ($this->{$val} != $odo->{$val}) {
-							SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() false on field '%s': '%s' != '%s'", $val, Utils::PrintAsString($this->{$val}), Utils::PrintAsString($odo->{$val})));
-
-							return false;
-						}
-					}
-				}
-				elseif (!isset($this->{$val}) && !isset($odo->{$val})) {
-					continue;
-				}
-				else {
-					SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() false because field '%s' is only defined at one obj: '%s' != '%s'", $val, Utils::PrintAsString(isset($this->{$val})), Utils::PrintAsString(isset($odo->{$val}))));
-
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * String representation of the object.
-	 *
-	 * @return string
-	 */
-	public function __toString() {
-		$str = get_class($this) . " (\n";
-
-		$streamerVars = [];
-		foreach ($this->mapping as $k => $v) {
-			$streamerVars[$v[self::STREAMER_VAR]] = (isset($v[self::STREAMER_TYPE])) ? $v[self::STREAMER_TYPE] : false;
-		}
-
-		foreach (get_object_vars($this) as $k => $v) {
-			if ($k == "mapping") {
-				continue;
-			}
-
-			if (array_key_exists($k, $streamerVars)) {
-				$strV = "(S) ";
-			}
-			else {
-				$strV = "";
-			}
-
-			// self::STREAMER_ARRAY ?
-			if (is_array($v)) {
-				$str .= "\t" . $strV . $k . "(Array) size: " . count($v) . "\n";
-				foreach ($v as $value) {
-					$str .= "\t\t" . Utils::PrintAsString($value) . "\n";
-				}
-			}
-			elseif ($v instanceof SyncObject) {
-				$str .= "\t" . $strV . $k . " => " . str_replace("\n", "\n\t\t\t", $v->__toString()) . "\n";
-			}
-			else {
-				$str .= "\t" . $strV . $k . " => " . (isset($this->{$k}) ? Utils::PrintAsString($this->{$k}) : "null") . "\n";
-			}
-		}
-		$str .= ")";
-
-		return $str;
-	}
-
-	/**
-	 * Returns the properties which have to be unset on the server.
-	 *
-	 * @return array
-	 */
-	public function getUnsetVars() {
-		return $this->unsetVars;
-	}
-
-	/**
-	 * Removes not necessary data from the object.
-	 *
-	 * @param mixed $flags
-	 *
-	 * @return bool
-	 */
-	public function StripData($flags = 0) {
-		if ($flags === 0 && isset($this->unsetVars)) {
-			unset($this->unsetVars);
-		}
-
-		return parent::StripData($flags);
-	}
-
-	/**
-	 * Indicates if a SyncObject supports the private flag and stripping of private data.
-	 * If an object does not support it, it will not be sent to the client but permanently be excluded from the sync.
-	 *
-	 * @return bool - default false defined in constructor - overwritten by implementation
-	 */
-	public function SupportsPrivateStripping() {
-		return $this->supportsPrivateStripping;
-	}
-
-	/**
-	 * Method checks if the object has the minimum of required parameters
-	 * and fulfills semantic dependencies.
-	 *
-	 * General checks:
-	 *     STREAMER_CHECK_REQUIRED      may have as value false (do not fix, ignore object!) or set-to-values: STREAMER_CHECK_SETZERO/ONE/TWO, STREAMER_CHECK_SETEMPTY
-	 *     STREAMER_CHECK_ZEROORONE     may be 0 or 1, if none of these, set-to-values: STREAMER_CHECK_SETZERO or STREAMER_CHECK_SETONE
-	 *     STREAMER_CHECK_NOTALLOWED    fails if is set
-	 *     STREAMER_CHECK_ONEVALUEOF    expects an array with accepted values, fails if value is not in array
-	 *
-	 * Comparison:
-	 *     STREAMER_CHECK_CMPLOWER      compares if the current parameter is lower as a literal or another parameter of the same object
-	 *     STREAMER_CHECK_CMPHIGHER     compares if the current parameter is higher as a literal or another parameter of the same object
-	 *
-	 * @param bool $logAsDebug (opt) default is false, so messages are logged in WARN log level
-	 *
-	 * @return bool
-	 */
-	public function Check($logAsDebug = false) {
-		// semantic checks general "turn off switch"
-		if (defined("DO_SEMANTIC_CHECKS") && DO_SEMANTIC_CHECKS === false) {
-			SLog::Write(LOGLEVEL_DEBUG, "SyncObject->Check(): semantic checks disabled. Check your config for 'DO_SEMANTIC_CHECKS'.");
-
-			return true;
-		}
-
-		$defaultLogLevel = LOGLEVEL_WARN;
-
-		// in some cases non-false checks should not provoke a WARN log but only a DEBUG log
-		if ($logAsDebug) {
-			$defaultLogLevel = LOGLEVEL_DEBUG;
-		}
-
-		$objClass = get_class($this);
-		foreach ($this->mapping as $k => $v) {
-			// check sub-objects recursively
-			if (isset($v[self::STREAMER_TYPE], $this->{$v[self::STREAMER_VAR]})) {
-				if ($this->{$v[self::STREAMER_VAR]} instanceof SyncObject) {
-					if (!$this->{$v[self::STREAMER_VAR]}->Check($logAsDebug)) {
-						return false;
-					}
-				}
-				elseif (is_array($this->{$v[self::STREAMER_VAR]})) {
-					foreach ($this->{$v[self::STREAMER_VAR]} as $subobj) {
-						if ($subobj instanceof SyncObject && !$subobj->Check($logAsDebug)) {
-							return false;
-						}
-					}
-				}
-			}
-
-			if (isset($v[self::STREAMER_CHECKS])) {
-				foreach ($v[self::STREAMER_CHECKS] as $rule => $condition) {
-					// check REQUIRED settings
-					if ($rule === self::STREAMER_CHECK_REQUIRED && (!isset($this->{$v[self::STREAMER_VAR]}) || $this->{$v[self::STREAMER_VAR]} === '')) {
-						// parameter is not set but ..
-						// requested to set to 0
-						if ($condition === self::STREAMER_CHECK_SETZERO) {
-							$this->{$v[self::STREAMER_VAR]} = 0;
-							SLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): Fixed object from type %s: parameter '%s' is set to 0", $objClass, $v[self::STREAMER_VAR]));
-						}
-						// requested to be set to 1
-						elseif ($condition === self::STREAMER_CHECK_SETONE) {
-							$this->{$v[self::STREAMER_VAR]} = 1;
-							SLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): Fixed object from type %s: parameter '%s' is set to 1", $objClass, $v[self::STREAMER_VAR]));
-						}
-						// requested to be set to 2
-						elseif ($condition === self::STREAMER_CHECK_SETTWO) {
-							$this->{$v[self::STREAMER_VAR]} = 2;
-							SLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): Fixed object from type %s: parameter '%s' is set to 2", $objClass, $v[self::STREAMER_VAR]));
-						}
-						// requested to be set to ''
-						elseif ($condition === self::STREAMER_CHECK_SETEMPTY) {
-							if (!isset($this->{$v[self::STREAMER_VAR]})) {
-								$this->{$v[self::STREAMER_VAR]} = '';
-								SLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): Fixed object from type %s: parameter '%s' is set to ''", $objClass, $v[self::STREAMER_VAR]));
-							}
-						}
-						// there is another value !== false
-						elseif ($condition !== false) {
-							$this->{$v[self::STREAMER_VAR]} = $condition;
-							SLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): Fixed object from type %s: parameter '%s' is set to '%s'", $objClass, $v[self::STREAMER_VAR], $condition));
-						}
-						// no fix available!
-						else {
-							SLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter '%s' is required but not set. Check failed!", $objClass, $v[self::STREAMER_VAR]));
-
-							return false;
-						}
-					} // end STREAMER_CHECK_REQUIRED
-
-					// check STREAMER_CHECK_ZEROORONE
-					if ($rule === self::STREAMER_CHECK_ZEROORONE && isset($this->{$v[self::STREAMER_VAR]})) {
-						if ($this->{$v[self::STREAMER_VAR]} != 0 && $this->{$v[self::STREAMER_VAR]} != 1) {
-							$newval = $condition === self::STREAMER_CHECK_SETZERO ? 0 : 1;
-							$this->{$v[self::STREAMER_VAR]} = $newval;
-							SLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): Fixed object from type %s: parameter '%s' is set to '%s' as it was not 0 or 1", $objClass, $v[self::STREAMER_VAR], $newval));
-						}
-					}// end STREAMER_CHECK_ZEROORONE
-
-					// check STREAMER_CHECK_ONEVALUEOF
-					if ($rule === self::STREAMER_CHECK_ONEVALUEOF && isset($this->{$v[self::STREAMER_VAR]})) {
-						if (!in_array($this->{$v[self::STREAMER_VAR]}, $condition)) {
-							SLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): object from type %s: parameter '%s'->'%s' is not in the range of allowed values.", $objClass, $v[self::STREAMER_VAR], $this->{$v[self::STREAMER_VAR]}));
-
-							return false;
-						}
-					}// end STREAMER_CHECK_ONEVALUEOF
-
-					// Check value compared to other value or literal
-					if ($rule === self::STREAMER_CHECK_CMPHIGHER || $rule === self::STREAMER_CHECK_CMPLOWER) {
-						if (isset($this->{$v[self::STREAMER_VAR]})) {
-							$cmp = false;
-							// directly compare against literals
-							if (is_int($condition)) {
-								$cmp = $condition;
-							}
-							// check for invalid compare-to
-							elseif (!isset($this->mapping[$condition])) {
-								SLog::Write(LOGLEVEL_ERROR, sprintf("SyncObject->Check(): Can not compare parameter '%s' against the other value '%s' as it is not defined object from type %s. Please report this! Check skipped!", $objClass, $v[self::STREAMER_VAR], $condition));
-
-								continue;
-							}
-							else {
-								$cmpPar = $this->mapping[$condition][self::STREAMER_VAR];
-								if (isset($this->{$cmpPar})) {
-									$cmp = $this->{$cmpPar};
-								}
-							}
-
-							if ($cmp === false) {
-								SLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter '%s' can not be compared, as the comparable is not set. Check failed!", $objClass, $v[self::STREAMER_VAR]));
-
-								return false;
-							}
-							if (
-									($rule == self::STREAMER_CHECK_CMPHIGHER && $this->{$v[self::STREAMER_VAR]} < $cmp) ||
-									($rule == self::STREAMER_CHECK_CMPLOWER && $this->{$v[self::STREAMER_VAR]} > $cmp)
-									) {
-								SLog::Write(LOGLEVEL_WARN, sprintf(
-									"SyncObject->Check(): Unmet condition in object from type %s: parameter '%s' is %s than '%s'. Check failed!",
-									$objClass,
-									$v[self::STREAMER_VAR],
-									(($rule === self::STREAMER_CHECK_CMPHIGHER) ? 'LOWER' : 'HIGHER'),
-									((isset($cmpPar) ? $cmpPar : $condition))
-								));
-
-								return false;
-							}
-						}
-					} // STREAMER_CHECK_CMP*
-
-					// check STREAMER_CHECK_LENGTHMAX
-					if ($rule === self::STREAMER_CHECK_LENGTHMAX && isset($this->{$v[self::STREAMER_VAR]})) {
-						if (is_array($this->{$v[self::STREAMER_VAR]})) {
-							// implosion takes 2bytes, so we just assume ", " here
-							$chkstr = implode(", ", $this->{$v[self::STREAMER_VAR]});
-						}
-						else {
-							$chkstr = $this->{$v[self::STREAMER_VAR]};
-						}
-
-						if (strlen($chkstr) > $condition) {
-							SLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): object from type %s: parameter '%s' is longer than %d. Check failed", $objClass, $v[self::STREAMER_VAR], $condition));
-
-							return false;
-						}
-					}// end STREAMER_CHECK_LENGTHMAX
-
-					// check STREAMER_CHECK_EMAIL
-					// if $condition is false then the check really fails. Otherwise invalid emails are removed.
-					// if nothing is left (all emails were false), the parameter is set to condition
-					if ($rule === self::STREAMER_CHECK_EMAIL && isset($this->{$v[self::STREAMER_VAR]})) {
-						if ($condition === false && ((is_array($this->{$v[self::STREAMER_VAR]}) && empty($this->{$v[self::STREAMER_VAR]})) || strlen($this->{$v[self::STREAMER_VAR]}) == 0)) {
-							continue;
-						}
-
-						$as_array = false;
-
-						if (is_array($this->{$v[self::STREAMER_VAR]})) {
-							$mails = $this->{$v[self::STREAMER_VAR]};
-							$as_array = true;
-						}
-						else {
-							$mails = [$this->{$v[self::STREAMER_VAR]}];
-						}
-
-						$output = [];
-						foreach ($mails as $mail) {
-							if (!Utils::CheckEmail($mail)) {
-								SLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): object from type %s: parameter '%s' contains an invalid email address '%s'. Address is removed.", $objClass, $v[self::STREAMER_VAR], $mail));
-							}
-							else {
-								$output[] = $mail;
-							}
-						}
-						if (count($mails) != count($output)) {
-							if ($condition === false) {
-								return false;
-							}
-
-							// nothing left, use $condition as new value
-							if (count($output) == 0) {
-								$output[] = $condition;
-							}
-
-							// if we are allowed to rewrite the attribute, we do that
-							if ($as_array) {
-								$this->{$v[self::STREAMER_VAR]} = $output;
-							}
-							else {
-								$this->{$v[self::STREAMER_VAR]} = $output[0];
-							}
-						}
-					}// end STREAMER_CHECK_EMAIL
-				} // foreach CHECKS
-			} // isset CHECKS
-		} // foreach mapping
-
-		return true;
-	}
-
-	/**
-	 * Returns human friendly property name from its value if a mapping is available.
-	 *
-	 * @param array $v
-	 * @param mixed $val
-	 *
-	 * @return mixed
-	 */
-	public function GetNameFromPropertyValue($v, $val) {
-		if (isset($v[self::STREAMER_VALUEMAP][$val])) {
-			return $v[self::STREAMER_VALUEMAP][$val];
-		}
-
-		return $val;
-	}
-
-	/**
-	 * Called after the SyncObject was unserialized.
-	 *
-	 * @return bool
-	 */
-	public function postUnserialize() {
-		return true;
-	}
+    public const STREAMER_CHECKS = 6;
+    public const STREAMER_CHECK_REQUIRED = 7;
+    public const STREAMER_CHECK_ZEROORONE = 8;
+    public const STREAMER_CHECK_NOTALLOWED = 9;
+    public const STREAMER_CHECK_ONEVALUEOF = 10;
+    public const STREAMER_CHECK_SETZERO = "setToValue0";
+    public const STREAMER_CHECK_SETONE = "setToValue1";
+    public const STREAMER_CHECK_SETTWO = "setToValue2";
+    public const STREAMER_CHECK_SETEMPTY = "setToValueEmpty";
+    public const STREAMER_CHECK_CMPLOWER = 13;
+    public const STREAMER_CHECK_CMPHIGHER = 14;
+    public const STREAMER_CHECK_LENGTHMAX = 15;
+    public const STREAMER_CHECK_EMAIL = 16;
+
+    protected $unsetVars;
+    protected $supportsPrivateStripping;
+
+    public function __construct($mapping) {
+        $this->unsetVars = [];
+        $this->supportsPrivateStripping = false;
+        parent::__construct($mapping);
+    }
+
+    /**
+     * Sets all supported but not transmitted variables
+     * of this SyncObject to an "empty" value, so they are deleted when being saved.
+     *
+     * @param array $supportedFields array with all supported fields, if available
+     *
+     * @return bool
+     */
+    public function emptySupported($supportedFields) {
+        // Some devices do not send supported tag. In such a case remove all not set properties.
+        if (($supportedFields === false || !is_array($supportedFields) || (empty($supportedFields)))) {
+            if (defined('UNSET_UNDEFINED_PROPERTIES') &&
+                    UNSET_UNDEFINED_PROPERTIES &&
+                    (
+                        $this instanceof SyncContact ||
+                        $this instanceof SyncAppointment ||
+                        $this instanceof SyncTask
+                    )) {
+                SLog::Write(LOGLEVEL_INFO, sprintf("%s->emptySupported(): no supported list available, emptying all not set parameters", get_class($this)));
+                $supportedFields = array_keys($this->mapping);
+            }
+            else {
+                return false;
+            }
+        }
+
+        foreach ($supportedFields as $field) {
+            if (!isset($this->mapping[$field])) {
+                SLog::Write(LOGLEVEL_WARN, sprintf("Field '%s' is supposed to be emptied but is not defined for '%s'", $field, get_class($this)));
+
+                continue;
+            }
+            $var = $this->mapping[$field][self::STREAMER_VAR];
+            // add var to $this->unsetVars if $var is not set
+            if (!isset($this->{$var})) {
+                $this->unsetVars[] = $var;
+            }
+        }
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("Supported variables to be unset: %s", implode(',', $this->unsetVars)));
+
+        return true;
+    }
+
+    /**
+     * Compares this a SyncObject to another.
+     * In case that all available mapped fields are exactly EQUAL, it returns true.
+     *
+     * @see SyncObject
+     *
+     * @param SyncObject $odo               other SyncObject
+     * @param bool       $log               flag to turn on logging
+     * @param bool       $strictTypeCompare to enforce type matching
+     *
+     * @return bool
+     */
+    public function equals($odo, $log = false, $strictTypeCompare = false) {
+        if ($odo === false) {
+            return false;
+        }
+
+        // check objecttype
+        if (!($odo instanceof SyncObject)) {
+            SLog::Write(LOGLEVEL_DEBUG, "SyncObject->equals() the target object is not a SyncObject");
+
+            return false;
+        }
+
+        // check for mapped fields
+        foreach ($this->mapping as $v) {
+            $val = $v[self::STREAMER_VAR];
+            // array of values?
+            if (isset($v[self::STREAMER_ARRAY])) {
+                // if neither array is created then don't fail the comparison
+                if (!isset($this->{$val}) && !isset($odo->{$val})) {
+                    SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() array '%s' is NOT SET in either object", $val));
+
+                    continue;
+                }
+                if (is_array($this->{$val}) && is_array($odo->{$val})) {
+                    // if both arrays exist then seek for differences in the arrays
+                    if (count(array_diff($this->{$val}, $odo->{$val})) + count(array_diff($odo->{$val}, $this->{$val})) > 0) {
+                        SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() items in array '%s' differ", $val));
+
+                        return false;
+                    }
+                }
+                else {
+                    SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() array '%s' is set in one but not the other object", $val));
+
+                    return false;
+                }
+            }
+            else {
+                if (isset($this->{$val}, $odo->{$val})) {
+                    if ($strictTypeCompare) {
+                        if ($this->{$val} !== $odo->{$val}) {
+                            SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() false on field '%s': '%s' != '%s' using strictTypeCompare", $val, Utils::PrintAsString($this->{$val}), Utils::PrintAsString($odo->{$val})));
+
+                            return false;
+                        }
+                    }
+                    else {
+                        if ($this->{$val} != $odo->{$val}) {
+                            SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() false on field '%s': '%s' != '%s'", $val, Utils::PrintAsString($this->{$val}), Utils::PrintAsString($odo->{$val})));
+
+                            return false;
+                        }
+                    }
+                }
+                elseif (!isset($this->{$val}) && !isset($odo->{$val})) {
+                    continue;
+                }
+                else {
+                    SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() false because field '%s' is only defined at one obj: '%s' != '%s'", $val, Utils::PrintAsString(isset($this->{$val})), Utils::PrintAsString(isset($odo->{$val}))));
+
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * String representation of the object.
+     *
+     * @return string
+     */
+    public function __toString() {
+        $str = get_class($this) . " (\n";
+
+        $streamerVars = [];
+        foreach ($this->mapping as $k => $v) {
+            $streamerVars[$v[self::STREAMER_VAR]] = (isset($v[self::STREAMER_TYPE])) ? $v[self::STREAMER_TYPE] : false;
+        }
+
+        foreach (get_object_vars($this) as $k => $v) {
+            if ($k == "mapping") {
+                continue;
+            }
+
+            if (array_key_exists($k, $streamerVars)) {
+                $strV = "(S) ";
+            }
+            else {
+                $strV = "";
+            }
+
+            // self::STREAMER_ARRAY ?
+            if (is_array($v)) {
+                $str .= "\t" . $strV . $k . "(Array) size: " . count($v) . "\n";
+                foreach ($v as $value) {
+                    $str .= "\t\t" . Utils::PrintAsString($value) . "\n";
+                }
+            }
+            elseif ($v instanceof SyncObject) {
+                $str .= "\t" . $strV . $k . " => " . str_replace("\n", "\n\t\t\t", $v->__toString()) . "\n";
+            }
+            else {
+                $str .= "\t" . $strV . $k . " => " . (isset($this->{$k}) ? Utils::PrintAsString($this->{$k}) : "null") . "\n";
+            }
+        }
+        $str .= ")";
+
+        return $str;
+    }
+
+    /**
+     * Returns the properties which have to be unset on the server.
+     *
+     * @return array
+     */
+    public function getUnsetVars() {
+        return $this->unsetVars;
+    }
+
+    /**
+     * Removes not necessary data from the object.
+     *
+     * @param mixed $flags
+     *
+     * @return bool
+     */
+    public function StripData($flags = 0) {
+        if ($flags === 0 && isset($this->unsetVars)) {
+            unset($this->unsetVars);
+        }
+
+        return parent::StripData($flags);
+    }
+
+    /**
+     * Indicates if a SyncObject supports the private flag and stripping of private data.
+     * If an object does not support it, it will not be sent to the client but permanently be excluded from the sync.
+     *
+     * @return bool - default false defined in constructor - overwritten by implementation
+     */
+    public function SupportsPrivateStripping() {
+        return $this->supportsPrivateStripping;
+    }
+
+    /**
+     * Method checks if the object has the minimum of required parameters
+     * and fulfills semantic dependencies.
+     *
+     * General checks:
+     *     STREAMER_CHECK_REQUIRED      may have as value false (do not fix, ignore object!) or set-to-values: STREAMER_CHECK_SETZERO/ONE/TWO, STREAMER_CHECK_SETEMPTY
+     *     STREAMER_CHECK_ZEROORONE     may be 0 or 1, if none of these, set-to-values: STREAMER_CHECK_SETZERO or STREAMER_CHECK_SETONE
+     *     STREAMER_CHECK_NOTALLOWED    fails if is set
+     *     STREAMER_CHECK_ONEVALUEOF    expects an array with accepted values, fails if value is not in array
+     *
+     * Comparison:
+     *     STREAMER_CHECK_CMPLOWER      compares if the current parameter is lower as a literal or another parameter of the same object
+     *     STREAMER_CHECK_CMPHIGHER     compares if the current parameter is higher as a literal or another parameter of the same object
+     *
+     * @param bool $logAsDebug (opt) default is false, so messages are logged in WARN log level
+     *
+     * @return bool
+     */
+    public function Check($logAsDebug = false) {
+        // semantic checks general "turn off switch"
+        if (defined("DO_SEMANTIC_CHECKS") && DO_SEMANTIC_CHECKS === false) {
+            SLog::Write(LOGLEVEL_DEBUG, "SyncObject->Check(): semantic checks disabled. Check your config for 'DO_SEMANTIC_CHECKS'.");
+
+            return true;
+        }
+
+        $defaultLogLevel = LOGLEVEL_WARN;
+
+        // in some cases non-false checks should not provoke a WARN log but only a DEBUG log
+        if ($logAsDebug) {
+            $defaultLogLevel = LOGLEVEL_DEBUG;
+        }
+
+        $objClass = get_class($this);
+        foreach ($this->mapping as $k => $v) {
+            // check sub-objects recursively
+            if (isset($v[self::STREAMER_TYPE], $this->{$v[self::STREAMER_VAR]})) {
+                if ($this->{$v[self::STREAMER_VAR]} instanceof SyncObject) {
+                    if (!$this->{$v[self::STREAMER_VAR]}->Check($logAsDebug)) {
+                        return false;
+                    }
+                }
+                elseif (is_array($this->{$v[self::STREAMER_VAR]})) {
+                    foreach ($this->{$v[self::STREAMER_VAR]} as $subobj) {
+                        if ($subobj instanceof SyncObject && !$subobj->Check($logAsDebug)) {
+                            return false;
+                        }
+                    }
+                }
+            }
+
+            if (isset($v[self::STREAMER_CHECKS])) {
+                foreach ($v[self::STREAMER_CHECKS] as $rule => $condition) {
+                    // check REQUIRED settings
+                    if ($rule === self::STREAMER_CHECK_REQUIRED && (!isset($this->{$v[self::STREAMER_VAR]}) || $this->{$v[self::STREAMER_VAR]} === '')) {
+                        // parameter is not set but ..
+                        // requested to set to 0
+                        if ($condition === self::STREAMER_CHECK_SETZERO) {
+                            $this->{$v[self::STREAMER_VAR]} = 0;
+                            SLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): Fixed object from type %s: parameter '%s' is set to 0", $objClass, $v[self::STREAMER_VAR]));
+                        }
+                        // requested to be set to 1
+                        elseif ($condition === self::STREAMER_CHECK_SETONE) {
+                            $this->{$v[self::STREAMER_VAR]} = 1;
+                            SLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): Fixed object from type %s: parameter '%s' is set to 1", $objClass, $v[self::STREAMER_VAR]));
+                        }
+                        // requested to be set to 2
+                        elseif ($condition === self::STREAMER_CHECK_SETTWO) {
+                            $this->{$v[self::STREAMER_VAR]} = 2;
+                            SLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): Fixed object from type %s: parameter '%s' is set to 2", $objClass, $v[self::STREAMER_VAR]));
+                        }
+                        // requested to be set to ''
+                        elseif ($condition === self::STREAMER_CHECK_SETEMPTY) {
+                            if (!isset($this->{$v[self::STREAMER_VAR]})) {
+                                $this->{$v[self::STREAMER_VAR]} = '';
+                                SLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): Fixed object from type %s: parameter '%s' is set to ''", $objClass, $v[self::STREAMER_VAR]));
+                            }
+                        }
+                        // there is another value !== false
+                        elseif ($condition !== false) {
+                            $this->{$v[self::STREAMER_VAR]} = $condition;
+                            SLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): Fixed object from type %s: parameter '%s' is set to '%s'", $objClass, $v[self::STREAMER_VAR], $condition));
+                        }
+                        // no fix available!
+                        else {
+                            SLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter '%s' is required but not set. Check failed!", $objClass, $v[self::STREAMER_VAR]));
+
+                            return false;
+                        }
+                    } // end STREAMER_CHECK_REQUIRED
+
+                    // check STREAMER_CHECK_ZEROORONE
+                    if ($rule === self::STREAMER_CHECK_ZEROORONE && isset($this->{$v[self::STREAMER_VAR]})) {
+                        if ($this->{$v[self::STREAMER_VAR]} != 0 && $this->{$v[self::STREAMER_VAR]} != 1) {
+                            $newval = $condition === self::STREAMER_CHECK_SETZERO ? 0 : 1;
+                            $this->{$v[self::STREAMER_VAR]} = $newval;
+                            SLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): Fixed object from type %s: parameter '%s' is set to '%s' as it was not 0 or 1", $objClass, $v[self::STREAMER_VAR], $newval));
+                        }
+                    }// end STREAMER_CHECK_ZEROORONE
+
+                    // check STREAMER_CHECK_ONEVALUEOF
+                    if ($rule === self::STREAMER_CHECK_ONEVALUEOF && isset($this->{$v[self::STREAMER_VAR]})) {
+                        if (!in_array($this->{$v[self::STREAMER_VAR]}, $condition)) {
+                            SLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): object from type %s: parameter '%s'->'%s' is not in the range of allowed values.", $objClass, $v[self::STREAMER_VAR], $this->{$v[self::STREAMER_VAR]}));
+
+                            return false;
+                        }
+                    }// end STREAMER_CHECK_ONEVALUEOF
+
+                    // Check value compared to other value or literal
+                    if ($rule === self::STREAMER_CHECK_CMPHIGHER || $rule === self::STREAMER_CHECK_CMPLOWER) {
+                        if (isset($this->{$v[self::STREAMER_VAR]})) {
+                            $cmp = false;
+                            // directly compare against literals
+                            if (is_int($condition)) {
+                                $cmp = $condition;
+                            }
+                            // check for invalid compare-to
+                            elseif (!isset($this->mapping[$condition])) {
+                                SLog::Write(LOGLEVEL_ERROR, sprintf("SyncObject->Check(): Can not compare parameter '%s' against the other value '%s' as it is not defined object from type %s. Please report this! Check skipped!", $objClass, $v[self::STREAMER_VAR], $condition));
+
+                                continue;
+                            }
+                            else {
+                                $cmpPar = $this->mapping[$condition][self::STREAMER_VAR];
+                                if (isset($this->{$cmpPar})) {
+                                    $cmp = $this->{$cmpPar};
+                                }
+                            }
+
+                            if ($cmp === false) {
+                                SLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter '%s' can not be compared, as the comparable is not set. Check failed!", $objClass, $v[self::STREAMER_VAR]));
+
+                                return false;
+                            }
+                            if (
+                                    ($rule == self::STREAMER_CHECK_CMPHIGHER && $this->{$v[self::STREAMER_VAR]} < $cmp) ||
+                                    ($rule == self::STREAMER_CHECK_CMPLOWER && $this->{$v[self::STREAMER_VAR]} > $cmp)
+                                    ) {
+                                SLog::Write(LOGLEVEL_WARN, sprintf(
+                                    "SyncObject->Check(): Unmet condition in object from type %s: parameter '%s' is %s than '%s'. Check failed!",
+                                    $objClass,
+                                    $v[self::STREAMER_VAR],
+                                    (($rule === self::STREAMER_CHECK_CMPHIGHER) ? 'LOWER' : 'HIGHER'),
+                                    ((isset($cmpPar) ? $cmpPar : $condition))
+                                ));
+
+                                return false;
+                            }
+                        }
+                    } // STREAMER_CHECK_CMP*
+
+                    // check STREAMER_CHECK_LENGTHMAX
+                    if ($rule === self::STREAMER_CHECK_LENGTHMAX && isset($this->{$v[self::STREAMER_VAR]})) {
+                        if (is_array($this->{$v[self::STREAMER_VAR]})) {
+                            // implosion takes 2bytes, so we just assume ", " here
+                            $chkstr = implode(", ", $this->{$v[self::STREAMER_VAR]});
+                        }
+                        else {
+                            $chkstr = $this->{$v[self::STREAMER_VAR]};
+                        }
+
+                        if (strlen($chkstr) > $condition) {
+                            SLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): object from type %s: parameter '%s' is longer than %d. Check failed", $objClass, $v[self::STREAMER_VAR], $condition));
+
+                            return false;
+                        }
+                    }// end STREAMER_CHECK_LENGTHMAX
+
+                    // check STREAMER_CHECK_EMAIL
+                    // if $condition is false then the check really fails. Otherwise invalid emails are removed.
+                    // if nothing is left (all emails were false), the parameter is set to condition
+                    if ($rule === self::STREAMER_CHECK_EMAIL && isset($this->{$v[self::STREAMER_VAR]})) {
+                        if ($condition === false && ((is_array($this->{$v[self::STREAMER_VAR]}) && empty($this->{$v[self::STREAMER_VAR]})) || strlen($this->{$v[self::STREAMER_VAR]}) == 0)) {
+                            continue;
+                        }
+
+                        $as_array = false;
+
+                        if (is_array($this->{$v[self::STREAMER_VAR]})) {
+                            $mails = $this->{$v[self::STREAMER_VAR]};
+                            $as_array = true;
+                        }
+                        else {
+                            $mails = [$this->{$v[self::STREAMER_VAR]}];
+                        }
+
+                        $output = [];
+                        foreach ($mails as $mail) {
+                            if (!Utils::CheckEmail($mail)) {
+                                SLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): object from type %s: parameter '%s' contains an invalid email address '%s'. Address is removed.", $objClass, $v[self::STREAMER_VAR], $mail));
+                            }
+                            else {
+                                $output[] = $mail;
+                            }
+                        }
+                        if (count($mails) != count($output)) {
+                            if ($condition === false) {
+                                return false;
+                            }
+
+                            // nothing left, use $condition as new value
+                            if (count($output) == 0) {
+                                $output[] = $condition;
+                            }
+
+                            // if we are allowed to rewrite the attribute, we do that
+                            if ($as_array) {
+                                $this->{$v[self::STREAMER_VAR]} = $output;
+                            }
+                            else {
+                                $this->{$v[self::STREAMER_VAR]} = $output[0];
+                            }
+                        }
+                    }// end STREAMER_CHECK_EMAIL
+                } // foreach CHECKS
+            } // isset CHECKS
+        } // foreach mapping
+
+        return true;
+    }
+
+    /**
+     * Returns human friendly property name from its value if a mapping is available.
+     *
+     * @param array $v
+     * @param mixed $val
+     *
+     * @return mixed
+     */
+    public function GetNameFromPropertyValue($v, $val) {
+        if (isset($v[self::STREAMER_VALUEMAP][$val])) {
+            return $v[self::STREAMER_VALUEMAP][$val];
+        }
+
+        return $val;
+    }
+
+    /**
+     * Called after the SyncObject was unserialized.
+     *
+     * @return bool
+     */
+    public function postUnserialize() {
+        return true;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -162,7 +162,7 @@ 
 	 * @return string
 	 */
 	public function __toString() {
-		$str = get_class($this) . " (\n";
+		$str = get_class($this)." (\n";
 
 		$streamerVars = [];
 		foreach ($this->mapping as $k => $v) {
@@ -183,16 +183,16 @@ 
 
 			// self::STREAMER_ARRAY ?
 			if (is_array($v)) {
-				$str .= "\t" . $strV . $k . "(Array) size: " . count($v) . "\n";
+				$str .= "\t".$strV.$k."(Array) size: ".count($v)."\n";
 				foreach ($v as $value) {
-					$str .= "\t\t" . Utils::PrintAsString($value) . "\n";
+					$str .= "\t\t".Utils::PrintAsString($value)."\n";
 				}
 			}
 			elseif ($v instanceof SyncObject) {
-				$str .= "\t" . $strV . $k . " => " . str_replace("\n", "\n\t\t\t", $v->__toString()) . "\n";
+				$str .= "\t".$strV.$k." => ".str_replace("\n", "\n\t\t\t", $v->__toString())."\n";
 			}
 			else {
-				$str .= "\t" . $strV . $k . " => " . (isset($this->{$k}) ? Utils::PrintAsString($this->{$k}) : "null") . "\n";
+				$str .= "\t".$strV.$k." => ".(isset($this->{$k}) ? Utils::PrintAsString($this->{$k}) : "null")."\n";
 			}
 		}
 		$str .= ")";

Braces +15 added lines, -30 removed lines

@@ -53,8 +53,7 @@ 
 					)) {
 				SLog::Write(LOGLEVEL_INFO, sprintf("%s->emptySupported(): no supported list available, emptying all not set parameters", get_class($this)));
 				$supportedFields = array_keys($this->mapping);
-			}
-			else {
+			} else {
 				return false;
 			}
 		}
@@ -118,14 +117,12 @@ 
 
 						return false;
 					}
-				}
-				else {
+				} else {
 					SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() array '%s' is set in one but not the other object", $val));
 
 					return false;
 				}
-			}
-			else {
+			} else {
 				if (isset($this->{$val}, $odo->{$val})) {
 					if ($strictTypeCompare) {
 						if ($this->{$val} !== $odo->{$val}) {
@@ -133,19 +130,16 @@ 
 
 							return false;
 						}
-					}
-					else {
+					} else {
 						if ($this->{$val} != $odo->{$val}) {
 							SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() false on field '%s': '%s' != '%s'", $val, Utils::PrintAsString($this->{$val}), Utils::PrintAsString($odo->{$val})));
 
 							return false;
 						}
 					}
-				}
-				elseif (!isset($this->{$val}) && !isset($odo->{$val})) {
+				} elseif (!isset($this->{$val}) && !isset($odo->{$val})) {
 					continue;
-				}
-				else {
+				} else {
 					SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() false because field '%s' is only defined at one obj: '%s' != '%s'", $val, Utils::PrintAsString(isset($this->{$val})), Utils::PrintAsString(isset($odo->{$val}))));
 
 					return false;
@@ -176,8 +170,7 @@ 
 
 			if (array_key_exists($k, $streamerVars)) {
 				$strV = "(S) ";
-			}
-			else {
+			} else {
 				$strV = "";
 			}
 
@@ -187,11 +180,9 @@ 
 				foreach ($v as $value) {
 					$str .= "\t\t" . Utils::PrintAsString($value) . "\n";
 				}
-			}
-			elseif ($v instanceof SyncObject) {
+			} elseif ($v instanceof SyncObject) {
 				$str .= "\t" . $strV . $k . " => " . str_replace("\n", "\n\t\t\t", $v->__toString()) . "\n";
-			}
-			else {
+			} else {
 				$str .= "\t" . $strV . $k . " => " . (isset($this->{$k}) ? Utils::PrintAsString($this->{$k}) : "null") . "\n";
 			}
 		}
@@ -275,8 +266,7 @@ 
 					if (!$this->{$v[self::STREAMER_VAR]}->Check($logAsDebug)) {
 						return false;
 					}
-				}
-				elseif (is_array($this->{$v[self::STREAMER_VAR]})) {
+				} elseif (is_array($this->{$v[self::STREAMER_VAR]})) {
 					foreach ($this->{$v[self::STREAMER_VAR]} as $subobj) {
 						if ($subobj instanceof SyncObject && !$subobj->Check($logAsDebug)) {
 							return false;
@@ -356,8 +346,7 @@ 
 								SLog::Write(LOGLEVEL_ERROR, sprintf("SyncObject->Check(): Can not compare parameter '%s' against the other value '%s' as it is not defined object from type %s. Please report this! Check skipped!", $objClass, $v[self::STREAMER_VAR], $condition));
 
 								continue;
-							}
-							else {
+							} else {
 								$cmpPar = $this->mapping[$condition][self::STREAMER_VAR];
 								if (isset($this->{$cmpPar})) {
 									$cmp = $this->{$cmpPar};
@@ -391,8 +380,7 @@ 
 						if (is_array($this->{$v[self::STREAMER_VAR]})) {
 							// implosion takes 2bytes, so we just assume ", " here
 							$chkstr = implode(", ", $this->{$v[self::STREAMER_VAR]});
-						}
-						else {
+						} else {
 							$chkstr = $this->{$v[self::STREAMER_VAR]};
 						}
 
@@ -416,8 +404,7 @@ 
 						if (is_array($this->{$v[self::STREAMER_VAR]})) {
 							$mails = $this->{$v[self::STREAMER_VAR]};
 							$as_array = true;
-						}
-						else {
+						} else {
 							$mails = [$this->{$v[self::STREAMER_VAR]}];
 						}
 
@@ -425,8 +412,7 @@ 
 						foreach ($mails as $mail) {
 							if (!Utils::CheckEmail($mail)) {
 								SLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): object from type %s: parameter '%s' contains an invalid email address '%s'. Address is removed.", $objClass, $v[self::STREAMER_VAR], $mail));
-							}
-							else {
+							} else {
 								$output[] = $mail;
 							}
 						}
@@ -443,8 +429,7 @@ 
 							// if we are allowed to rewrite the attribute, we do that
 							if ($as_array) {
 								$this->{$v[self::STREAMER_VAR]} = $output;
-							}
-							else {
+							} else {
 								$this->{$v[self::STREAMER_VAR]} = $output[0];
 							}
 						}

lib/syncobjects/syncaccount.php

Indentation +18 added lines, -18 removed lines

@@ -10,24 +10,24 @@
  */
 
 class SyncAccount extends SyncObject {
-	public $accountid;
-	public $accountname;
-	public $userdisplayname;
-	public $senddisabled;
-	public $emailaddresses;
+    public $accountid;
+    public $accountname;
+    public $userdisplayname;
+    public $senddisabled;
+    public $emailaddresses;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_SETTINGS_ACCOUNTID => [self::STREAMER_VAR => "accountid"],
-			SYNC_SETTINGS_ACCOUNTNAME => [self::STREAMER_VAR => "accountname"],
-			SYNC_SETTINGS_USERDISPLAYNAME => [self::STREAMER_VAR => "userdisplayname"],
-			SYNC_SETTINGS_SENDDISABLED => [self::STREAMER_VAR => "senddisabled"],
-			SYNC_SETTINGS_EMAILADDRESSES => [
-				self::STREAMER_VAR => "emailaddresses",
-				self::STREAMER_TYPE => "SyncEmailAddresses",
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_SETTINGS_ACCOUNTID => [self::STREAMER_VAR => "accountid"],
+            SYNC_SETTINGS_ACCOUNTNAME => [self::STREAMER_VAR => "accountname"],
+            SYNC_SETTINGS_USERDISPLAYNAME => [self::STREAMER_VAR => "userdisplayname"],
+            SYNC_SETTINGS_SENDDISABLED => [self::STREAMER_VAR => "senddisabled"],
+            SYNC_SETTINGS_EMAILADDRESSES => [
+                self::STREAMER_VAR => "emailaddresses",
+                self::STREAMER_TYPE => "SyncEmailAddresses",
+            ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

lib/syncobjects/syncitemoperationsattachment.php

Indentation +12 added lines, -12 removed lines

@@ -10,18 +10,18 @@
  */
 
 class SyncItemOperationsAttachment extends SyncObject {
-	public $contenttype;
-	public $data;
+    public $contenttype;
+    public $data;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_AIRSYNCBASE_CONTENTTYPE => [self::STREAMER_VAR => "contenttype"],
-			SYNC_ITEMOPERATIONS_DATA => [
-				self::STREAMER_VAR => "data",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASBASE64,
-				self::STREAMER_PROP => self::STREAMER_TYPE_MULTIPART, ],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_AIRSYNCBASE_CONTENTTYPE => [self::STREAMER_VAR => "contenttype"],
+            SYNC_ITEMOPERATIONS_DATA => [
+                self::STREAMER_VAR => "data",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASBASE64,
+                self::STREAMER_PROP => self::STREAMER_TYPE_MULTIPART, ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

lib/syncobjects/syncmail.php

Indentation +196 added lines, -196 removed lines

@@ -10,211 +10,211 @@
  */
 
 class SyncMail extends SyncObject {
-	public $to;
-	public $cc;
-	public $from;
-	public $subject;
-	public $threadtopic;
-	public $datereceived;
-	public $displayto;
-	public $importance;
-	public $read;
-	public $attachments;
-	public $mimetruncated;
-	public $mimedata;
-	public $mimesize;
-	public $bodytruncated;
-	public $bodysize;
-	public $body;
-	public $messageclass;
-	public $meetingrequest;
-	public $reply_to;
+    public $to;
+    public $cc;
+    public $from;
+    public $subject;
+    public $threadtopic;
+    public $datereceived;
+    public $displayto;
+    public $importance;
+    public $read;
+    public $attachments;
+    public $mimetruncated;
+    public $mimedata;
+    public $mimesize;
+    public $bodytruncated;
+    public $bodysize;
+    public $body;
+    public $messageclass;
+    public $meetingrequest;
+    public $reply_to;
 
-	// AS 2.5 prop
-	public $internetcpid;
+    // AS 2.5 prop
+    public $internetcpid;
 
-	// AS 12.0 props
-	public $asbody;
-	public $asattachments;
-	public $flag;
-	public $contentclass;
-	public $nativebodytype;
+    // AS 12.0 props
+    public $asbody;
+    public $asattachments;
+    public $flag;
+    public $contentclass;
+    public $nativebodytype;
 
-	// AS 14.0 props
-	public $umcallerid;
-	public $umusernotes;
-	public $conversationid;
-	public $conversationindex;
-	public $lastverbexecuted; // possible values unknown, reply to sender, reply to all, forward
-	public $lastverbexectime;
-	public $receivedasbcc;
-	public $sender;
-	public $categories;
+    // AS 14.0 props
+    public $umcallerid;
+    public $umusernotes;
+    public $conversationid;
+    public $conversationindex;
+    public $lastverbexecuted; // possible values unknown, reply to sender, reply to all, forward
+    public $lastverbexectime;
+    public $receivedasbcc;
+    public $sender;
+    public $categories;
 
-	// AS 14.1 props
-	public $rightsManagementLicense;
-	public $asbodypart;
+    // AS 14.1 props
+    public $rightsManagementLicense;
+    public $asbodypart;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_POOMMAIL_TO => [
-				self::STREAMER_VAR => "to",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_COMMA_SEPARATED,
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_LENGTHMAX => 32768,
-					self::STREAMER_CHECK_EMAIL => "",
-				],
-			],
-			SYNC_POOMMAIL_CC => [
-				self::STREAMER_VAR => "cc",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_COMMA_SEPARATED,
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_LENGTHMAX => 32768,
-					self::STREAMER_CHECK_EMAIL => "",
-				],
-			],
-			SYNC_POOMMAIL_FROM => [
-				self::STREAMER_VAR => "from",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_LENGTHMAX => 32768,
-					self::STREAMER_CHECK_EMAIL => "",
-				],
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMMAIL_SUBJECT => [
-				self::STREAMER_VAR => "subject",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMMAIL_THREADTOPIC => [
-				self::STREAMER_VAR => "threadtopic",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMMAIL_DATERECEIVED => [
-				self::STREAMER_VAR => "datereceived",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMMAIL_DISPLAYTO => [self::STREAMER_VAR => "displayto"],
-			// Importance values
-			// 0 = Low
-			// 1 = Normal
-			// 2 = High
-			// even the default value 1 is optional, the native android client 2.2 interprets a non-existing value as 0 (low)
-			SYNC_POOMMAIL_IMPORTANCE => [
-				self::STREAMER_VAR => "importance",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETONE,
-					self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2],
-				],
-			],
-			SYNC_POOMMAIL_READ => [self::STREAMER_VAR => "read",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_ONEVALUEOF => [0, 1], ],
-				self::STREAMER_RONOTIFY => true,
-				self::STREAMER_VALUEMAP => [
-					0 => "No",
-					1 => "Yes",
-				],
-			],
-			SYNC_POOMMAIL_ATTACHMENTS => [
-				self::STREAMER_VAR => "attachments",
-				self::STREAMER_TYPE => "SyncAttachment",
-				self::STREAMER_ARRAY => SYNC_POOMMAIL_ATTACHMENT,
-			],
-			SYNC_POOMMAIL_MIMETRUNCATED => [
-				self::STREAMER_VAR => "mimetruncated",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ZEROORONE => self::STREAMER_CHECK_SETZERO],
-			],
-			SYNC_POOMMAIL_MIMEDATA => [
-				self::STREAMER_VAR => "mimedata",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASPLAIN,
-			],
-			SYNC_POOMMAIL_MIMESIZE => [
-				self::STREAMER_VAR => "mimesize",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -1],
-			],
-			SYNC_POOMMAIL_BODYTRUNCATED => [
-				self::STREAMER_VAR => "bodytruncated",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ZEROORONE => self::STREAMER_CHECK_SETZERO],
-			],
-			SYNC_POOMMAIL_BODYSIZE => [
-				self::STREAMER_VAR => "bodysize",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -1],
-			],
-			SYNC_POOMMAIL_BODY => [self::STREAMER_VAR => "body"],
-			SYNC_POOMMAIL_MESSAGECLASS => [self::STREAMER_VAR => "messageclass"],
-			SYNC_POOMMAIL_MEETINGREQUEST => [
-				self::STREAMER_VAR => "meetingrequest",
-				self::STREAMER_TYPE => "SyncMeetingRequest",
-			],
-			SYNC_POOMMAIL_REPLY_TO => [
-				self::STREAMER_VAR => "reply_to",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_SEMICOLON_SEPARATED,
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_EMAIL => ""],
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_POOMMAIL_TO => [
+                self::STREAMER_VAR => "to",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_COMMA_SEPARATED,
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_LENGTHMAX => 32768,
+                    self::STREAMER_CHECK_EMAIL => "",
+                ],
+            ],
+            SYNC_POOMMAIL_CC => [
+                self::STREAMER_VAR => "cc",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_COMMA_SEPARATED,
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_LENGTHMAX => 32768,
+                    self::STREAMER_CHECK_EMAIL => "",
+                ],
+            ],
+            SYNC_POOMMAIL_FROM => [
+                self::STREAMER_VAR => "from",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_LENGTHMAX => 32768,
+                    self::STREAMER_CHECK_EMAIL => "",
+                ],
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMMAIL_SUBJECT => [
+                self::STREAMER_VAR => "subject",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMMAIL_THREADTOPIC => [
+                self::STREAMER_VAR => "threadtopic",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMMAIL_DATERECEIVED => [
+                self::STREAMER_VAR => "datereceived",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMMAIL_DISPLAYTO => [self::STREAMER_VAR => "displayto"],
+            // Importance values
+            // 0 = Low
+            // 1 = Normal
+            // 2 = High
+            // even the default value 1 is optional, the native android client 2.2 interprets a non-existing value as 0 (low)
+            SYNC_POOMMAIL_IMPORTANCE => [
+                self::STREAMER_VAR => "importance",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETONE,
+                    self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2],
+                ],
+            ],
+            SYNC_POOMMAIL_READ => [self::STREAMER_VAR => "read",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_ONEVALUEOF => [0, 1], ],
+                self::STREAMER_RONOTIFY => true,
+                self::STREAMER_VALUEMAP => [
+                    0 => "No",
+                    1 => "Yes",
+                ],
+            ],
+            SYNC_POOMMAIL_ATTACHMENTS => [
+                self::STREAMER_VAR => "attachments",
+                self::STREAMER_TYPE => "SyncAttachment",
+                self::STREAMER_ARRAY => SYNC_POOMMAIL_ATTACHMENT,
+            ],
+            SYNC_POOMMAIL_MIMETRUNCATED => [
+                self::STREAMER_VAR => "mimetruncated",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ZEROORONE => self::STREAMER_CHECK_SETZERO],
+            ],
+            SYNC_POOMMAIL_MIMEDATA => [
+                self::STREAMER_VAR => "mimedata",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASPLAIN,
+            ],
+            SYNC_POOMMAIL_MIMESIZE => [
+                self::STREAMER_VAR => "mimesize",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -1],
+            ],
+            SYNC_POOMMAIL_BODYTRUNCATED => [
+                self::STREAMER_VAR => "bodytruncated",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ZEROORONE => self::STREAMER_CHECK_SETZERO],
+            ],
+            SYNC_POOMMAIL_BODYSIZE => [
+                self::STREAMER_VAR => "bodysize",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -1],
+            ],
+            SYNC_POOMMAIL_BODY => [self::STREAMER_VAR => "body"],
+            SYNC_POOMMAIL_MESSAGECLASS => [self::STREAMER_VAR => "messageclass"],
+            SYNC_POOMMAIL_MEETINGREQUEST => [
+                self::STREAMER_VAR => "meetingrequest",
+                self::STREAMER_TYPE => "SyncMeetingRequest",
+            ],
+            SYNC_POOMMAIL_REPLY_TO => [
+                self::STREAMER_VAR => "reply_to",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_SEMICOLON_SEPARATED,
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_EMAIL => ""],
+            ],
+        ];
 
-		if (Request::GetProtocolVersion() >= 2.5) {
-			$mapping[SYNC_POOMMAIL_INTERNETCPID] = [self::STREAMER_VAR => "internetcpid"];
-		}
+        if (Request::GetProtocolVersion() >= 2.5) {
+            $mapping[SYNC_POOMMAIL_INTERNETCPID] = [self::STREAMER_VAR => "internetcpid"];
+        }
 
-		if (Request::GetProtocolVersion() >= 12.0) {
-			$mapping[SYNC_AIRSYNCBASE_BODY] = [
-				self::STREAMER_VAR => "asbody",
-				self::STREAMER_TYPE => "SyncBaseBody",
-			];
-			$mapping[SYNC_AIRSYNCBASE_ATTACHMENTS] = [
-				self::STREAMER_VAR => "asattachments",
-				self::STREAMER_TYPE => "SyncBaseAttachment",
-				self::STREAMER_ARRAY => SYNC_AIRSYNCBASE_ATTACHMENT,
-			];
-			$mapping[SYNC_POOMMAIL_CONTENTCLASS] = [
-				self::STREAMER_VAR => "contentclass",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [DEFAULT_EMAIL_CONTENTCLASS, DEFAULT_CALENDAR_CONTENTCLASS]],
-			];
-			$mapping[SYNC_POOMMAIL_FLAG] = [
-				self::STREAMER_VAR => "flag",
-				self::STREAMER_TYPE => "SyncMailFlags",
-				self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
-				self::STREAMER_RONOTIFY => true,
-			];
-			$mapping[SYNC_AIRSYNCBASE_NATIVEBODYTYPE] = [self::STREAMER_VAR => "nativebodytype"];
+        if (Request::GetProtocolVersion() >= 12.0) {
+            $mapping[SYNC_AIRSYNCBASE_BODY] = [
+                self::STREAMER_VAR => "asbody",
+                self::STREAMER_TYPE => "SyncBaseBody",
+            ];
+            $mapping[SYNC_AIRSYNCBASE_ATTACHMENTS] = [
+                self::STREAMER_VAR => "asattachments",
+                self::STREAMER_TYPE => "SyncBaseAttachment",
+                self::STREAMER_ARRAY => SYNC_AIRSYNCBASE_ATTACHMENT,
+            ];
+            $mapping[SYNC_POOMMAIL_CONTENTCLASS] = [
+                self::STREAMER_VAR => "contentclass",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [DEFAULT_EMAIL_CONTENTCLASS, DEFAULT_CALENDAR_CONTENTCLASS]],
+            ];
+            $mapping[SYNC_POOMMAIL_FLAG] = [
+                self::STREAMER_VAR => "flag",
+                self::STREAMER_TYPE => "SyncMailFlags",
+                self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
+                self::STREAMER_RONOTIFY => true,
+            ];
+            $mapping[SYNC_AIRSYNCBASE_NATIVEBODYTYPE] = [self::STREAMER_VAR => "nativebodytype"];
 
-			// unset these properties because airsyncbase body and attachments will be used instead
-			unset($mapping[SYNC_POOMMAIL_BODY], $mapping[SYNC_POOMMAIL_BODYTRUNCATED], $mapping[SYNC_POOMMAIL_ATTACHMENTS]);
-		}
+            // unset these properties because airsyncbase body and attachments will be used instead
+            unset($mapping[SYNC_POOMMAIL_BODY], $mapping[SYNC_POOMMAIL_BODYTRUNCATED], $mapping[SYNC_POOMMAIL_ATTACHMENTS]);
+        }
 
-		if (Request::GetProtocolVersion() >= 14.0) {
-			$mapping[SYNC_POOMMAIL2_UMCALLERID] = [self::STREAMER_VAR => "umcallerid"];
-			$mapping[SYNC_POOMMAIL2_UMUSERNOTES] = [self::STREAMER_VAR => "umusernotes"];
-			$mapping[SYNC_POOMMAIL2_CONVERSATIONID] = [self::STREAMER_VAR => "conversationid"];
-			$mapping[SYNC_POOMMAIL2_CONVERSATIONINDEX] = [self::STREAMER_VAR => "conversationindex"];
-			$mapping[SYNC_POOMMAIL2_LASTVERBEXECUTED] = [self::STREAMER_VAR => "lastverbexecuted"];
-			$mapping[SYNC_POOMMAIL2_LASTVERBEXECUTIONTIME] = [
-				self::STREAMER_VAR => "lastverbexectime",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-			];
-			$mapping[SYNC_POOMMAIL2_RECEIVEDASBCC] = [self::STREAMER_VAR => "receivedasbcc"];
-			$mapping[SYNC_POOMMAIL2_SENDER] = [self::STREAMER_VAR => "sender"];
-			$mapping[SYNC_POOMMAIL_CATEGORIES] = [
-				self::STREAMER_VAR => "categories",
-				self::STREAMER_ARRAY => SYNC_POOMMAIL_CATEGORY,
-				self::STREAMER_RONOTIFY => true,
-			];
-			// TODO bodypart, accountid
-		}
+        if (Request::GetProtocolVersion() >= 14.0) {
+            $mapping[SYNC_POOMMAIL2_UMCALLERID] = [self::STREAMER_VAR => "umcallerid"];
+            $mapping[SYNC_POOMMAIL2_UMUSERNOTES] = [self::STREAMER_VAR => "umusernotes"];
+            $mapping[SYNC_POOMMAIL2_CONVERSATIONID] = [self::STREAMER_VAR => "conversationid"];
+            $mapping[SYNC_POOMMAIL2_CONVERSATIONINDEX] = [self::STREAMER_VAR => "conversationindex"];
+            $mapping[SYNC_POOMMAIL2_LASTVERBEXECUTED] = [self::STREAMER_VAR => "lastverbexecuted"];
+            $mapping[SYNC_POOMMAIL2_LASTVERBEXECUTIONTIME] = [
+                self::STREAMER_VAR => "lastverbexectime",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+            ];
+            $mapping[SYNC_POOMMAIL2_RECEIVEDASBCC] = [self::STREAMER_VAR => "receivedasbcc"];
+            $mapping[SYNC_POOMMAIL2_SENDER] = [self::STREAMER_VAR => "sender"];
+            $mapping[SYNC_POOMMAIL_CATEGORIES] = [
+                self::STREAMER_VAR => "categories",
+                self::STREAMER_ARRAY => SYNC_POOMMAIL_CATEGORY,
+                self::STREAMER_RONOTIFY => true,
+            ];
+            // TODO bodypart, accountid
+        }
 
-		if (Request::GetProtocolVersion() >= 14.1) {
-			$mapping[SYNC_RIGHTSMANAGEMENT_LICENSE] = [
-				self::STREAMER_VAR => "rightsManagementLicense",
-				self::STREAMER_TYPE => "SyncRightsManagementLicense",
-			];
-			$mapping[SYNC_AIRSYNCBASE_BODYPART] = [
-				self::STREAMER_VAR => "asbodypart",
-				self::STREAMER_TYPE => "SyncBaseBodyPart",
-			];
-		}
+        if (Request::GetProtocolVersion() >= 14.1) {
+            $mapping[SYNC_RIGHTSMANAGEMENT_LICENSE] = [
+                self::STREAMER_VAR => "rightsManagementLicense",
+                self::STREAMER_TYPE => "SyncRightsManagementLicense",
+            ];
+            $mapping[SYNC_AIRSYNCBASE_BODYPART] = [
+                self::STREAMER_VAR => "asbodypart",
+                self::STREAMER_TYPE => "SyncBaseBodyPart",
+            ];
+        }
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }