grommunio / grommunio-sync

lib/syncobjects/syncrecurrence.php

Indentation +119 added lines, -119 removed lines

@@ -10,128 +10,128 @@
  */
 
 class SyncRecurrence extends SyncObject {
-	public $type;
-	public $until;
-	public $occurrences;
-	public $interval;
-	public $dayofweek;
-	public $dayofmonth;
-	public $weekofmonth;
-	public $monthofyear;
-	public $calendartype;
-	public $firstdayofweek;
+    public $type;
+    public $until;
+    public $occurrences;
+    public $interval;
+    public $dayofweek;
+    public $dayofmonth;
+    public $weekofmonth;
+    public $monthofyear;
+    public $calendartype;
+    public $firstdayofweek;
 
-	public function __construct() {
-		$mapping = [
-			// 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_POOMCAL_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_POOMCAL_UNTIL => [
-				self::STREAMER_VAR => "until",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCAL_OCCURRENCES => [
-				self::STREAMER_VAR => "occurrences",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_CMPHIGHER => 0,
-					self::STREAMER_CHECK_CMPLOWER => 1000,
-				],
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCAL_INTERVAL => [
-				self::STREAMER_VAR => "interval",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_CMPHIGHER => 0,
-					self::STREAMER_CHECK_CMPLOWER => 1000,
-				],
-				self::STREAMER_RONOTIFY => true,
-			],
-			// DayOfWeek values
-			//   1 = Sunday
-			//   2 = Monday
-			//   4 = Tuesday
-			//   8 = Wednesday
-			//  16 = Thursday
-			//  32 = Friday
-			//  62 = Weekdays  // not in spec: daily weekday recurrence
-			//  64 = Saturday
-			// 127 = The last day of the month. Value valid only in monthly or yearly recurrences.
-			// As this is a bitmask, actually all values 0 > x < 128 are allowed
-			SYNC_POOMCAL_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_POOMCAL_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_POOMCAL_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_POOMCAL_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,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            // 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_POOMCAL_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_POOMCAL_UNTIL => [
+                self::STREAMER_VAR => "until",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCAL_OCCURRENCES => [
+                self::STREAMER_VAR => "occurrences",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_CMPHIGHER => 0,
+                    self::STREAMER_CHECK_CMPLOWER => 1000,
+                ],
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCAL_INTERVAL => [
+                self::STREAMER_VAR => "interval",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_CMPHIGHER => 0,
+                    self::STREAMER_CHECK_CMPLOWER => 1000,
+                ],
+                self::STREAMER_RONOTIFY => true,
+            ],
+            // DayOfWeek values
+            //   1 = Sunday
+            //   2 = Monday
+            //   4 = Tuesday
+            //   8 = Wednesday
+            //  16 = Thursday
+            //  32 = Friday
+            //  62 = Weekdays  // not in spec: daily weekday recurrence
+            //  64 = Saturday
+            // 127 = The last day of the month. Value valid only in monthly or yearly recurrences.
+            // As this is a bitmask, actually all values 0 > x < 128 are allowed
+            SYNC_POOMCAL_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_POOMCAL_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_POOMCAL_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_POOMCAL_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_POOMCAL_CALENDARTYPE] = [
-				self::STREAMER_VAR => "calendartype",
-				self::STREAMER_RONOTIFY => true, ];
-		}
+        if (Request::GetProtocolVersion() >= 14.0) {
+            $mapping[SYNC_POOMCAL_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_POOMCAL_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_POOMCAL_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);
 
-		// Indicates that this SyncObject supports the private flag and stripping of private data.
-		// There is nothing concrete to be stripped here, but as it's part of an appointment it supports it.
-		$this->supportsPrivateStripping = true;
-	}
+        // Indicates that this SyncObject supports the private flag and stripping of private data.
+        // There is nothing concrete to be stripped here, but as it's part of an appointment it supports it.
+        $this->supportsPrivateStripping = true;
+    }
 }

lib/syncobjects/syncresolverecipientsavailability.php

Indentation +14 added lines, -14 removed lines

@@ -10,21 +10,21 @@
  */
 
 class SyncResolveRecipientsAvailability extends SyncObject {
-	public $starttime;
-	public $endtime;
-	public $status;
-	public $mergedfreebusy;
+    public $starttime;
+    public $endtime;
+    public $status;
+    public $mergedfreebusy;
 
-	public function __construct() {
-		$mapping = [];
+    public function __construct() {
+        $mapping = [];
 
-		if (Request::GetProtocolVersion() >= 14.0) {
-			$mapping[SYNC_RESOLVERECIPIENTS_STARTTIME] = [self::STREAMER_VAR => "starttime"];
-			$mapping[SYNC_RESOLVERECIPIENTS_ENDTIME] = [self::STREAMER_VAR => "endtime"];
-			$mapping[SYNC_RESOLVERECIPIENTS_STATUS] = [self::STREAMER_VAR => "status"];
-			$mapping[SYNC_RESOLVERECIPIENTS_MERGEDFREEBUSY] = [self::STREAMER_VAR => "mergedfreebusy"];
-		}
+        if (Request::GetProtocolVersion() >= 14.0) {
+            $mapping[SYNC_RESOLVERECIPIENTS_STARTTIME] = [self::STREAMER_VAR => "starttime"];
+            $mapping[SYNC_RESOLVERECIPIENTS_ENDTIME] = [self::STREAMER_VAR => "endtime"];
+            $mapping[SYNC_RESOLVERECIPIENTS_STATUS] = [self::STREAMER_VAR => "status"];
+            $mapping[SYNC_RESOLVERECIPIENTS_MERGEDFREEBUSY] = [self::STREAMER_VAR => "mergedfreebusy"];
+        }
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

lib/syncobjects/syncsendmailsource.php

Indentation +13 added lines, -13 removed lines

@@ -10,19 +10,19 @@
  */
 
 class SyncSendMailSource extends SyncObject {
-	public $folderid;
-	public $itemid;
-	public $longid;
-	public $instanceid;
+    public $folderid;
+    public $itemid;
+    public $longid;
+    public $instanceid;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_COMPOSEMAIL_FOLDERID => [self::STREAMER_VAR => "folderid"],
-			SYNC_COMPOSEMAIL_ITEMID => [self::STREAMER_VAR => "itemid"],
-			SYNC_COMPOSEMAIL_LONGID => [self::STREAMER_VAR => "longid"],
-			SYNC_COMPOSEMAIL_INSTANCEID => [self::STREAMER_VAR => "instanceid"],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_COMPOSEMAIL_FOLDERID => [self::STREAMER_VAR => "folderid"],
+            SYNC_COMPOSEMAIL_ITEMID => [self::STREAMER_VAR => "itemid"],
+            SYNC_COMPOSEMAIL_LONGID => [self::STREAMER_VAR => "longid"],
+            SYNC_COMPOSEMAIL_INSTANCEID => [self::STREAMER_VAR => "instanceid"],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

lib/syncobjects/syncrightsmanagementtemplates.php

Indentation +17 added lines, -17 removed lines

@@ -10,23 +10,23 @@
  */
 
 class SyncRightsManagementTemplates extends SyncObject {
-	public $rmtemplates;
-	public $Status;
+    public $rmtemplates;
+    public $Status;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_RIGHTSMANAGEMENT_TEMPLATES => [
-				self::STREAMER_VAR => "rmtemplates",
-				self::STREAMER_TYPE => "SyncRigtsManagementTemplate",
-				self::STREAMER_ARRAY => SYNC_RIGHTSMANAGEMENT_TEMPLATE,
-				self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
-			],
-			SYNC_SETTINGS_PROP_STATUS => [
-				self::STREAMER_VAR => "Status",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_RIGHTSMANAGEMENT_TEMPLATES => [
+                self::STREAMER_VAR => "rmtemplates",
+                self::STREAMER_TYPE => "SyncRigtsManagementTemplate",
+                self::STREAMER_ARRAY => SYNC_RIGHTSMANAGEMENT_TEMPLATE,
+                self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
+            ],
+            SYNC_SETTINGS_PROP_STATUS => [
+                self::STREAMER_VAR => "Status",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
+            ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

lib/syncobjects/syncmailflags.php

Indentation +78 added lines, -78 removed lines

@@ -10,84 +10,84 @@
  */
 
 class SyncMailFlags extends SyncObject {
-	public $subject;
-	public $flagstatus;
-	public $flagtype; // Possible types are clear, complete, active
-	public $datecompleted;
-	public $completetime;
-	public $startdate;
-	public $duedate;
-	public $utcstartdate;
-	public $utcduedate;
-	public $reminderset;
-	public $remindertime;
-	public $ordinaldate;
-	public $subordinaldate;
+    public $subject;
+    public $flagstatus;
+    public $flagtype; // Possible types are clear, complete, active
+    public $datecompleted;
+    public $completetime;
+    public $startdate;
+    public $duedate;
+    public $utcstartdate;
+    public $utcduedate;
+    public $reminderset;
+    public $remindertime;
+    public $ordinaldate;
+    public $subordinaldate;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_POOMTASKS_SUBJECT => [
-				self::STREAMER_VAR => "subject",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMMAIL_FLAGSTATUS => [
-				self::STREAMER_VAR => "flagstatus",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMMAIL_FLAGTYPE => [
-				self::STREAMER_VAR => "flagtype",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_DATECOMPLETED => [
-				self::STREAMER_VAR => "datecompleted",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMMAIL_COMPLETETIME => [
-				self::STREAMER_VAR => "completetime",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_STARTDATE => [
-				self::STREAMER_VAR => "startdate",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_DUEDATE => [
-				self::STREAMER_VAR => "duedate",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_UTCSTARTDATE => [
-				self::STREAMER_VAR => "utcstartdate",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_UTCDUEDATE => [
-				self::STREAMER_VAR => "utcduedate",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_REMINDERSET => [
-				self::STREAMER_VAR => "reminderset",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_REMINDERTIME => [
-				self::STREAMER_VAR => "remindertime",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_ORDINALDATE => [
-				self::STREAMER_VAR => "ordinaldate",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_SUBORDINALDATE => [
-				self::STREAMER_VAR => "subordinaldate",
-				self::STREAMER_RONOTIFY => true,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_POOMTASKS_SUBJECT => [
+                self::STREAMER_VAR => "subject",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMMAIL_FLAGSTATUS => [
+                self::STREAMER_VAR => "flagstatus",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMMAIL_FLAGTYPE => [
+                self::STREAMER_VAR => "flagtype",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_DATECOMPLETED => [
+                self::STREAMER_VAR => "datecompleted",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMMAIL_COMPLETETIME => [
+                self::STREAMER_VAR => "completetime",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_STARTDATE => [
+                self::STREAMER_VAR => "startdate",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_DUEDATE => [
+                self::STREAMER_VAR => "duedate",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_UTCSTARTDATE => [
+                self::STREAMER_VAR => "utcstartdate",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_UTCDUEDATE => [
+                self::STREAMER_VAR => "utcduedate",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_REMINDERSET => [
+                self::STREAMER_VAR => "reminderset",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_REMINDERTIME => [
+                self::STREAMER_VAR => "remindertime",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_ORDINALDATE => [
+                self::STREAMER_VAR => "ordinaldate",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_SUBORDINALDATE => [
+                self::STREAMER_VAR => "subordinaldate",
+                self::STREAMER_RONOTIFY => true,
+            ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

lib/syncobjects/syncsendmail.php

Indentation +36 added lines, -36 removed lines

@@ -10,42 +10,42 @@
  */
 
 class SyncSendMail extends SyncObject {
-	public $clientid;
-	public $saveinsent;
-	public $replacemime;
-	public $accountid;
-	public $source;
-	public $mime;
-	public $replyflag;
-	public $forwardflag;
+    public $clientid;
+    public $saveinsent;
+    public $replacemime;
+    public $accountid;
+    public $source;
+    public $mime;
+    public $replyflag;
+    public $forwardflag;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_COMPOSEMAIL_CLIENTID => [self::STREAMER_VAR => "clientid"],
-			SYNC_COMPOSEMAIL_SAVEINSENTITEMS => [
-				self::STREAMER_VAR => "saveinsent",
-				self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
-			],
-			SYNC_COMPOSEMAIL_REPLACEMIME => [
-				self::STREAMER_VAR => "replacemime",
-				self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
-			],
-			SYNC_COMPOSEMAIL_ACCOUNTID => [self::STREAMER_VAR => "accountid"],
-			SYNC_COMPOSEMAIL_SOURCE => [
-				self::STREAMER_VAR => "source",
-				self::STREAMER_TYPE => "SyncSendMailSource",
-			],
-			SYNC_COMPOSEMAIL_MIME => [self::STREAMER_VAR => "mime"],
-			SYNC_COMPOSEMAIL_REPLYFLAG => [
-				self::STREAMER_VAR => "replyflag",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
-			],
-			SYNC_COMPOSEMAIL_FORWARDFLAG => [
-				self::STREAMER_VAR => "forwardflag",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_COMPOSEMAIL_CLIENTID => [self::STREAMER_VAR => "clientid"],
+            SYNC_COMPOSEMAIL_SAVEINSENTITEMS => [
+                self::STREAMER_VAR => "saveinsent",
+                self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
+            ],
+            SYNC_COMPOSEMAIL_REPLACEMIME => [
+                self::STREAMER_VAR => "replacemime",
+                self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
+            ],
+            SYNC_COMPOSEMAIL_ACCOUNTID => [self::STREAMER_VAR => "accountid"],
+            SYNC_COMPOSEMAIL_SOURCE => [
+                self::STREAMER_VAR => "source",
+                self::STREAMER_TYPE => "SyncSendMailSource",
+            ],
+            SYNC_COMPOSEMAIL_MIME => [self::STREAMER_VAR => "mime"],
+            SYNC_COMPOSEMAIL_REPLYFLAG => [
+                self::STREAMER_VAR => "replyflag",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
+            ],
+            SYNC_COMPOSEMAIL_FORWARDFLAG => [
+                self::STREAMER_VAR => "forwardflag",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
+            ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

lib/grommunio/mapimapping.php

Indentation +433 added lines, -433 removed lines

@@ -8,452 +8,452 @@
  * MAPI to AS mapping class.
  */
 class MAPIMapping {
-	/**
-	 * Returns the MAPI to AS mapping for contacts.
-	 *
-	 * @return array
-	 */
-	public static function GetContactMapping() {
-		return [
-			"anniversary" => PR_WEDDING_ANNIVERSARY,
-			"assistantname" => PR_ASSISTANT,
-			"assistnamephonenumber" => PR_ASSISTANT_TELEPHONE_NUMBER,
-			"birthday" => PR_BIRTHDAY,
-			"body" => PR_BODY,
-			"business2phonenumber" => PR_BUSINESS2_TELEPHONE_NUMBER,
-			"businesscity" => "PT_STRING8:PSETID_Address:0x8046",
-			"businesscountry" => "PT_STRING8:PSETID_Address:0x8049",
-			"businesspostalcode" => "PT_STRING8:PSETID_Address:0x8048",
-			"businessstate" => "PT_STRING8:PSETID_Address:0x8047",
-			"businessstreet" => "PT_STRING8:PSETID_Address:0x8045",
-			"businessfaxnumber" => PR_BUSINESS_FAX_NUMBER,
-			"businessphonenumber" => PR_OFFICE_TELEPHONE_NUMBER,
-			"carphonenumber" => PR_CAR_TELEPHONE_NUMBER,
-			"categories" => "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords",
-			"children" => PR_CHILDRENS_NAMES,
-			"companyname" => PR_COMPANY_NAME,
-			"department" => PR_DEPARTMENT_NAME,
-			"email1address" => "PT_STRING8:PSETID_Address:0x8083",
-			"email2address" => "PT_STRING8:PSETID_Address:0x8093",
-			"email3address" => "PT_STRING8:PSETID_Address:0x80A3",
-			"fileas" => "PT_STRING8:PSETID_Address:0x8005",
-			"firstname" => PR_GIVEN_NAME,
-			"home2phonenumber" => PR_HOME2_TELEPHONE_NUMBER,
-			"homecity" => PR_HOME_ADDRESS_CITY,
-			"homecountry" => PR_HOME_ADDRESS_COUNTRY,
-			"homepostalcode" => PR_HOME_ADDRESS_POSTAL_CODE,
-			"homestate" => PR_HOME_ADDRESS_STATE_OR_PROVINCE,
-			"homestreet" => PR_HOME_ADDRESS_STREET,
-			"homefaxnumber" => PR_HOME_FAX_NUMBER,
-			"homephonenumber" => PR_HOME_TELEPHONE_NUMBER,
-			"jobtitle" => PR_TITLE,
-			"lastname" => PR_SURNAME,
-			"middlename" => PR_MIDDLE_NAME,
-			"mobilephonenumber" => PR_CELLULAR_TELEPHONE_NUMBER,
-			"officelocation" => PR_OFFICE_LOCATION,
-			"othercity" => PR_OTHER_ADDRESS_CITY,
-			"othercountry" => PR_OTHER_ADDRESS_COUNTRY,
-			"otherpostalcode" => PR_OTHER_ADDRESS_POSTAL_CODE,
-			"otherstate" => PR_OTHER_ADDRESS_STATE_OR_PROVINCE,
-			"otherstreet" => PR_OTHER_ADDRESS_STREET,
-			"pagernumber" => PR_PAGER_TELEPHONE_NUMBER,
-			"radiophonenumber" => PR_RADIO_TELEPHONE_NUMBER,
-			"spouse" => PR_SPOUSE_NAME,
-			"suffix" => PR_GENERATION,
-			"title" => PR_DISPLAY_NAME_PREFIX,
-			"webpage" => "PT_STRING8:PSETID_Address:0x802b",
-			"yomicompanyname" => "PT_STRING8:PSETID_Address:0x802e",
-			"yomifirstname" => "PT_STRING8:PSETID_Address:0x802c",
-			"yomilastname" => "PT_STRING8:PSETID_Address:0x802d",
-			"rtf" => PR_RTF_COMPRESSED,
-			// picture
-			"customerid" => PR_CUSTOMER_ID,
-			"governmentid" => PR_GOVERNMENT_ID_NUMBER,
-			"imaddress" => "PT_STRING8:PSETID_Address:0x8062",
-			"imaddress2" => "PT_STRING8:PSETID_AirSync:IMAddress2",
-			"imaddress3" => "PT_STRING8:PSETID_AirSync:IMAddress3",
-			"managername" => PR_MANAGER_NAME,
-			"companymainphone" => PR_COMPANY_MAIN_PHONE_NUMBER,
-			"accountname" => PR_ACCOUNT,
-			"nickname" => PR_NICKNAME,
-			// mms
-		];
-	}
+    /**
+     * Returns the MAPI to AS mapping for contacts.
+     *
+     * @return array
+     */
+    public static function GetContactMapping() {
+        return [
+            "anniversary" => PR_WEDDING_ANNIVERSARY,
+            "assistantname" => PR_ASSISTANT,
+            "assistnamephonenumber" => PR_ASSISTANT_TELEPHONE_NUMBER,
+            "birthday" => PR_BIRTHDAY,
+            "body" => PR_BODY,
+            "business2phonenumber" => PR_BUSINESS2_TELEPHONE_NUMBER,
+            "businesscity" => "PT_STRING8:PSETID_Address:0x8046",
+            "businesscountry" => "PT_STRING8:PSETID_Address:0x8049",
+            "businesspostalcode" => "PT_STRING8:PSETID_Address:0x8048",
+            "businessstate" => "PT_STRING8:PSETID_Address:0x8047",
+            "businessstreet" => "PT_STRING8:PSETID_Address:0x8045",
+            "businessfaxnumber" => PR_BUSINESS_FAX_NUMBER,
+            "businessphonenumber" => PR_OFFICE_TELEPHONE_NUMBER,
+            "carphonenumber" => PR_CAR_TELEPHONE_NUMBER,
+            "categories" => "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords",
+            "children" => PR_CHILDRENS_NAMES,
+            "companyname" => PR_COMPANY_NAME,
+            "department" => PR_DEPARTMENT_NAME,
+            "email1address" => "PT_STRING8:PSETID_Address:0x8083",
+            "email2address" => "PT_STRING8:PSETID_Address:0x8093",
+            "email3address" => "PT_STRING8:PSETID_Address:0x80A3",
+            "fileas" => "PT_STRING8:PSETID_Address:0x8005",
+            "firstname" => PR_GIVEN_NAME,
+            "home2phonenumber" => PR_HOME2_TELEPHONE_NUMBER,
+            "homecity" => PR_HOME_ADDRESS_CITY,
+            "homecountry" => PR_HOME_ADDRESS_COUNTRY,
+            "homepostalcode" => PR_HOME_ADDRESS_POSTAL_CODE,
+            "homestate" => PR_HOME_ADDRESS_STATE_OR_PROVINCE,
+            "homestreet" => PR_HOME_ADDRESS_STREET,
+            "homefaxnumber" => PR_HOME_FAX_NUMBER,
+            "homephonenumber" => PR_HOME_TELEPHONE_NUMBER,
+            "jobtitle" => PR_TITLE,
+            "lastname" => PR_SURNAME,
+            "middlename" => PR_MIDDLE_NAME,
+            "mobilephonenumber" => PR_CELLULAR_TELEPHONE_NUMBER,
+            "officelocation" => PR_OFFICE_LOCATION,
+            "othercity" => PR_OTHER_ADDRESS_CITY,
+            "othercountry" => PR_OTHER_ADDRESS_COUNTRY,
+            "otherpostalcode" => PR_OTHER_ADDRESS_POSTAL_CODE,
+            "otherstate" => PR_OTHER_ADDRESS_STATE_OR_PROVINCE,
+            "otherstreet" => PR_OTHER_ADDRESS_STREET,
+            "pagernumber" => PR_PAGER_TELEPHONE_NUMBER,
+            "radiophonenumber" => PR_RADIO_TELEPHONE_NUMBER,
+            "spouse" => PR_SPOUSE_NAME,
+            "suffix" => PR_GENERATION,
+            "title" => PR_DISPLAY_NAME_PREFIX,
+            "webpage" => "PT_STRING8:PSETID_Address:0x802b",
+            "yomicompanyname" => "PT_STRING8:PSETID_Address:0x802e",
+            "yomifirstname" => "PT_STRING8:PSETID_Address:0x802c",
+            "yomilastname" => "PT_STRING8:PSETID_Address:0x802d",
+            "rtf" => PR_RTF_COMPRESSED,
+            // picture
+            "customerid" => PR_CUSTOMER_ID,
+            "governmentid" => PR_GOVERNMENT_ID_NUMBER,
+            "imaddress" => "PT_STRING8:PSETID_Address:0x8062",
+            "imaddress2" => "PT_STRING8:PSETID_AirSync:IMAddress2",
+            "imaddress3" => "PT_STRING8:PSETID_AirSync:IMAddress3",
+            "managername" => PR_MANAGER_NAME,
+            "companymainphone" => PR_COMPANY_MAIN_PHONE_NUMBER,
+            "accountname" => PR_ACCOUNT,
+            "nickname" => PR_NICKNAME,
+            // mms
+        ];
+    }
 
-	/**
-	 * Returns contact specific MAPI properties.
-	 *
-	 * @return array
-	 */
-	public static function GetContactProperties() {
-		return [
-			"haspic" => "PT_BOOLEAN:PSETID_Address:0x8015",
-			"emailaddress1" => "PT_STRING8:PSETID_Address:0x8083",
-			"emailaddressdname1" => "PT_STRING8:PSETID_Address:0x8080",
-			"emailaddressdemail1" => "PT_STRING8:PSETID_Address:0x8084",
-			"emailaddresstype1" => "PT_STRING8:PSETID_Address:0x8082",
-			"emailaddressentryid1" => "PT_BINARY:PSETID_Address:0x8085",
-			"emailaddress2" => "PT_STRING8:PSETID_Address:0x8093",
-			"emailaddressdname2" => "PT_STRING8:PSETID_Address:0x8090",
-			"emailaddressdemail2" => "PT_STRING8:PSETID_Address:0x8094",
-			"emailaddresstype2" => "PT_STRING8:PSETID_Address:0x8092",
-			"emailaddressentryid2" => "PT_BINARY:PSETID_Address:0x8095",
-			"emailaddress3" => "PT_STRING8:PSETID_Address:0x80a3",
-			"emailaddressdname3" => "PT_STRING8:PSETID_Address:0x80a0",
-			"emailaddressdemail3" => "PT_STRING8:PSETID_Address:0x80a4",
-			"emailaddresstype3" => "PT_STRING8:PSETID_Address:0x80a2",
-			"emailaddressentryid3" => "PT_BINARY:PSETID_Address:0x80a5",
-			"addressbookmv" => "PT_MV_LONG:PSETID_Address:0x8028",
-			"addressbooklong" => "PT_LONG:PSETID_Address:0x8029",
-			"displayname" => PR_DISPLAY_NAME,
-			"subject" => PR_SUBJECT,
-			"country" => PR_COUNTRY,
-			"city" => PR_LOCALITY,
-			"postaladdress" => PR_POSTAL_ADDRESS,
-			"postalcode" => PR_POSTAL_CODE,
-			"state" => PR_STATE_OR_PROVINCE,
-			"street" => PR_STREET_ADDRESS,
-			"homeaddress" => "PT_STRING8:PSETID_Address:0x801a",
-			"businessaddress" => "PT_STRING8:PSETID_Address:0x801b",
-			"otheraddress" => "PT_STRING8:PSETID_Address:0x801c",
-			"mailingaddress" => "PT_LONG:PSETID_Address:0x8022",
-		];
-	}
+    /**
+     * Returns contact specific MAPI properties.
+     *
+     * @return array
+     */
+    public static function GetContactProperties() {
+        return [
+            "haspic" => "PT_BOOLEAN:PSETID_Address:0x8015",
+            "emailaddress1" => "PT_STRING8:PSETID_Address:0x8083",
+            "emailaddressdname1" => "PT_STRING8:PSETID_Address:0x8080",
+            "emailaddressdemail1" => "PT_STRING8:PSETID_Address:0x8084",
+            "emailaddresstype1" => "PT_STRING8:PSETID_Address:0x8082",
+            "emailaddressentryid1" => "PT_BINARY:PSETID_Address:0x8085",
+            "emailaddress2" => "PT_STRING8:PSETID_Address:0x8093",
+            "emailaddressdname2" => "PT_STRING8:PSETID_Address:0x8090",
+            "emailaddressdemail2" => "PT_STRING8:PSETID_Address:0x8094",
+            "emailaddresstype2" => "PT_STRING8:PSETID_Address:0x8092",
+            "emailaddressentryid2" => "PT_BINARY:PSETID_Address:0x8095",
+            "emailaddress3" => "PT_STRING8:PSETID_Address:0x80a3",
+            "emailaddressdname3" => "PT_STRING8:PSETID_Address:0x80a0",
+            "emailaddressdemail3" => "PT_STRING8:PSETID_Address:0x80a4",
+            "emailaddresstype3" => "PT_STRING8:PSETID_Address:0x80a2",
+            "emailaddressentryid3" => "PT_BINARY:PSETID_Address:0x80a5",
+            "addressbookmv" => "PT_MV_LONG:PSETID_Address:0x8028",
+            "addressbooklong" => "PT_LONG:PSETID_Address:0x8029",
+            "displayname" => PR_DISPLAY_NAME,
+            "subject" => PR_SUBJECT,
+            "country" => PR_COUNTRY,
+            "city" => PR_LOCALITY,
+            "postaladdress" => PR_POSTAL_ADDRESS,
+            "postalcode" => PR_POSTAL_CODE,
+            "state" => PR_STATE_OR_PROVINCE,
+            "street" => PR_STREET_ADDRESS,
+            "homeaddress" => "PT_STRING8:PSETID_Address:0x801a",
+            "businessaddress" => "PT_STRING8:PSETID_Address:0x801b",
+            "otheraddress" => "PT_STRING8:PSETID_Address:0x801c",
+            "mailingaddress" => "PT_LONG:PSETID_Address:0x8022",
+        ];
+    }
 
-	/**
-	 * Returns the MAPI to AS mapping for emails.
-	 *
-	 * @return array
-	 */
-	public static function GetEmailMapping() {
-		return [
-			// from
-			"datereceived" => PR_MESSAGE_DELIVERY_TIME,
-			"displayname" => PR_SUBJECT,
-			"displayto" => PR_DISPLAY_TO,
-			"importance" => PR_IMPORTANCE,
-			"messageclass" => PR_MESSAGE_CLASS,
-			"subject" => PR_SUBJECT,
-			"read" => PR_MESSAGE_FLAGS,
-			// "to" // need to be generated with SMTP addresses
-			// "cc"
-			// "threadtopic"        => PR_CONVERSATION_TOPIC,
-			"internetcpid" => PR_INTERNET_CPID,
-			"nativebodytype" => PR_NATIVE_BODY_INFO,
-			"lastverbexecuted" => PR_LAST_VERB_EXECUTED,
-			"lastverbexectime" => PR_LAST_VERB_EXECUTION_TIME,
-			"categories" => "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords",
-		];
-	}
+    /**
+     * Returns the MAPI to AS mapping for emails.
+     *
+     * @return array
+     */
+    public static function GetEmailMapping() {
+        return [
+            // from
+            "datereceived" => PR_MESSAGE_DELIVERY_TIME,
+            "displayname" => PR_SUBJECT,
+            "displayto" => PR_DISPLAY_TO,
+            "importance" => PR_IMPORTANCE,
+            "messageclass" => PR_MESSAGE_CLASS,
+            "subject" => PR_SUBJECT,
+            "read" => PR_MESSAGE_FLAGS,
+            // "to" // need to be generated with SMTP addresses
+            // "cc"
+            // "threadtopic"        => PR_CONVERSATION_TOPIC,
+            "internetcpid" => PR_INTERNET_CPID,
+            "nativebodytype" => PR_NATIVE_BODY_INFO,
+            "lastverbexecuted" => PR_LAST_VERB_EXECUTED,
+            "lastverbexectime" => PR_LAST_VERB_EXECUTION_TIME,
+            "categories" => "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords",
+        ];
+    }
 
-	/**
-	 * Returns email specific MAPI properties.
-	 *
-	 * @return array
-	 */
-	public static function GetEmailProperties() {
-		return [
-			// Override 'From' to show "Full Name <user@domain.com>"
-			"representingname" => PR_SENT_REPRESENTING_NAME,
-			"representingentryid" => PR_SENT_REPRESENTING_ENTRYID,
-			"representingsearchkey" => PR_SENT_REPRESENTING_SEARCH_KEY,
-			"sourcekey" => PR_SOURCE_KEY,
-			"entryid" => PR_ENTRYID,
-			"parentsourcekey" => PR_PARENT_SOURCE_KEY,
-			"body" => PR_BODY,
-			"rtfcompressed" => PR_RTF_COMPRESSED,
-			"html" => PR_HTML,
-			"rtfinsync" => PR_RTF_IN_SYNC,
-			"processed" => PR_PROCESSED,
-		];
-	}
+    /**
+     * Returns email specific MAPI properties.
+     *
+     * @return array
+     */
+    public static function GetEmailProperties() {
+        return [
+            // Override 'From' to show "Full Name <user@domain.com>"
+            "representingname" => PR_SENT_REPRESENTING_NAME,
+            "representingentryid" => PR_SENT_REPRESENTING_ENTRYID,
+            "representingsearchkey" => PR_SENT_REPRESENTING_SEARCH_KEY,
+            "sourcekey" => PR_SOURCE_KEY,
+            "entryid" => PR_ENTRYID,
+            "parentsourcekey" => PR_PARENT_SOURCE_KEY,
+            "body" => PR_BODY,
+            "rtfcompressed" => PR_RTF_COMPRESSED,
+            "html" => PR_HTML,
+            "rtfinsync" => PR_RTF_IN_SYNC,
+            "processed" => PR_PROCESSED,
+        ];
+    }
 
-	/**
-	 * Returns the MAPI to AS mapping for meeting requests.
-	 *
-	 * @return array
-	 */
-	public static function GetMeetingRequestMapping() {
-		return [
-			"responserequested" => PR_RESPONSE_REQUESTED,
-			// timezone
-			"alldayevent" => "PT_BOOLEAN:PSETID_Appointment:0x8215",
-			"busystatus" => "PT_LONG:PSETID_Appointment:0x8224",
-			"rtf" => PR_RTF_COMPRESSED,
-			"dtstamp" => PR_LAST_MODIFICATION_TIME,
-			"endtime" => "PT_SYSTIME:PSETID_Appointment:0x820e",
-			"location" => "PT_STRING8:PSETID_Appointment:0x8208",
-			// recurrences
-			"reminder" => "PT_LONG:PSETID_Common:0x8501",
-			"starttime" => "PT_SYSTIME:PSETID_Appointment:0x820d",
-			"sensitivity" => PR_SENSITIVITY,
-		];
-	}
+    /**
+     * Returns the MAPI to AS mapping for meeting requests.
+     *
+     * @return array
+     */
+    public static function GetMeetingRequestMapping() {
+        return [
+            "responserequested" => PR_RESPONSE_REQUESTED,
+            // timezone
+            "alldayevent" => "PT_BOOLEAN:PSETID_Appointment:0x8215",
+            "busystatus" => "PT_LONG:PSETID_Appointment:0x8224",
+            "rtf" => PR_RTF_COMPRESSED,
+            "dtstamp" => PR_LAST_MODIFICATION_TIME,
+            "endtime" => "PT_SYSTIME:PSETID_Appointment:0x820e",
+            "location" => "PT_STRING8:PSETID_Appointment:0x8208",
+            // recurrences
+            "reminder" => "PT_LONG:PSETID_Common:0x8501",
+            "starttime" => "PT_SYSTIME:PSETID_Appointment:0x820d",
+            "sensitivity" => PR_SENSITIVITY,
+        ];
+    }
 
-	public static function GetMeetingRequestProperties() {
-		return [
-			"goidtag" => "PT_BINARY:PSETID_Meeting:0x3",
-			"timezonetag" => "PT_BINARY:PSETID_Appointment:0x8233",
-			"recReplTime" => "PT_SYSTIME:PSETID_Appointment:0x8228",
-			"isrecurringtag" => "PT_BOOLEAN:PSETID_Appointment:0x8223",
-			"recurringstate" => "PT_BINARY:PSETID_Appointment:0x8216",
-			"appSeqNr" => "PT_LONG:PSETID_Appointment:0x8201",
-			"lidIsException" => "PT_BOOLEAN:PSETID_Appointment:0xA",
-			"recurStartTime" => "PT_LONG:PSETID_Meeting:0xE",
-			"reminderset" => "PT_BOOLEAN:PSETID_Common:0x8503",
-			"remindertime" => "PT_LONG:PSETID_Common:0x8501",
-			"recurrenceend" => "PT_SYSTIME:PSETID_Appointment:0x8236",
-			"meetingType" => "PT_LONG:PSETID_Meeting:0x26",
-		];
-	}
+    public static function GetMeetingRequestProperties() {
+        return [
+            "goidtag" => "PT_BINARY:PSETID_Meeting:0x3",
+            "timezonetag" => "PT_BINARY:PSETID_Appointment:0x8233",
+            "recReplTime" => "PT_SYSTIME:PSETID_Appointment:0x8228",
+            "isrecurringtag" => "PT_BOOLEAN:PSETID_Appointment:0x8223",
+            "recurringstate" => "PT_BINARY:PSETID_Appointment:0x8216",
+            "appSeqNr" => "PT_LONG:PSETID_Appointment:0x8201",
+            "lidIsException" => "PT_BOOLEAN:PSETID_Appointment:0xA",
+            "recurStartTime" => "PT_LONG:PSETID_Meeting:0xE",
+            "reminderset" => "PT_BOOLEAN:PSETID_Common:0x8503",
+            "remindertime" => "PT_LONG:PSETID_Common:0x8501",
+            "recurrenceend" => "PT_SYSTIME:PSETID_Appointment:0x8236",
+            "meetingType" => "PT_LONG:PSETID_Meeting:0x26",
+        ];
+    }
 
-	public static function GetTnefAndIcalProperties() {
-		return [
-			"starttime" => "PT_SYSTIME:PSETID_Appointment:0x820d",
-			"endtime" => "PT_SYSTIME:PSETID_Appointment:0x820e",
-			"commonstart" => "PT_SYSTIME:PSETID_Common:0x8516",
-			"commonend" => "PT_SYSTIME:PSETID_Common:0x8517",
-			"clipstart" => "PT_SYSTIME:PSETID_Appointment:0x8235", // ical only
-			"recurrenceend" => "PT_SYSTIME:PSETID_Appointment:0x8236", // ical only
-			"isrecurringtag" => "PT_BOOLEAN:PSETID_Appointment:0x8223",
-			"goidtag" => "PT_BINARY:PSETID_Meeting:0x3",
-			"goid2tag" => "PT_BINARY:PSETID_Meeting:0x23",
-			"usetnef" => "PT_LONG:PSETID_Meeting:0x8582",
-			"tneflocation" => "PT_STRING8:PSETID_Meeting:0x2", // ical only
-			"location" => "PT_STRING8:PSETID_Appointment:0x8208",
-			"tnefrecurr" => "PT_BOOLEAN:PSETID_Meeting:0x5",
-			"sideeffects" => "PT_LONG:PSETID_Common:0x8510",
-			"type" => "PT_STRING8:PSETID_Meeting:0x24",
-			"busystatus" => "PT_LONG:PSETID_Appointment:0x8205",
-			"meetingstatus" => "PT_LONG:PSETID_Appointment:0x8217",
-			"responsestatus" => "PT_LONG:PSETID_Meeting:0x8218",
-			// the properties below are currently not used
-			"dayinterval" => "PT_I2:PSETID_Meeting:0x11",
-			"weekinterval" => "PT_I2:PSETID_Meeting:0x12",
-			"monthinterval" => "PT_I2:PSETID_Meeting:0x13",
-			"yearinterval" => "PT_I2:PSETID_Meeting:0x14",
-		];
-	}
+    public static function GetTnefAndIcalProperties() {
+        return [
+            "starttime" => "PT_SYSTIME:PSETID_Appointment:0x820d",
+            "endtime" => "PT_SYSTIME:PSETID_Appointment:0x820e",
+            "commonstart" => "PT_SYSTIME:PSETID_Common:0x8516",
+            "commonend" => "PT_SYSTIME:PSETID_Common:0x8517",
+            "clipstart" => "PT_SYSTIME:PSETID_Appointment:0x8235", // ical only
+            "recurrenceend" => "PT_SYSTIME:PSETID_Appointment:0x8236", // ical only
+            "isrecurringtag" => "PT_BOOLEAN:PSETID_Appointment:0x8223",
+            "goidtag" => "PT_BINARY:PSETID_Meeting:0x3",
+            "goid2tag" => "PT_BINARY:PSETID_Meeting:0x23",
+            "usetnef" => "PT_LONG:PSETID_Meeting:0x8582",
+            "tneflocation" => "PT_STRING8:PSETID_Meeting:0x2", // ical only
+            "location" => "PT_STRING8:PSETID_Appointment:0x8208",
+            "tnefrecurr" => "PT_BOOLEAN:PSETID_Meeting:0x5",
+            "sideeffects" => "PT_LONG:PSETID_Common:0x8510",
+            "type" => "PT_STRING8:PSETID_Meeting:0x24",
+            "busystatus" => "PT_LONG:PSETID_Appointment:0x8205",
+            "meetingstatus" => "PT_LONG:PSETID_Appointment:0x8217",
+            "responsestatus" => "PT_LONG:PSETID_Meeting:0x8218",
+            // the properties below are currently not used
+            "dayinterval" => "PT_I2:PSETID_Meeting:0x11",
+            "weekinterval" => "PT_I2:PSETID_Meeting:0x12",
+            "monthinterval" => "PT_I2:PSETID_Meeting:0x13",
+            "yearinterval" => "PT_I2:PSETID_Meeting:0x14",
+        ];
+    }
 
-	/**
-	 * Returns the MAPI to AS mapping for appointments.
-	 *
-	 * @return array
-	 */
-	public static function GetAppointmentMapping() {
-		return [
-			"alldayevent" => "PT_BOOLEAN:PSETID_Appointment:0x8215",
-			"body" => PR_BODY,
-			"busystatus" => "PT_LONG:PSETID_Appointment:0x8205",
-			"categories" => "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords",
-			"rtf" => PR_RTF_COMPRESSED,
-			"dtstamp" => PR_LAST_MODIFICATION_TIME,
-			"endtime" => "PT_SYSTIME:PSETID_Appointment:0x820e",
-			"location" => "PT_STRING8:PSETID_Appointment:0x8208",
-			"meetingstatus" => "PT_LONG:PSETID_Appointment:0x8217",
-			"sensitivity" => PR_SENSITIVITY,
-			"subject" => PR_SUBJECT,
-			"starttime" => "PT_SYSTIME:PSETID_Appointment:0x820d",
-			"uid" => "PT_BINARY:PSETID_Meeting:0x3",
-			"nativebodytype" => PR_NATIVE_BODY_INFO,
-		];
-	}
+    /**
+     * Returns the MAPI to AS mapping for appointments.
+     *
+     * @return array
+     */
+    public static function GetAppointmentMapping() {
+        return [
+            "alldayevent" => "PT_BOOLEAN:PSETID_Appointment:0x8215",
+            "body" => PR_BODY,
+            "busystatus" => "PT_LONG:PSETID_Appointment:0x8205",
+            "categories" => "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords",
+            "rtf" => PR_RTF_COMPRESSED,
+            "dtstamp" => PR_LAST_MODIFICATION_TIME,
+            "endtime" => "PT_SYSTIME:PSETID_Appointment:0x820e",
+            "location" => "PT_STRING8:PSETID_Appointment:0x8208",
+            "meetingstatus" => "PT_LONG:PSETID_Appointment:0x8217",
+            "sensitivity" => PR_SENSITIVITY,
+            "subject" => PR_SUBJECT,
+            "starttime" => "PT_SYSTIME:PSETID_Appointment:0x820d",
+            "uid" => "PT_BINARY:PSETID_Meeting:0x3",
+            "nativebodytype" => PR_NATIVE_BODY_INFO,
+        ];
+    }
 
-	/**
-	 * Returns appointment specific MAPI properties.
-	 *
-	 * @return array
-	 */
-	public static function GetAppointmentProperties() {
-		return [
-			"sourcekey" => PR_SOURCE_KEY,
-			"representingentryid" => PR_SENT_REPRESENTING_ENTRYID,
-			"representingname" => PR_SENT_REPRESENTING_NAME,
-			"sentrepresentingemail" => PR_SENT_REPRESENTING_EMAIL_ADDRESS,
-			"sentrepresentingaddt" => PR_SENT_REPRESENTING_ADDRTYPE,
-			"sentrepresentinsrchk" => PR_SENT_REPRESENTING_SEARCH_KEY,
-			"reminderset" => "PT_BOOLEAN:PSETID_Common:0x8503",
-			"remindertime" => "PT_LONG:PSETID_Common:0x8501",
-			"meetingstatus" => "PT_LONG:PSETID_Appointment:0x8217",
-			"isrecurring" => "PT_BOOLEAN:PSETID_Appointment:0x8223",
-			"recurringstate" => "PT_BINARY:PSETID_Appointment:0x8216",
-			"timezonetag" => "PT_BINARY:PSETID_Appointment:0x8233",
-			"timezonedesc" => "PT_STRING8:PSETID_Appointment:0x8234",
-			"recurrenceend" => "PT_SYSTIME:PSETID_Appointment:0x8236",
-			"responsestatus" => "PT_LONG:PSETID_Appointment:0x8218",
-			"commonstart" => "PT_SYSTIME:PSETID_Common:0x8516",
-			"commonend" => "PT_SYSTIME:PSETID_Common:0x8517",
-			"reminderstart" => "PT_SYSTIME:PSETID_Common:0x8502",
-			"duration" => "PT_LONG:PSETID_Appointment:0x8213",
-			"private" => "PT_BOOLEAN:PSETID_Common:0x8506",
-			"uid" => "PT_BINARY:PSETID_Meeting:0x23",
-			"sideeffects" => "PT_LONG:PSETID_Common:0x8510",
-			"flagdueby" => "PT_SYSTIME:PSETID_Common:0x8560",
-			"icon" => PR_ICON_INDEX,
-			"mrwassent" => "PT_BOOLEAN:PSETID_Appointment:0x8229",
-			"endtime" => "PT_SYSTIME:PSETID_Appointment:0x820e", // this is here for calendar restriction, tnef and ical
-			"starttime" => "PT_SYSTIME:PSETID_Appointment:0x820d", // this is here for calendar restriction, tnef and ical
-			"clipstart" => "PT_SYSTIME:PSETID_Appointment:0x8235", // ical only
-			"recurrencetype" => "PT_LONG:PSETID_Appointment:0x8231",
-			"body" => PR_BODY,
-			"rtfcompressed" => PR_RTF_COMPRESSED,
-			"html" => PR_HTML,
-			"rtfinsync" => PR_RTF_IN_SYNC,
-		];
-	}
+    /**
+     * Returns appointment specific MAPI properties.
+     *
+     * @return array
+     */
+    public static function GetAppointmentProperties() {
+        return [
+            "sourcekey" => PR_SOURCE_KEY,
+            "representingentryid" => PR_SENT_REPRESENTING_ENTRYID,
+            "representingname" => PR_SENT_REPRESENTING_NAME,
+            "sentrepresentingemail" => PR_SENT_REPRESENTING_EMAIL_ADDRESS,
+            "sentrepresentingaddt" => PR_SENT_REPRESENTING_ADDRTYPE,
+            "sentrepresentinsrchk" => PR_SENT_REPRESENTING_SEARCH_KEY,
+            "reminderset" => "PT_BOOLEAN:PSETID_Common:0x8503",
+            "remindertime" => "PT_LONG:PSETID_Common:0x8501",
+            "meetingstatus" => "PT_LONG:PSETID_Appointment:0x8217",
+            "isrecurring" => "PT_BOOLEAN:PSETID_Appointment:0x8223",
+            "recurringstate" => "PT_BINARY:PSETID_Appointment:0x8216",
+            "timezonetag" => "PT_BINARY:PSETID_Appointment:0x8233",
+            "timezonedesc" => "PT_STRING8:PSETID_Appointment:0x8234",
+            "recurrenceend" => "PT_SYSTIME:PSETID_Appointment:0x8236",
+            "responsestatus" => "PT_LONG:PSETID_Appointment:0x8218",
+            "commonstart" => "PT_SYSTIME:PSETID_Common:0x8516",
+            "commonend" => "PT_SYSTIME:PSETID_Common:0x8517",
+            "reminderstart" => "PT_SYSTIME:PSETID_Common:0x8502",
+            "duration" => "PT_LONG:PSETID_Appointment:0x8213",
+            "private" => "PT_BOOLEAN:PSETID_Common:0x8506",
+            "uid" => "PT_BINARY:PSETID_Meeting:0x23",
+            "sideeffects" => "PT_LONG:PSETID_Common:0x8510",
+            "flagdueby" => "PT_SYSTIME:PSETID_Common:0x8560",
+            "icon" => PR_ICON_INDEX,
+            "mrwassent" => "PT_BOOLEAN:PSETID_Appointment:0x8229",
+            "endtime" => "PT_SYSTIME:PSETID_Appointment:0x820e", // this is here for calendar restriction, tnef and ical
+            "starttime" => "PT_SYSTIME:PSETID_Appointment:0x820d", // this is here for calendar restriction, tnef and ical
+            "clipstart" => "PT_SYSTIME:PSETID_Appointment:0x8235", // ical only
+            "recurrencetype" => "PT_LONG:PSETID_Appointment:0x8231",
+            "body" => PR_BODY,
+            "rtfcompressed" => PR_RTF_COMPRESSED,
+            "html" => PR_HTML,
+            "rtfinsync" => PR_RTF_IN_SYNC,
+        ];
+    }
 
-	/**
-	 * Returns the MAPI to AS mapping for tasks.
-	 *
-	 * @return array
-	 */
-	public static function GetTaskMapping() {
-		return [
-			"body" => PR_BODY,
-			"categories" => "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords",
-			"complete" => "PT_BOOLEAN:PSETID_Task:0x811C",
-			"datecompleted" => "PT_SYSTIME:PSETID_Task:0x810F",
-			"duedate" => "PT_SYSTIME:PSETID_Task:0x8105",
-			"utcduedate" => "PT_SYSTIME:PSETID_Common:0x8517",
-			"utcstartdate" => "PT_SYSTIME:PSETID_Common:0x8516",
-			"importance" => PR_IMPORTANCE,
-			// recurrence
-			// regenerate
-			// deadoccur
-			"reminderset" => "PT_BOOLEAN:PSETID_Common:0x8503",
-			"remindertime" => "PT_SYSTIME:PSETID_Common:0x8502",
-			"sensitivity" => PR_SENSITIVITY,
-			"startdate" => "PT_SYSTIME:PSETID_Task:0x8104",
-			"subject" => PR_SUBJECT,
-			"rtf" => PR_RTF_COMPRESSED,
-			"html" => PR_HTML,
-		];
-	}
+    /**
+     * Returns the MAPI to AS mapping for tasks.
+     *
+     * @return array
+     */
+    public static function GetTaskMapping() {
+        return [
+            "body" => PR_BODY,
+            "categories" => "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords",
+            "complete" => "PT_BOOLEAN:PSETID_Task:0x811C",
+            "datecompleted" => "PT_SYSTIME:PSETID_Task:0x810F",
+            "duedate" => "PT_SYSTIME:PSETID_Task:0x8105",
+            "utcduedate" => "PT_SYSTIME:PSETID_Common:0x8517",
+            "utcstartdate" => "PT_SYSTIME:PSETID_Common:0x8516",
+            "importance" => PR_IMPORTANCE,
+            // recurrence
+            // regenerate
+            // deadoccur
+            "reminderset" => "PT_BOOLEAN:PSETID_Common:0x8503",
+            "remindertime" => "PT_SYSTIME:PSETID_Common:0x8502",
+            "sensitivity" => PR_SENSITIVITY,
+            "startdate" => "PT_SYSTIME:PSETID_Task:0x8104",
+            "subject" => PR_SUBJECT,
+            "rtf" => PR_RTF_COMPRESSED,
+            "html" => PR_HTML,
+        ];
+    }
 
-	/**
-	 * Returns task specific MAPI properties.
-	 *
-	 * @return array
-	 */
-	public static function GetTaskProperties() {
-		return [
-			"isrecurringtag" => "PT_BOOLEAN:PSETID_Task:0x8126",
-			"recurringstate" => "PT_BINARY:PSETID_Task:0x8116",
-			"deadoccur" => "PT_BOOLEAN:PSETID_Task:0x8109",
-			"completion" => "PT_DOUBLE:PSETID_Task:0x8102",
-			"status" => "PT_LONG:PSETID_Task:0x8101",
-			"icon" => PR_ICON_INDEX,
-			"owner" => "PT_STRING8:PSETID_Task:0x811F",
-			"private" => "PT_BOOLEAN:PSETID_Common:0x8506",
-		];
-	}
+    /**
+     * Returns task specific MAPI properties.
+     *
+     * @return array
+     */
+    public static function GetTaskProperties() {
+        return [
+            "isrecurringtag" => "PT_BOOLEAN:PSETID_Task:0x8126",
+            "recurringstate" => "PT_BINARY:PSETID_Task:0x8116",
+            "deadoccur" => "PT_BOOLEAN:PSETID_Task:0x8109",
+            "completion" => "PT_DOUBLE:PSETID_Task:0x8102",
+            "status" => "PT_LONG:PSETID_Task:0x8101",
+            "icon" => PR_ICON_INDEX,
+            "owner" => "PT_STRING8:PSETID_Task:0x811F",
+            "private" => "PT_BOOLEAN:PSETID_Common:0x8506",
+        ];
+    }
 
-	/**
-	 * Returns the MAPI to AS mapping for email todo flags.
-	 *
-	 * @return array
-	 */
-	public static function GetMailFlagsMapping() {
-		return [
-			"flagstatus" => PR_FLAG_STATUS,
-			"flagtype" => "PT_STRING8:PSETID_Common:0x8530",
-			"datecompleted" => "PT_SYSTIME:PSETID_Common:0x810F",
-			"completetime" => PR_FLAG_COMPLETE_TIME,
-			"startdate" => "PT_SYSTIME:PSETID_Task:0x8104",
-			"duedate" => "PT_SYSTIME:PSETID_Task:0x8105",
-			"utcstartdate" => "PT_SYSTIME:PSETID_Common:0x8516",
-			"utcduedate" => "PT_SYSTIME:PSETID_Common:0x8517",
-			"reminderset" => "PT_BOOLEAN:PSETID_Common:0x8503",
-			"remindertime" => "PT_SYSTIME:PSETID_Common:0x8502",
-			"ordinaldate" => "PT_SYSTIME:PSETID_Common:0x85A0",
-			"subordinaldate" => "PT_STRING8:PSETID_Common:0x85A1",
-		];
-	}
+    /**
+     * Returns the MAPI to AS mapping for email todo flags.
+     *
+     * @return array
+     */
+    public static function GetMailFlagsMapping() {
+        return [
+            "flagstatus" => PR_FLAG_STATUS,
+            "flagtype" => "PT_STRING8:PSETID_Common:0x8530",
+            "datecompleted" => "PT_SYSTIME:PSETID_Common:0x810F",
+            "completetime" => PR_FLAG_COMPLETE_TIME,
+            "startdate" => "PT_SYSTIME:PSETID_Task:0x8104",
+            "duedate" => "PT_SYSTIME:PSETID_Task:0x8105",
+            "utcstartdate" => "PT_SYSTIME:PSETID_Common:0x8516",
+            "utcduedate" => "PT_SYSTIME:PSETID_Common:0x8517",
+            "reminderset" => "PT_BOOLEAN:PSETID_Common:0x8503",
+            "remindertime" => "PT_SYSTIME:PSETID_Common:0x8502",
+            "ordinaldate" => "PT_SYSTIME:PSETID_Common:0x85A0",
+            "subordinaldate" => "PT_STRING8:PSETID_Common:0x85A1",
+        ];
+    }
 
-	/**
-	 * Returns email todo flags' specific MAPI properties.
-	 *
-	 * @return array
-	 */
-	public static function GetMailFlagsProperties() {
-		return [
-			"todoitemsflags" => PR_TODO_ITEM_FLAGS,
-			"todotitle" => "PT_STRING8:PSETID_Common:0x85A4",
-			"flagicon" => PR_FLAG_ICON,
-			"replyrequested" => PR_REPLY_REQUESTED,
-			"responserequested" => PR_RESPONSE_REQUESTED,
-			"status" => "PT_LONG:PSETID_Task:0x8101",
-			"completion" => "PT_DOUBLE:PSETID_Task:0x8102",
-			"complete" => "PT_BOOLEAN:PSETID_Task:0x811C",
-		];
-	}
+    /**
+     * Returns email todo flags' specific MAPI properties.
+     *
+     * @return array
+     */
+    public static function GetMailFlagsProperties() {
+        return [
+            "todoitemsflags" => PR_TODO_ITEM_FLAGS,
+            "todotitle" => "PT_STRING8:PSETID_Common:0x85A4",
+            "flagicon" => PR_FLAG_ICON,
+            "replyrequested" => PR_REPLY_REQUESTED,
+            "responserequested" => PR_RESPONSE_REQUESTED,
+            "status" => "PT_LONG:PSETID_Task:0x8101",
+            "completion" => "PT_DOUBLE:PSETID_Task:0x8102",
+            "complete" => "PT_BOOLEAN:PSETID_Task:0x811C",
+        ];
+    }
 
-	/**
-	 * Returns the MAPI to AS mapping for notes.
-	 *
-	 * @return array
-	 */
-	public static function GetNoteMapping() {
-		return [
-			"categories" => "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords",
-			"lastmodified" => PR_LAST_MODIFICATION_TIME,
-			"messageclass" => PR_MESSAGE_CLASS,
-			"subject" => PR_SUBJECT,
-			"Color" => "PT_LONG:PSETID_Note:0x8B00",
-			"Iconindex" => PR_ICON_INDEX,
-		];
-	}
+    /**
+     * Returns the MAPI to AS mapping for notes.
+     *
+     * @return array
+     */
+    public static function GetNoteMapping() {
+        return [
+            "categories" => "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords",
+            "lastmodified" => PR_LAST_MODIFICATION_TIME,
+            "messageclass" => PR_MESSAGE_CLASS,
+            "subject" => PR_SUBJECT,
+            "Color" => "PT_LONG:PSETID_Note:0x8B00",
+            "Iconindex" => PR_ICON_INDEX,
+        ];
+    }
 
-	/**
-	 * Returns note specific MAPI properties.
-	 *
-	 * @return array
-	 */
-	public static function GetNoteProperties() {
-		return [
-			"body" => PR_BODY,
-			"messageclass" => PR_MESSAGE_CLASS,
-			"html" => PR_HTML,
-			"internetcpid" => PR_INTERNET_CPID,
-		];
-	}
+    /**
+     * Returns note specific MAPI properties.
+     *
+     * @return array
+     */
+    public static function GetNoteProperties() {
+        return [
+            "body" => PR_BODY,
+            "messageclass" => PR_MESSAGE_CLASS,
+            "html" => PR_HTML,
+            "internetcpid" => PR_INTERNET_CPID,
+        ];
+    }
 
-	/**
-	 * Returns properties for sending an email.
-	 *
-	 * @return array
-	 */
-	public static function GetSendMailProperties() {
-		return [
-			"outboxentryid" => PR_IPM_OUTBOX_ENTRYID,
-			"ipmsentmailentryid" => PR_IPM_SENTMAIL_ENTRYID,
-			"sentmailentryid" => PR_SENTMAIL_ENTRYID,
-			"subject" => PR_SUBJECT,
-			"messageclass" => PR_MESSAGE_CLASS,
-			"deliverytime" => PR_MESSAGE_DELIVERY_TIME,
-			"importance" => PR_IMPORTANCE,
-			"priority" => PR_PRIORITY,
-			"addrtype" => PR_ADDRTYPE,
-			"emailaddress" => PR_EMAIL_ADDRESS,
-			"displayname" => PR_DISPLAY_NAME,
-			"recipienttype" => PR_RECIPIENT_TYPE,
-			"entryid" => PR_ENTRYID,
-			"iconindex" => PR_ICON_INDEX,
-			"body" => PR_BODY,
-			"html" => PR_HTML,
-			"sentrepresentingname" => PR_SENT_REPRESENTING_NAME,
-			"sentrepresentingemail" => PR_SENT_REPRESENTING_EMAIL_ADDRESS,
-			"representingentryid" => PR_SENT_REPRESENTING_ENTRYID,
-			"sentrepresentingaddt" => PR_SENT_REPRESENTING_ADDRTYPE,
-			"sentrepresentinsrchk" => PR_SENT_REPRESENTING_SEARCH_KEY,
-			"displayto" => PR_DISPLAY_TO,
-			"displaycc" => PR_DISPLAY_CC,
-			"clientsubmittime" => PR_CLIENT_SUBMIT_TIME,
-			"attachnum" => PR_ATTACH_NUM,
-			"attachdatabin" => PR_ATTACH_DATA_BIN,
-			"internetcpid" => PR_INTERNET_CPID,
-			"rtf" => PR_RTF_COMPRESSED,
-			"rtfinsync" => PR_RTF_IN_SYNC,
-		];
-	}
+    /**
+     * Returns properties for sending an email.
+     *
+     * @return array
+     */
+    public static function GetSendMailProperties() {
+        return [
+            "outboxentryid" => PR_IPM_OUTBOX_ENTRYID,
+            "ipmsentmailentryid" => PR_IPM_SENTMAIL_ENTRYID,
+            "sentmailentryid" => PR_SENTMAIL_ENTRYID,
+            "subject" => PR_SUBJECT,
+            "messageclass" => PR_MESSAGE_CLASS,
+            "deliverytime" => PR_MESSAGE_DELIVERY_TIME,
+            "importance" => PR_IMPORTANCE,
+            "priority" => PR_PRIORITY,
+            "addrtype" => PR_ADDRTYPE,
+            "emailaddress" => PR_EMAIL_ADDRESS,
+            "displayname" => PR_DISPLAY_NAME,
+            "recipienttype" => PR_RECIPIENT_TYPE,
+            "entryid" => PR_ENTRYID,
+            "iconindex" => PR_ICON_INDEX,
+            "body" => PR_BODY,
+            "html" => PR_HTML,
+            "sentrepresentingname" => PR_SENT_REPRESENTING_NAME,
+            "sentrepresentingemail" => PR_SENT_REPRESENTING_EMAIL_ADDRESS,
+            "representingentryid" => PR_SENT_REPRESENTING_ENTRYID,
+            "sentrepresentingaddt" => PR_SENT_REPRESENTING_ADDRTYPE,
+            "sentrepresentinsrchk" => PR_SENT_REPRESENTING_SEARCH_KEY,
+            "displayto" => PR_DISPLAY_TO,
+            "displaycc" => PR_DISPLAY_CC,
+            "clientsubmittime" => PR_CLIENT_SUBMIT_TIME,
+            "attachnum" => PR_ATTACH_NUM,
+            "attachdatabin" => PR_ATTACH_DATA_BIN,
+            "internetcpid" => PR_INTERNET_CPID,
+            "rtf" => PR_RTF_COMPRESSED,
+            "rtfinsync" => PR_RTF_IN_SYNC,
+        ];
+    }
 }

lib/grommunio/listfolders.php

Indentation +173 added lines, -173 removed lines

@@ -14,208 +14,208 @@
 define('SSLCERT_PASS', null);
 
 $supported_classes = [
-	"IPF.Note" => "SYNC_FOLDER_TYPE_USER_MAIL",
-	"IPF.Task" => "SYNC_FOLDER_TYPE_USER_TASK",
-	"IPF.Appointment" => "SYNC_FOLDER_TYPE_USER_APPOINTMENT",
-	"IPF.Contact" => "SYNC_FOLDER_TYPE_USER_CONTACT",
-	"IPF.StickyNote" => "SYNC_FOLDER_TYPE_USER_NOTE",
+    "IPF.Note" => "SYNC_FOLDER_TYPE_USER_MAIL",
+    "IPF.Task" => "SYNC_FOLDER_TYPE_USER_TASK",
+    "IPF.Appointment" => "SYNC_FOLDER_TYPE_USER_APPOINTMENT",
+    "IPF.Contact" => "SYNC_FOLDER_TYPE_USER_CONTACT",
+    "IPF.StickyNote" => "SYNC_FOLDER_TYPE_USER_NOTE",
 ];
 
 main();
 
 function main() {
-	listfolders_configure();
-	listfolders_handle();
+    listfolders_configure();
+    listfolders_handle();
 }
 
 function listfolders_configure() {
-	if (php_sapi_name() != "cli") {
-		fwrite(STDERR, "This script can only be called from the CLI.\n");
+    if (php_sapi_name() != "cli") {
+        fwrite(STDERR, "This script can only be called from the CLI.\n");
 
-		exit(1);
-	}
+        exit(1);
+    }
 
-	if (!function_exists("getopt")) {
-		echo "PHP Function 'getopt()' not found. Please check your PHP version and settings.\n";
+    if (!function_exists("getopt")) {
+        echo "PHP Function 'getopt()' not found. Please check your PHP version and settings.\n";
 
-		exit(1);
-	}
+        exit(1);
+    }
 
-	require 'mapi/mapi.util.php';
-	require 'mapi/mapidefs.php';
-	require 'mapi/mapicode.php';
-	require 'mapi/mapitags.php';
-	require 'mapi/mapiguid.php';
+    require 'mapi/mapi.util.php';
+    require 'mapi/mapidefs.php';
+    require 'mapi/mapicode.php';
+    require 'mapi/mapitags.php';
+    require 'mapi/mapiguid.php';
 }
 
 function listfolders_handle() {
-	$shortoptions = "l:h:u:p:c:";
-	$options = getopt($shortoptions);
-
-	$mapi = MAPI_SERVER;
-	$sslcert_file = SSLCERT_FILE;
-	$sslcert_pass = SSLCERT_PASS;
-	$user = "SYSTEM";
-	$pass = "";
-
-	if (isset($options['h'])) {
-		$mapi = $options['h'];
-	}
-
-	// accept a remote user
-	if (isset($options['u'], $options['p'])) {
-		$user = $options['u'];
-		$pass = $options['p'];
-	}
-	// accept a certificate and passwort for login
-	elseif (isset($options['c'], $options['p'])) {
-		$sslcert_file = $options['c'];
-		$sslcert_pass = $options['p'];
-	}
-
-	$zarafaAdmin = listfolders_zarafa_admin_setup($mapi, $user, $pass, $sslcert_file, $sslcert_pass);
-	if (isset($zarafaAdmin['adminStore'], $options['l'])) {
-		listfolders_getlist($zarafaAdmin['adminStore'], $zarafaAdmin['session'], trim($options['l']));
-	}
-	else {
-		echo "Usage:\n" .
-				"listfolders.php [actions] [options]\n\n" .
-				"Actions: [-l username]\n" .
-					"\t-l username\tlist folders of user, for public folder use 'SYSTEM'\n\n" .
-				"Global options: [-h path] [[-u remoteuser] [-p password]] [[-c certificate_path] [-p password]]\n" .
-					"\t-h path\t\tconnect through <path>, e.g. file:///var/run/socket or https://10.0.0.1:237/grommunio\n" .
-					"\t-u remoteuser\tlogin as authenticated administration user\n" .
-					"\t-c certificate\tlogin with a ssl certificate located in this location, e.g. /etc/zarafa/ssl/client.pem\n" .
-					"\t-p password\tpassword of the remoteuser or certificate\n\n";
-	}
+    $shortoptions = "l:h:u:p:c:";
+    $options = getopt($shortoptions);
+
+    $mapi = MAPI_SERVER;
+    $sslcert_file = SSLCERT_FILE;
+    $sslcert_pass = SSLCERT_PASS;
+    $user = "SYSTEM";
+    $pass = "";
+
+    if (isset($options['h'])) {
+        $mapi = $options['h'];
+    }
+
+    // accept a remote user
+    if (isset($options['u'], $options['p'])) {
+        $user = $options['u'];
+        $pass = $options['p'];
+    }
+    // accept a certificate and passwort for login
+    elseif (isset($options['c'], $options['p'])) {
+        $sslcert_file = $options['c'];
+        $sslcert_pass = $options['p'];
+    }
+
+    $zarafaAdmin = listfolders_zarafa_admin_setup($mapi, $user, $pass, $sslcert_file, $sslcert_pass);
+    if (isset($zarafaAdmin['adminStore'], $options['l'])) {
+        listfolders_getlist($zarafaAdmin['adminStore'], $zarafaAdmin['session'], trim($options['l']));
+    }
+    else {
+        echo "Usage:\n" .
+                "listfolders.php [actions] [options]\n\n" .
+                "Actions: [-l username]\n" .
+                    "\t-l username\tlist folders of user, for public folder use 'SYSTEM'\n\n" .
+                "Global options: [-h path] [[-u remoteuser] [-p password]] [[-c certificate_path] [-p password]]\n" .
+                    "\t-h path\t\tconnect through <path>, e.g. file:///var/run/socket or https://10.0.0.1:237/grommunio\n" .
+                    "\t-u remoteuser\tlogin as authenticated administration user\n" .
+                    "\t-c certificate\tlogin with a ssl certificate located in this location, e.g. /etc/zarafa/ssl/client.pem\n" .
+                    "\t-p password\tpassword of the remoteuser or certificate\n\n";
+    }
 }
 
 function listfolders_zarafa_admin_setup($mapi, $user, $pass, $sslcert_file, $sslcert_pass) {
-	$session = @mapi_logon_zarafa($user, $pass, $mapi, $sslcert_file, $sslcert_pass, 0, 'script', 'script');
+    $session = @mapi_logon_zarafa($user, $pass, $mapi, $sslcert_file, $sslcert_pass, 0, 'script', 'script');
 
-	if (!$session) {
-		printf("User '%s' could not login. The script will exit. Errorcode: 0x%08x\n", $user, mapi_last_hresult());
+    if (!$session) {
+        printf("User '%s' could not login. The script will exit. Errorcode: 0x%08x\n", $user, mapi_last_hresult());
 
-		exit(1);
-	}
+        exit(1);
+    }
 
-	$adminStore = null;
-	$stores = @mapi_getmsgstorestable($session);
-	$storeslist = @mapi_table_queryallrows($stores, [PR_ENTRYID, PR_DEFAULT_STORE, PR_MDB_PROVIDER]);
-	foreach ($storeslist as $store) {
-		if (isset($store[PR_DEFAULT_STORE]) && $store[PR_DEFAULT_STORE] == true) {
-			$adminStore = @mapi_openmsgstore($session, $store[PR_ENTRYID]);
+    $adminStore = null;
+    $stores = @mapi_getmsgstorestable($session);
+    $storeslist = @mapi_table_queryallrows($stores, [PR_ENTRYID, PR_DEFAULT_STORE, PR_MDB_PROVIDER]);
+    foreach ($storeslist as $store) {
+        if (isset($store[PR_DEFAULT_STORE]) && $store[PR_DEFAULT_STORE] == true) {
+            $adminStore = @mapi_openmsgstore($session, $store[PR_ENTRYID]);
 
-			break;
-		}
-	}
-	$zarafauserinfo['admin'] = 1;
-	$admin = (isset($zarafauserinfo['admin']) && $zarafauserinfo['admin']) ? true : false;
+            break;
+        }
+    }
+    $zarafauserinfo['admin'] = 1;
+    $admin = (isset($zarafauserinfo['admin']) && $zarafauserinfo['admin']) ? true : false;
 
-	if (!$stores || !$storeslist || !$adminStore || !$admin) {
-		echo "There was error trying to log in as admin or retrieving admin info. The script will exit.\n";
+    if (!$stores || !$storeslist || !$adminStore || !$admin) {
+        echo "There was error trying to log in as admin or retrieving admin info. The script will exit.\n";
 
-		exit(1);
-	}
+        exit(1);
+    }
 
-	return ["session" => $session, "adminStore" => $adminStore];
+    return ["session" => $session, "adminStore" => $adminStore];
 }
 
 function listfolders_getlist($adminStore, $session, $user) {
-	global $supported_classes;
-
-	if (strtoupper($user) == 'SYSTEM') {
-		// Find the public store store
-		$storestables = @mapi_getmsgstorestable($session);
-		$result = @mapi_last_hresult();
-
-		if ($result == NOERROR) {
-			$rows = @mapi_table_queryallrows($storestables, [PR_ENTRYID, PR_MDB_PROVIDER]);
-
-			foreach ($rows as $row) {
-				if (isset($row[PR_MDB_PROVIDER]) && $row[PR_MDB_PROVIDER] == ZARAFA_STORE_PUBLIC_GUID) {
-					if (!isset($row[PR_ENTRYID])) {
-						echo "Public folder are not available.\nIf this is a multi-tenancy system, use -u and -p and login with an admin user of the company.\nThe script will exit.\n";
-
-						exit(1);
-					}
-					$entryid = $row[PR_ENTRYID];
-
-					break;
-				}
-			}
-		}
-	}
-	else {
-		$entryid = @mapi_msgstore_createentryid($adminStore, $user);
-	}
-
-	$userStore = @mapi_openmsgstore($session, $entryid);
-	$hresult = mapi_last_hresult();
-
-	// Cache the store for later use
-	if ($hresult != NOERROR) {
-		echo "Could not open store for '{$user}'. The script will exit.\n";
-
-		exit(1);
-	}
-
-	if (strtoupper($user) != 'SYSTEM') {
-		$inbox = mapi_msgstore_getreceivefolder($userStore);
-		if (mapi_last_hresult() != NOERROR) {
-			printf("Could not open inbox for %s (0x%08X). The script will exit.\n", $user, mapi_last_hresult());
-
-			exit(1);
-		}
-		$inboxProps = mapi_getprops($inbox, [PR_SOURCE_KEY]);
-	}
-
-	$storeProps = mapi_getprops($userStore, [PR_IPM_OUTBOX_ENTRYID, PR_IPM_SENTMAIL_ENTRYID, PR_IPM_WASTEBASKET_ENTRYID]);
-	$root = @mapi_msgstore_openentry($userStore, null);
-	$h_table = @mapi_folder_gethierarchytable($root, CONVENIENT_DEPTH);
-	$subfolders = @mapi_table_queryallrows($h_table, [PR_ENTRYID, PR_DISPLAY_NAME, PR_CONTAINER_CLASS, PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY, PR_FOLDER_TYPE, PR_ATTR_HIDDEN]);
-
-	echo "Available folders in store '{$user}':\n" . str_repeat("-", 50) . "\n";
-	foreach ($subfolders as $folder) {
-		// do not display hidden and search folders
-		if ((isset($folder[PR_ATTR_HIDDEN]) && $folder[PR_ATTR_HIDDEN]) ||
-			(isset($folder[PR_FOLDER_TYPE]) && $folder[PR_FOLDER_TYPE] == FOLDER_SEARCH)) {
-			continue;
-		}
-
-		// handle some special folders
-		if ((strtoupper($user) != 'SYSTEM') &&
-			((isset($inboxProps[PR_SOURCE_KEY]) && $folder[PR_SOURCE_KEY] == $inboxProps[PR_SOURCE_KEY]) ||
-			$folder[PR_ENTRYID] == $storeProps[PR_IPM_SENTMAIL_ENTRYID] ||
-			$folder[PR_ENTRYID] == $storeProps[PR_IPM_WASTEBASKET_ENTRYID])) {
-			$folder[PR_CONTAINER_CLASS] = "IPF.Note";
-		}
-
-		if (isset($folder[PR_CONTAINER_CLASS]) && array_key_exists($folder[PR_CONTAINER_CLASS], $supported_classes)) {
-			echo "Folder name:\t" . $folder[PR_DISPLAY_NAME] . "\n";
-			echo "Folder ID:\t" . bin2hex($folder[PR_SOURCE_KEY]) . "\n";
-			echo "Type:\t\t" . $supported_classes[$folder[PR_CONTAINER_CLASS]] . "\n";
-			echo "\n";
-		}
-	}
+    global $supported_classes;
+
+    if (strtoupper($user) == 'SYSTEM') {
+        // Find the public store store
+        $storestables = @mapi_getmsgstorestable($session);
+        $result = @mapi_last_hresult();
+
+        if ($result == NOERROR) {
+            $rows = @mapi_table_queryallrows($storestables, [PR_ENTRYID, PR_MDB_PROVIDER]);
+
+            foreach ($rows as $row) {
+                if (isset($row[PR_MDB_PROVIDER]) && $row[PR_MDB_PROVIDER] == ZARAFA_STORE_PUBLIC_GUID) {
+                    if (!isset($row[PR_ENTRYID])) {
+                        echo "Public folder are not available.\nIf this is a multi-tenancy system, use -u and -p and login with an admin user of the company.\nThe script will exit.\n";
+
+                        exit(1);
+                    }
+                    $entryid = $row[PR_ENTRYID];
+
+                    break;
+                }
+            }
+        }
+    }
+    else {
+        $entryid = @mapi_msgstore_createentryid($adminStore, $user);
+    }
+
+    $userStore = @mapi_openmsgstore($session, $entryid);
+    $hresult = mapi_last_hresult();
+
+    // Cache the store for later use
+    if ($hresult != NOERROR) {
+        echo "Could not open store for '{$user}'. The script will exit.\n";
+
+        exit(1);
+    }
+
+    if (strtoupper($user) != 'SYSTEM') {
+        $inbox = mapi_msgstore_getreceivefolder($userStore);
+        if (mapi_last_hresult() != NOERROR) {
+            printf("Could not open inbox for %s (0x%08X). The script will exit.\n", $user, mapi_last_hresult());
+
+            exit(1);
+        }
+        $inboxProps = mapi_getprops($inbox, [PR_SOURCE_KEY]);
+    }
+
+    $storeProps = mapi_getprops($userStore, [PR_IPM_OUTBOX_ENTRYID, PR_IPM_SENTMAIL_ENTRYID, PR_IPM_WASTEBASKET_ENTRYID]);
+    $root = @mapi_msgstore_openentry($userStore, null);
+    $h_table = @mapi_folder_gethierarchytable($root, CONVENIENT_DEPTH);
+    $subfolders = @mapi_table_queryallrows($h_table, [PR_ENTRYID, PR_DISPLAY_NAME, PR_CONTAINER_CLASS, PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY, PR_FOLDER_TYPE, PR_ATTR_HIDDEN]);
+
+    echo "Available folders in store '{$user}':\n" . str_repeat("-", 50) . "\n";
+    foreach ($subfolders as $folder) {
+        // do not display hidden and search folders
+        if ((isset($folder[PR_ATTR_HIDDEN]) && $folder[PR_ATTR_HIDDEN]) ||
+            (isset($folder[PR_FOLDER_TYPE]) && $folder[PR_FOLDER_TYPE] == FOLDER_SEARCH)) {
+            continue;
+        }
+
+        // handle some special folders
+        if ((strtoupper($user) != 'SYSTEM') &&
+            ((isset($inboxProps[PR_SOURCE_KEY]) && $folder[PR_SOURCE_KEY] == $inboxProps[PR_SOURCE_KEY]) ||
+            $folder[PR_ENTRYID] == $storeProps[PR_IPM_SENTMAIL_ENTRYID] ||
+            $folder[PR_ENTRYID] == $storeProps[PR_IPM_WASTEBASKET_ENTRYID])) {
+            $folder[PR_CONTAINER_CLASS] = "IPF.Note";
+        }
+
+        if (isset($folder[PR_CONTAINER_CLASS]) && array_key_exists($folder[PR_CONTAINER_CLASS], $supported_classes)) {
+            echo "Folder name:\t" . $folder[PR_DISPLAY_NAME] . "\n";
+            echo "Folder ID:\t" . bin2hex($folder[PR_SOURCE_KEY]) . "\n";
+            echo "Type:\t\t" . $supported_classes[$folder[PR_CONTAINER_CLASS]] . "\n";
+            echo "\n";
+        }
+    }
 }
 
 function CheckMapiExtVersion($version = "") {
-	// compare build number if requested
-	if (preg_match('/^\d+$/', $version) && strlen($version) > 3) {
-		$vs = preg_split('/-/', phpversion("mapi"));
-
-		return $version <= $vs[1];
-	}
-
-	if (extension_loaded("mapi")) {
-		if (version_compare(phpversion("mapi"), $version) == -1) {
-			return false;
-		}
-	}
-	else {
-		return false;
-	}
-
-	return true;
+    // compare build number if requested
+    if (preg_match('/^\d+$/', $version) && strlen($version) > 3) {
+        $vs = preg_split('/-/', phpversion("mapi"));
+
+        return $version <= $vs[1];
+    }
+
+    if (extension_loaded("mapi")) {
+        if (version_compare(phpversion("mapi"), $version) == -1) {
+            return false;
+        }
+    }
+    else {
+        return false;
+    }
+
+    return true;
 }

Spacing +12 added lines, -12 removed lines

@@ -78,14 +78,14 @@ 
 		listfolders_getlist($zarafaAdmin['adminStore'], $zarafaAdmin['session'], trim($options['l']));
 	}
 	else {
-		echo "Usage:\n" .
-				"listfolders.php [actions] [options]\n\n" .
-				"Actions: [-l username]\n" .
-					"\t-l username\tlist folders of user, for public folder use 'SYSTEM'\n\n" .
-				"Global options: [-h path] [[-u remoteuser] [-p password]] [[-c certificate_path] [-p password]]\n" .
-					"\t-h path\t\tconnect through <path>, e.g. file:///var/run/socket or https://10.0.0.1:237/grommunio\n" .
-					"\t-u remoteuser\tlogin as authenticated administration user\n" .
-					"\t-c certificate\tlogin with a ssl certificate located in this location, e.g. /etc/zarafa/ssl/client.pem\n" .
+		echo "Usage:\n".
+				"listfolders.php [actions] [options]\n\n".
+				"Actions: [-l username]\n".
+					"\t-l username\tlist folders of user, for public folder use 'SYSTEM'\n\n".
+				"Global options: [-h path] [[-u remoteuser] [-p password]] [[-c certificate_path] [-p password]]\n".
+					"\t-h path\t\tconnect through <path>, e.g. file:///var/run/socket or https://10.0.0.1:237/grommunio\n".
+					"\t-u remoteuser\tlogin as authenticated administration user\n".
+					"\t-c certificate\tlogin with a ssl certificate located in this location, e.g. /etc/zarafa/ssl/client.pem\n".
 					"\t-p password\tpassword of the remoteuser or certificate\n\n";
 	}
 }
@@ -175,7 +175,7 @@ 
 	$h_table = @mapi_folder_gethierarchytable($root, CONVENIENT_DEPTH);
 	$subfolders = @mapi_table_queryallrows($h_table, [PR_ENTRYID, PR_DISPLAY_NAME, PR_CONTAINER_CLASS, PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY, PR_FOLDER_TYPE, PR_ATTR_HIDDEN]);
 
-	echo "Available folders in store '{$user}':\n" . str_repeat("-", 50) . "\n";
+	echo "Available folders in store '{$user}':\n".str_repeat("-", 50)."\n";
 	foreach ($subfolders as $folder) {
 		// do not display hidden and search folders
 		if ((isset($folder[PR_ATTR_HIDDEN]) && $folder[PR_ATTR_HIDDEN]) ||
@@ -192,9 +192,9 @@ 
 		}
 
 		if (isset($folder[PR_CONTAINER_CLASS]) && array_key_exists($folder[PR_CONTAINER_CLASS], $supported_classes)) {
-			echo "Folder name:\t" . $folder[PR_DISPLAY_NAME] . "\n";
-			echo "Folder ID:\t" . bin2hex($folder[PR_SOURCE_KEY]) . "\n";
-			echo "Type:\t\t" . $supported_classes[$folder[PR_CONTAINER_CLASS]] . "\n";
+			echo "Folder name:\t".$folder[PR_DISPLAY_NAME]."\n";
+			echo "Folder ID:\t".bin2hex($folder[PR_SOURCE_KEY])."\n";
+			echo "Type:\t\t".$supported_classes[$folder[PR_CONTAINER_CLASS]]."\n";
 			echo "\n";
 		}
 	}

Braces +3 added lines, -6 removed lines

@@ -76,8 +76,7 @@ 
 	$zarafaAdmin = listfolders_zarafa_admin_setup($mapi, $user, $pass, $sslcert_file, $sslcert_pass);
 	if (isset($zarafaAdmin['adminStore'], $options['l'])) {
 		listfolders_getlist($zarafaAdmin['adminStore'], $zarafaAdmin['session'], trim($options['l']));
-	}
-	else {
+	} else {
 		echo "Usage:\n" .
 				"listfolders.php [actions] [options]\n\n" .
 				"Actions: [-l username]\n" .
@@ -145,8 +144,7 @@ 
 				}
 			}
 		}
-	}
-	else {
+	} else {
 		$entryid = @mapi_msgstore_createentryid($adminStore, $user);
 	}
 
@@ -212,8 +210,7 @@ 
 		if (version_compare(phpversion("mapi"), $version) == -1) {
 			return false;
 		}
-	}
-	else {
+	} else {
 		return false;
 	}
 

lib/grommunio/mapiphpwrapper.php

Indentation +216 added lines, -216 removed lines

@@ -17,220 +17,220 @@
  * convert the data into WBXML which is streamed to the PDA.
  */
 class PHPWrapper {
-	private $importer;
-	private $mapiprovider;
-	private $store;
-	private $contentparameters;
-	private $folderid;
-	private $prefix;
-
-	/**
-	 * Constructor of the PHPWrapper.
-	 *
-	 * @param resource       $session
-	 * @param resource       $store
-	 * @param IImportChanges $importer incoming changes from ICS are forwarded here
-	 * @param string         $folderid the folder this wrapper was configured for
-	 *
-	 * @return
-	 */
-	public function __construct($session, $store, $importer, $folderid) {
-		$this->importer = &$importer;
-		$this->store = $store;
-		$this->mapiprovider = new MAPIProvider($session, $this->store);
-		$this->folderid = $folderid;
-		$this->prefix = '';
-
-		if ($folderid) {
-			$folderidHex = bin2hex($folderid);
-			$folderid = GSync::GetDeviceManager()->GetFolderIdForBackendId($folderidHex);
-			if ($folderid != $folderidHex) {
-				$this->prefix = $folderid . ':';
-			}
-		}
-	}
-
-	/**
-	 * Configures additional parameters used for content synchronization.
-	 *
-	 * @param ContentParameters $contentparameters
-	 *
-	 * @throws StatusException
-	 *
-	 * @return bool
-	 */
-	public function ConfigContentParameters($contentparameters) {
-		$this->contentparameters = $contentparameters;
-
-		return true;
-	}
-
-	/**
-	 * Implement MAPI interface.
-	 *
-	 * @param mixed $stream
-	 * @param mixed $flags
-	 */
-	public function Config($stream, $flags = 0) {
-	}
-
-	public function GetLastError($hresult, $ulflags, &$lpmapierror) {
-	}
-
-	public function UpdateState($stream) {
-	}
-
-	/**
-	 * Imports a single message.
-	 *
-	 * @param array  $props
-	 * @param long   $flags
-	 * @param object $retmapimessage
-	 *
-	 * @return long
-	 */
-	public function ImportMessageChange($props, $flags, $retmapimessage) {
-		$sourcekey = $props[PR_SOURCE_KEY];
-		$parentsourcekey = $props[PR_PARENT_SOURCE_KEY];
-		$entryid = mapi_msgstore_entryidfromsourcekey($this->store, $parentsourcekey, $sourcekey);
-
-		if (!$entryid) {
-			return SYNC_E_IGNORE;
-		}
-
-		$mapimessage = mapi_msgstore_openentry($this->store, $entryid);
-
-		try {
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageChange(): Getting message from MAPIProvider, sourcekey: '%s', parentsourcekey: '%s', entryid: '%s'", bin2hex($sourcekey), bin2hex($parentsourcekey), bin2hex($entryid)));
-
-			$message = $this->mapiprovider->GetMessage($mapimessage, $this->contentparameters);
-
-			// strip or do not send private messages from shared folders to the device
-			if (MAPIUtils::IsMessageSharedAndPrivate($this->folderid, $mapimessage)) {
-				if ($message->SupportsPrivateStripping()) {
-					SLog::Write(LOGLEVEL_DEBUG, "PHPWrapper->ImportMessageChange(): stripping data of private message from a shared folder");
-					$message->StripData(Streamer::STRIP_PRIVATE_DATA);
-				}
-				else {
-					SLog::Write(LOGLEVEL_DEBUG, "PHPWrapper->ImportMessageChange(): ignoring private message from a shared folder");
-
-					return SYNC_E_IGNORE;
-				}
-			}
-		}
-		catch (SyncObjectBrokenException $mbe) {
-			$brokenSO = $mbe->GetSyncObject();
-			if (!$brokenSO) {
-				SLog::Write(LOGLEVEL_ERROR, sprintf("PHPWrapper->ImportMessageChange(): Caught SyncObjectBrokenException but broken SyncObject available"));
-			}
-			else {
-				if (!isset($brokenSO->id)) {
-					$brokenSO->id = "Unknown ID";
-					SLog::Write(LOGLEVEL_ERROR, sprintf("PHPWrapper->ImportMessageChange(): Caught SyncObjectBrokenException but no ID of object set"));
-				}
-				GSync::GetDeviceManager()->AnnounceIgnoredMessage(false, $brokenSO->id, $brokenSO);
-			}
-			// tell MAPI to ignore the message
-			return SYNC_E_IGNORE;
-		}
-
-		// substitute the MAPI SYNC_NEW_MESSAGE flag by a grommunio-sync proprietary flag
-		if ($flags == SYNC_NEW_MESSAGE) {
-			$message->flags = SYNC_NEWMESSAGE;
-		}
-		else {
-			$message->flags = $flags;
-		}
-
-		$this->importer->ImportMessageChange($this->prefix . bin2hex($sourcekey), $message);
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageChange(): change for: '%s'", $this->prefix . bin2hex($sourcekey)));
-
-		// Tell MAPI it doesn't need to do anything itself, as we've done all the work already.
-		return SYNC_E_IGNORE;
-	}
-
-	/**
-	 * Imports a list of messages to be deleted.
-	 *
-	 * @param long  $flags
-	 * @param array $sourcekeys array with sourcekeys
-	 *
-	 * @return
-	 */
-	public function ImportMessageDeletion($flags, $sourcekeys) {
-		$amount = count($sourcekeys);
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageDeletion(): Received %d remove requests from ICS", $amount));
-
-		foreach ($sourcekeys as $sourcekey) {
-			// TODO if we would know that ICS is removing the message because it's outside the sync interval, we could send a $asSoftDelete = true to the importer. Could they pass that via $flags?
-			$this->importer->ImportMessageDeletion($this->prefix . bin2hex($sourcekey));
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageDeletion(): delete for :'%s'", $this->prefix . bin2hex($sourcekey)));
-		}
-	}
-
-	/**
-	 * Imports a list of messages to be deleted.
-	 *
-	 * @param mixed $readstates sourcekeys and message flags
-	 *
-	 * @return
-	 */
-	public function ImportPerUserReadStateChange($readstates) {
-		foreach ($readstates as $readstate) {
-			$this->importer->ImportMessageReadFlag($this->prefix . bin2hex($readstate["sourcekey"]), $readstate["flags"] & MSGFLAG_READ);
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportPerUserReadStateChange(): read for :'%s'", $this->prefix . bin2hex($readstate["sourcekey"])));
-		}
-	}
-
-	/**
-	 * Imports a message move
-	 * this is never called by ICS.
-	 *
-	 * @param mixed $sourcekeysrcfolder
-	 * @param mixed $sourcekeysrcmessage
-	 * @param mixed $message
-	 * @param mixed $sourcekeydestmessage
-	 * @param mixed $changenumdestmessage
-	 *
-	 * @return
-	 */
-	public function ImportMessageMove($sourcekeysrcfolder, $sourcekeysrcmessage, $message, $sourcekeydestmessage, $changenumdestmessage) {
-		// Never called
-	}
-
-	/**
-	 * Imports a single folder change.
-	 *
-	 * @param array $props properties of the changed folder
-	 *
-	 * @return
-	 */
-	public function ImportFolderChange($props) {
-		$folder = $this->mapiprovider->GetFolder($props);
-
-		// do not import folder if there is something "wrong" with it
-		if ($folder === false) {
-			return 0;
-		}
-
-		$this->importer->ImportFolderChange($folder);
-
-		return 0;
-	}
-
-	/**
-	 * Imports a list of folders which are to be deleted.
-	 *
-	 * @param long  $flags
-	 * @param mixed $sourcekeys array with sourcekeys
-	 *
-	 * @return
-	 */
-	public function ImportFolderDeletion($flags, $sourcekeys) {
-		foreach ($sourcekeys as $sourcekey) {
-			$this->importer->ImportFolderDeletion(SyncFolder::GetObject(GSync::GetDeviceManager()->GetFolderIdForBackendId(bin2hex($sourcekey))));
-		}
-
-		return 0;
-	}
+    private $importer;
+    private $mapiprovider;
+    private $store;
+    private $contentparameters;
+    private $folderid;
+    private $prefix;
+
+    /**
+     * Constructor of the PHPWrapper.
+     *
+     * @param resource       $session
+     * @param resource       $store
+     * @param IImportChanges $importer incoming changes from ICS are forwarded here
+     * @param string         $folderid the folder this wrapper was configured for
+     *
+     * @return
+     */
+    public function __construct($session, $store, $importer, $folderid) {
+        $this->importer = &$importer;
+        $this->store = $store;
+        $this->mapiprovider = new MAPIProvider($session, $this->store);
+        $this->folderid = $folderid;
+        $this->prefix = '';
+
+        if ($folderid) {
+            $folderidHex = bin2hex($folderid);
+            $folderid = GSync::GetDeviceManager()->GetFolderIdForBackendId($folderidHex);
+            if ($folderid != $folderidHex) {
+                $this->prefix = $folderid . ':';
+            }
+        }
+    }
+
+    /**
+     * Configures additional parameters used for content synchronization.
+     *
+     * @param ContentParameters $contentparameters
+     *
+     * @throws StatusException
+     *
+     * @return bool
+     */
+    public function ConfigContentParameters($contentparameters) {
+        $this->contentparameters = $contentparameters;
+
+        return true;
+    }
+
+    /**
+     * Implement MAPI interface.
+     *
+     * @param mixed $stream
+     * @param mixed $flags
+     */
+    public function Config($stream, $flags = 0) {
+    }
+
+    public function GetLastError($hresult, $ulflags, &$lpmapierror) {
+    }
+
+    public function UpdateState($stream) {
+    }
+
+    /**
+     * Imports a single message.
+     *
+     * @param array  $props
+     * @param long   $flags
+     * @param object $retmapimessage
+     *
+     * @return long
+     */
+    public function ImportMessageChange($props, $flags, $retmapimessage) {
+        $sourcekey = $props[PR_SOURCE_KEY];
+        $parentsourcekey = $props[PR_PARENT_SOURCE_KEY];
+        $entryid = mapi_msgstore_entryidfromsourcekey($this->store, $parentsourcekey, $sourcekey);
+
+        if (!$entryid) {
+            return SYNC_E_IGNORE;
+        }
+
+        $mapimessage = mapi_msgstore_openentry($this->store, $entryid);
+
+        try {
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageChange(): Getting message from MAPIProvider, sourcekey: '%s', parentsourcekey: '%s', entryid: '%s'", bin2hex($sourcekey), bin2hex($parentsourcekey), bin2hex($entryid)));
+
+            $message = $this->mapiprovider->GetMessage($mapimessage, $this->contentparameters);
+
+            // strip or do not send private messages from shared folders to the device
+            if (MAPIUtils::IsMessageSharedAndPrivate($this->folderid, $mapimessage)) {
+                if ($message->SupportsPrivateStripping()) {
+                    SLog::Write(LOGLEVEL_DEBUG, "PHPWrapper->ImportMessageChange(): stripping data of private message from a shared folder");
+                    $message->StripData(Streamer::STRIP_PRIVATE_DATA);
+                }
+                else {
+                    SLog::Write(LOGLEVEL_DEBUG, "PHPWrapper->ImportMessageChange(): ignoring private message from a shared folder");
+
+                    return SYNC_E_IGNORE;
+                }
+            }
+        }
+        catch (SyncObjectBrokenException $mbe) {
+            $brokenSO = $mbe->GetSyncObject();
+            if (!$brokenSO) {
+                SLog::Write(LOGLEVEL_ERROR, sprintf("PHPWrapper->ImportMessageChange(): Caught SyncObjectBrokenException but broken SyncObject available"));
+            }
+            else {
+                if (!isset($brokenSO->id)) {
+                    $brokenSO->id = "Unknown ID";
+                    SLog::Write(LOGLEVEL_ERROR, sprintf("PHPWrapper->ImportMessageChange(): Caught SyncObjectBrokenException but no ID of object set"));
+                }
+                GSync::GetDeviceManager()->AnnounceIgnoredMessage(false, $brokenSO->id, $brokenSO);
+            }
+            // tell MAPI to ignore the message
+            return SYNC_E_IGNORE;
+        }
+
+        // substitute the MAPI SYNC_NEW_MESSAGE flag by a grommunio-sync proprietary flag
+        if ($flags == SYNC_NEW_MESSAGE) {
+            $message->flags = SYNC_NEWMESSAGE;
+        }
+        else {
+            $message->flags = $flags;
+        }
+
+        $this->importer->ImportMessageChange($this->prefix . bin2hex($sourcekey), $message);
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageChange(): change for: '%s'", $this->prefix . bin2hex($sourcekey)));
+
+        // Tell MAPI it doesn't need to do anything itself, as we've done all the work already.
+        return SYNC_E_IGNORE;
+    }
+
+    /**
+     * Imports a list of messages to be deleted.
+     *
+     * @param long  $flags
+     * @param array $sourcekeys array with sourcekeys
+     *
+     * @return
+     */
+    public function ImportMessageDeletion($flags, $sourcekeys) {
+        $amount = count($sourcekeys);
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageDeletion(): Received %d remove requests from ICS", $amount));
+
+        foreach ($sourcekeys as $sourcekey) {
+            // TODO if we would know that ICS is removing the message because it's outside the sync interval, we could send a $asSoftDelete = true to the importer. Could they pass that via $flags?
+            $this->importer->ImportMessageDeletion($this->prefix . bin2hex($sourcekey));
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageDeletion(): delete for :'%s'", $this->prefix . bin2hex($sourcekey)));
+        }
+    }
+
+    /**
+     * Imports a list of messages to be deleted.
+     *
+     * @param mixed $readstates sourcekeys and message flags
+     *
+     * @return
+     */
+    public function ImportPerUserReadStateChange($readstates) {
+        foreach ($readstates as $readstate) {
+            $this->importer->ImportMessageReadFlag($this->prefix . bin2hex($readstate["sourcekey"]), $readstate["flags"] & MSGFLAG_READ);
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportPerUserReadStateChange(): read for :'%s'", $this->prefix . bin2hex($readstate["sourcekey"])));
+        }
+    }
+
+    /**
+     * Imports a message move
+     * this is never called by ICS.
+     *
+     * @param mixed $sourcekeysrcfolder
+     * @param mixed $sourcekeysrcmessage
+     * @param mixed $message
+     * @param mixed $sourcekeydestmessage
+     * @param mixed $changenumdestmessage
+     *
+     * @return
+     */
+    public function ImportMessageMove($sourcekeysrcfolder, $sourcekeysrcmessage, $message, $sourcekeydestmessage, $changenumdestmessage) {
+        // Never called
+    }
+
+    /**
+     * Imports a single folder change.
+     *
+     * @param array $props properties of the changed folder
+     *
+     * @return
+     */
+    public function ImportFolderChange($props) {
+        $folder = $this->mapiprovider->GetFolder($props);
+
+        // do not import folder if there is something "wrong" with it
+        if ($folder === false) {
+            return 0;
+        }
+
+        $this->importer->ImportFolderChange($folder);
+
+        return 0;
+    }
+
+    /**
+     * Imports a list of folders which are to be deleted.
+     *
+     * @param long  $flags
+     * @param mixed $sourcekeys array with sourcekeys
+     *
+     * @return
+     */
+    public function ImportFolderDeletion($flags, $sourcekeys) {
+        foreach ($sourcekeys as $sourcekey) {
+            $this->importer->ImportFolderDeletion(SyncFolder::GetObject(GSync::GetDeviceManager()->GetFolderIdForBackendId(bin2hex($sourcekey))));
+        }
+
+        return 0;
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -45,7 +45,7 @@ 
 			$folderidHex = bin2hex($folderid);
 			$folderid = GSync::GetDeviceManager()->GetFolderIdForBackendId($folderidHex);
 			if ($folderid != $folderidHex) {
-				$this->prefix = $folderid . ':';
+				$this->prefix = $folderid.':';
 			}
 		}
 	}
@@ -142,8 +142,8 @@ 
 			$message->flags = $flags;
 		}
 
-		$this->importer->ImportMessageChange($this->prefix . bin2hex($sourcekey), $message);
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageChange(): change for: '%s'", $this->prefix . bin2hex($sourcekey)));
+		$this->importer->ImportMessageChange($this->prefix.bin2hex($sourcekey), $message);
+		SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageChange(): change for: '%s'", $this->prefix.bin2hex($sourcekey)));
 
 		// Tell MAPI it doesn't need to do anything itself, as we've done all the work already.
 		return SYNC_E_IGNORE;
@@ -163,8 +163,8 @@ 
 
 		foreach ($sourcekeys as $sourcekey) {
 			// TODO if we would know that ICS is removing the message because it's outside the sync interval, we could send a $asSoftDelete = true to the importer. Could they pass that via $flags?
-			$this->importer->ImportMessageDeletion($this->prefix . bin2hex($sourcekey));
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageDeletion(): delete for :'%s'", $this->prefix . bin2hex($sourcekey)));
+			$this->importer->ImportMessageDeletion($this->prefix.bin2hex($sourcekey));
+			SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageDeletion(): delete for :'%s'", $this->prefix.bin2hex($sourcekey)));
 		}
 	}
 
@@ -177,8 +177,8 @@ 
 	 */
 	public function ImportPerUserReadStateChange($readstates) {
 		foreach ($readstates as $readstate) {
-			$this->importer->ImportMessageReadFlag($this->prefix . bin2hex($readstate["sourcekey"]), $readstate["flags"] & MSGFLAG_READ);
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportPerUserReadStateChange(): read for :'%s'", $this->prefix . bin2hex($readstate["sourcekey"])));
+			$this->importer->ImportMessageReadFlag($this->prefix.bin2hex($readstate["sourcekey"]), $readstate["flags"] & MSGFLAG_READ);
+			SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportPerUserReadStateChange(): read for :'%s'", $this->prefix.bin2hex($readstate["sourcekey"])));
 		}
 	}
 

Braces +4 added lines, -8 removed lines

@@ -110,20 +110,17 @@ 
 				if ($message->SupportsPrivateStripping()) {
 					SLog::Write(LOGLEVEL_DEBUG, "PHPWrapper->ImportMessageChange(): stripping data of private message from a shared folder");
 					$message->StripData(Streamer::STRIP_PRIVATE_DATA);
-				}
-				else {
+				} else {
 					SLog::Write(LOGLEVEL_DEBUG, "PHPWrapper->ImportMessageChange(): ignoring private message from a shared folder");
 
 					return SYNC_E_IGNORE;
 				}
 			}
-		}
-		catch (SyncObjectBrokenException $mbe) {
+		} catch (SyncObjectBrokenException $mbe) {
 			$brokenSO = $mbe->GetSyncObject();
 			if (!$brokenSO) {
 				SLog::Write(LOGLEVEL_ERROR, sprintf("PHPWrapper->ImportMessageChange(): Caught SyncObjectBrokenException but broken SyncObject available"));
-			}
-			else {
+			} else {
 				if (!isset($brokenSO->id)) {
 					$brokenSO->id = "Unknown ID";
 					SLog::Write(LOGLEVEL_ERROR, sprintf("PHPWrapper->ImportMessageChange(): Caught SyncObjectBrokenException but no ID of object set"));
@@ -137,8 +134,7 @@ 
 		// substitute the MAPI SYNC_NEW_MESSAGE flag by a grommunio-sync proprietary flag
 		if ($flags == SYNC_NEW_MESSAGE) {
 			$message->flags = SYNC_NEWMESSAGE;
-		}
-		else {
+		} else {
 			$message->flags = $flags;
 		}