grommunio / grommunio-sync

lib/syncobjects/synccontact.php

Indentation +341 added lines, -341 removed lines

@@ -10,352 +10,352 @@
  */
 
 class SyncContact extends SyncObject {
-	public $anniversary;
-	public $assistantname;
-	public $assistnamephonenumber;
-	public $birthday;
-	public $body;
-	public $bodysize;
-	public $bodytruncated;
-	public $business2phonenumber;
-	public $businesscity;
-	public $businesscountry;
-	public $businesspostalcode;
-	public $businessstate;
-	public $businessstreet;
-	public $businessfaxnumber;
-	public $businessphonenumber;
-	public $carphonenumber;
-	public $children;
-	public $companyname;
-	public $department;
-	public $email1address;
-	public $email2address;
-	public $email3address;
-	public $fileas;
-	public $firstname;
-	public $home2phonenumber;
-	public $homecity;
-	public $homecountry;
-	public $homepostalcode;
-	public $homestate;
-	public $homestreet;
-	public $homefaxnumber;
-	public $homephonenumber;
-	public $jobtitle;
-	public $lastname;
-	public $middlename;
-	public $mobilephonenumber;
-	public $officelocation;
-	public $othercity;
-	public $othercountry;
-	public $otherpostalcode;
-	public $otherstate;
-	public $otherstreet;
-	public $pagernumber;
-	public $radiophonenumber;
-	public $spouse;
-	public $suffix;
-	public $title;
-	public $webpage;
-	public $yomicompanyname;
-	public $yomifirstname;
-	public $yomilastname;
-	public $rtf;
-	public $picture;
-	public $categories;
+    public $anniversary;
+    public $assistantname;
+    public $assistnamephonenumber;
+    public $birthday;
+    public $body;
+    public $bodysize;
+    public $bodytruncated;
+    public $business2phonenumber;
+    public $businesscity;
+    public $businesscountry;
+    public $businesspostalcode;
+    public $businessstate;
+    public $businessstreet;
+    public $businessfaxnumber;
+    public $businessphonenumber;
+    public $carphonenumber;
+    public $children;
+    public $companyname;
+    public $department;
+    public $email1address;
+    public $email2address;
+    public $email3address;
+    public $fileas;
+    public $firstname;
+    public $home2phonenumber;
+    public $homecity;
+    public $homecountry;
+    public $homepostalcode;
+    public $homestate;
+    public $homestreet;
+    public $homefaxnumber;
+    public $homephonenumber;
+    public $jobtitle;
+    public $lastname;
+    public $middlename;
+    public $mobilephonenumber;
+    public $officelocation;
+    public $othercity;
+    public $othercountry;
+    public $otherpostalcode;
+    public $otherstate;
+    public $otherstreet;
+    public $pagernumber;
+    public $radiophonenumber;
+    public $spouse;
+    public $suffix;
+    public $title;
+    public $webpage;
+    public $yomicompanyname;
+    public $yomifirstname;
+    public $yomilastname;
+    public $rtf;
+    public $picture;
+    public $categories;
 
-	// AS 2.5 props
-	public $customerid;
-	public $governmentid;
-	public $imaddress;
-	public $imaddress2;
-	public $imaddress3;
-	public $managername;
-	public $companymainphone;
-	public $accountname;
-	public $nickname;
-	public $mms;
+    // AS 2.5 props
+    public $customerid;
+    public $governmentid;
+    public $imaddress;
+    public $imaddress2;
+    public $imaddress3;
+    public $managername;
+    public $companymainphone;
+    public $accountname;
+    public $nickname;
+    public $mms;
 
-	// AS 12.0 props
-	public $asbody;
+    // AS 12.0 props
+    public $asbody;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_POOMCONTACTS_ANNIVERSARY => [
-				self::STREAMER_VAR => "anniversary",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_ASSISTANTNAME => [
-				self::STREAMER_VAR => "assistantname",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_ASSISTNAMEPHONENUMBER => [
-				self::STREAMER_VAR => "assistnamephonenumber",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_BIRTHDAY => [
-				self::STREAMER_VAR => "birthday",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_BODY => [
-				self::STREAMER_VAR => "body",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_BODYSIZE => [
-				self::STREAMER_VAR => "bodysize",
-			],
-			SYNC_POOMCONTACTS_BODYTRUNCATED => [
-				self::STREAMER_VAR => "bodytruncated",
-			],
-			SYNC_POOMCONTACTS_BUSINESS2PHONENUMBER => [
-				self::STREAMER_VAR => "business2phonenumber",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_BUSINESSCITY => [
-				self::STREAMER_VAR => "businesscity",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_BUSINESSCOUNTRY => [
-				self::STREAMER_VAR => "businesscountry",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_BUSINESSPOSTALCODE => [
-				self::STREAMER_VAR => "businesspostalcode",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_BUSINESSSTATE => [
-				self::STREAMER_VAR => "businessstate",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_BUSINESSSTREET => [
-				self::STREAMER_VAR => "businessstreet",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_BUSINESSFAXNUMBER => [
-				self::STREAMER_VAR => "businessfaxnumber",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_BUSINESSPHONENUMBER => [
-				self::STREAMER_VAR => "businessphonenumber",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_CARPHONENUMBER => [
-				self::STREAMER_VAR => "carphonenumber",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_CHILDREN => [
-				self::STREAMER_VAR => "children",
-				self::STREAMER_ARRAY => SYNC_POOMCONTACTS_CHILD,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_COMPANYNAME => [
-				self::STREAMER_VAR => "companyname",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_DEPARTMENT => [
-				self::STREAMER_VAR => "department",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_EMAIL1ADDRESS => [
-				self::STREAMER_VAR => "email1address",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_EMAIL2ADDRESS => [
-				self::STREAMER_VAR => "email2address",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_EMAIL3ADDRESS => [
-				self::STREAMER_VAR => "email3address",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_FILEAS => [
-				self::STREAMER_VAR => "fileas",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_FIRSTNAME => [
-				self::STREAMER_VAR => "firstname",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_HOME2PHONENUMBER => [
-				self::STREAMER_VAR => "home2phonenumber",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_HOMECITY => [
-				self::STREAMER_VAR => "homecity",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_HOMECOUNTRY => [
-				self::STREAMER_VAR => "homecountry",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_HOMEPOSTALCODE => [
-				self::STREAMER_VAR => "homepostalcode",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_HOMESTATE => [
-				self::STREAMER_VAR => "homestate",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_HOMESTREET => [
-				self::STREAMER_VAR => "homestreet",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_HOMEFAXNUMBER => [
-				self::STREAMER_VAR => "homefaxnumber",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_HOMEPHONENUMBER => [
-				self::STREAMER_VAR => "homephonenumber",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_JOBTITLE => [
-				self::STREAMER_VAR => "jobtitle",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_LASTNAME => [
-				self::STREAMER_VAR => "lastname",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_MIDDLENAME => [
-				self::STREAMER_VAR => "middlename",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_MOBILEPHONENUMBER => [
-				self::STREAMER_VAR => "mobilephonenumber",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_OFFICELOCATION => [
-				self::STREAMER_VAR => "officelocation",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_OTHERCITY => [
-				self::STREAMER_VAR => "othercity",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_OTHERCOUNTRY => [
-				self::STREAMER_VAR => "othercountry",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_OTHERPOSTALCODE => [
-				self::STREAMER_VAR => "otherpostalcode",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_OTHERSTATE => [
-				self::STREAMER_VAR => "otherstate",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_OTHERSTREET => [
-				self::STREAMER_VAR => "otherstreet",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_PAGERNUMBER => [
-				self::STREAMER_VAR => "pagernumber",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_RADIOPHONENUMBER => [
-				self::STREAMER_VAR => "radiophonenumber",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_SPOUSE => [
-				self::STREAMER_VAR => "spouse",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_SUFFIX => [
-				self::STREAMER_VAR => "suffix",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_TITLE => [
-				self::STREAMER_VAR => "title",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_WEBPAGE => [
-				self::STREAMER_VAR => "webpage",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_YOMICOMPANYNAME => [
-				self::STREAMER_VAR => "yomicompanyname",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_YOMIFIRSTNAME => [
-				self::STREAMER_VAR => "yomifirstname",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_YOMILASTNAME => [
-				self::STREAMER_VAR => "yomilastname",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_RTF => [
-				self::STREAMER_VAR => "rtf",
-			],
-			SYNC_POOMCONTACTS_PICTURE => [
-				self::STREAMER_VAR => "picture",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => SYNC_CONTACTS_MAXPICTURESIZE],
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCONTACTS_CATEGORIES => [
-				self::STREAMER_VAR => "categories",
-				self::STREAMER_ARRAY => SYNC_POOMCONTACTS_CATEGORY,
-				self::STREAMER_RONOTIFY => true,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_POOMCONTACTS_ANNIVERSARY => [
+                self::STREAMER_VAR => "anniversary",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_ASSISTANTNAME => [
+                self::STREAMER_VAR => "assistantname",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_ASSISTNAMEPHONENUMBER => [
+                self::STREAMER_VAR => "assistnamephonenumber",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_BIRTHDAY => [
+                self::STREAMER_VAR => "birthday",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_BODY => [
+                self::STREAMER_VAR => "body",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_BODYSIZE => [
+                self::STREAMER_VAR => "bodysize",
+            ],
+            SYNC_POOMCONTACTS_BODYTRUNCATED => [
+                self::STREAMER_VAR => "bodytruncated",
+            ],
+            SYNC_POOMCONTACTS_BUSINESS2PHONENUMBER => [
+                self::STREAMER_VAR => "business2phonenumber",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_BUSINESSCITY => [
+                self::STREAMER_VAR => "businesscity",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_BUSINESSCOUNTRY => [
+                self::STREAMER_VAR => "businesscountry",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_BUSINESSPOSTALCODE => [
+                self::STREAMER_VAR => "businesspostalcode",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_BUSINESSSTATE => [
+                self::STREAMER_VAR => "businessstate",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_BUSINESSSTREET => [
+                self::STREAMER_VAR => "businessstreet",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_BUSINESSFAXNUMBER => [
+                self::STREAMER_VAR => "businessfaxnumber",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_BUSINESSPHONENUMBER => [
+                self::STREAMER_VAR => "businessphonenumber",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_CARPHONENUMBER => [
+                self::STREAMER_VAR => "carphonenumber",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_CHILDREN => [
+                self::STREAMER_VAR => "children",
+                self::STREAMER_ARRAY => SYNC_POOMCONTACTS_CHILD,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_COMPANYNAME => [
+                self::STREAMER_VAR => "companyname",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_DEPARTMENT => [
+                self::STREAMER_VAR => "department",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_EMAIL1ADDRESS => [
+                self::STREAMER_VAR => "email1address",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_EMAIL2ADDRESS => [
+                self::STREAMER_VAR => "email2address",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_EMAIL3ADDRESS => [
+                self::STREAMER_VAR => "email3address",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_FILEAS => [
+                self::STREAMER_VAR => "fileas",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_FIRSTNAME => [
+                self::STREAMER_VAR => "firstname",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_HOME2PHONENUMBER => [
+                self::STREAMER_VAR => "home2phonenumber",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_HOMECITY => [
+                self::STREAMER_VAR => "homecity",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_HOMECOUNTRY => [
+                self::STREAMER_VAR => "homecountry",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_HOMEPOSTALCODE => [
+                self::STREAMER_VAR => "homepostalcode",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_HOMESTATE => [
+                self::STREAMER_VAR => "homestate",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_HOMESTREET => [
+                self::STREAMER_VAR => "homestreet",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_HOMEFAXNUMBER => [
+                self::STREAMER_VAR => "homefaxnumber",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_HOMEPHONENUMBER => [
+                self::STREAMER_VAR => "homephonenumber",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_JOBTITLE => [
+                self::STREAMER_VAR => "jobtitle",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_LASTNAME => [
+                self::STREAMER_VAR => "lastname",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_MIDDLENAME => [
+                self::STREAMER_VAR => "middlename",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_MOBILEPHONENUMBER => [
+                self::STREAMER_VAR => "mobilephonenumber",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_OFFICELOCATION => [
+                self::STREAMER_VAR => "officelocation",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_OTHERCITY => [
+                self::STREAMER_VAR => "othercity",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_OTHERCOUNTRY => [
+                self::STREAMER_VAR => "othercountry",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_OTHERPOSTALCODE => [
+                self::STREAMER_VAR => "otherpostalcode",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_OTHERSTATE => [
+                self::STREAMER_VAR => "otherstate",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_OTHERSTREET => [
+                self::STREAMER_VAR => "otherstreet",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_PAGERNUMBER => [
+                self::STREAMER_VAR => "pagernumber",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_RADIOPHONENUMBER => [
+                self::STREAMER_VAR => "radiophonenumber",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_SPOUSE => [
+                self::STREAMER_VAR => "spouse",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_SUFFIX => [
+                self::STREAMER_VAR => "suffix",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_TITLE => [
+                self::STREAMER_VAR => "title",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_WEBPAGE => [
+                self::STREAMER_VAR => "webpage",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_YOMICOMPANYNAME => [
+                self::STREAMER_VAR => "yomicompanyname",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_YOMIFIRSTNAME => [
+                self::STREAMER_VAR => "yomifirstname",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_YOMILASTNAME => [
+                self::STREAMER_VAR => "yomilastname",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_RTF => [
+                self::STREAMER_VAR => "rtf",
+            ],
+            SYNC_POOMCONTACTS_PICTURE => [
+                self::STREAMER_VAR => "picture",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => SYNC_CONTACTS_MAXPICTURESIZE],
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCONTACTS_CATEGORIES => [
+                self::STREAMER_VAR => "categories",
+                self::STREAMER_ARRAY => SYNC_POOMCONTACTS_CATEGORY,
+                self::STREAMER_RONOTIFY => true,
+            ],
+        ];
 
-		if (Request::GetProtocolVersion() >= 2.5) {
-			$mapping[SYNC_POOMCONTACTS2_CUSTOMERID] = [
-				self::STREAMER_VAR => "customerid",
-				self::STREAMER_RONOTIFY => true,
-			];
-			$mapping[SYNC_POOMCONTACTS2_GOVERNMENTID] = [
-				self::STREAMER_VAR => "governmentid",
-				self::STREAMER_RONOTIFY => true,
-			];
-			$mapping[SYNC_POOMCONTACTS2_IMADDRESS] = [
-				self::STREAMER_VAR => "imaddress",
-				self::STREAMER_RONOTIFY => true,
-			];
-			$mapping[SYNC_POOMCONTACTS2_IMADDRESS2] = [
-				self::STREAMER_VAR => "imaddress2",
-				self::STREAMER_RONOTIFY => true,
-			];
-			$mapping[SYNC_POOMCONTACTS2_IMADDRESS3] = [
-				self::STREAMER_VAR => "imaddress3",
-				self::STREAMER_RONOTIFY => true,
-			];
-			$mapping[SYNC_POOMCONTACTS2_MANAGERNAME] = [
-				self::STREAMER_VAR => "managername",
-				self::STREAMER_RONOTIFY => true,
-			];
-			$mapping[SYNC_POOMCONTACTS2_COMPANYMAINPHONE] = [
-				self::STREAMER_VAR => "companymainphone",
-				self::STREAMER_RONOTIFY => true,
-			];
-			$mapping[SYNC_POOMCONTACTS2_ACCOUNTNAME] = [
-				self::STREAMER_VAR => "accountname",
-				self::STREAMER_RONOTIFY => true,
-			];
-			$mapping[SYNC_POOMCONTACTS2_NICKNAME] = [
-				self::STREAMER_VAR => "nickname",
-				self::STREAMER_RONOTIFY => true,
-			];
-			$mapping[SYNC_POOMCONTACTS2_MMS] = [
-				self::STREAMER_VAR => "mms",
-				self::STREAMER_RONOTIFY => true,
-			];
-		}
+        if (Request::GetProtocolVersion() >= 2.5) {
+            $mapping[SYNC_POOMCONTACTS2_CUSTOMERID] = [
+                self::STREAMER_VAR => "customerid",
+                self::STREAMER_RONOTIFY => true,
+            ];
+            $mapping[SYNC_POOMCONTACTS2_GOVERNMENTID] = [
+                self::STREAMER_VAR => "governmentid",
+                self::STREAMER_RONOTIFY => true,
+            ];
+            $mapping[SYNC_POOMCONTACTS2_IMADDRESS] = [
+                self::STREAMER_VAR => "imaddress",
+                self::STREAMER_RONOTIFY => true,
+            ];
+            $mapping[SYNC_POOMCONTACTS2_IMADDRESS2] = [
+                self::STREAMER_VAR => "imaddress2",
+                self::STREAMER_RONOTIFY => true,
+            ];
+            $mapping[SYNC_POOMCONTACTS2_IMADDRESS3] = [
+                self::STREAMER_VAR => "imaddress3",
+                self::STREAMER_RONOTIFY => true,
+            ];
+            $mapping[SYNC_POOMCONTACTS2_MANAGERNAME] = [
+                self::STREAMER_VAR => "managername",
+                self::STREAMER_RONOTIFY => true,
+            ];
+            $mapping[SYNC_POOMCONTACTS2_COMPANYMAINPHONE] = [
+                self::STREAMER_VAR => "companymainphone",
+                self::STREAMER_RONOTIFY => true,
+            ];
+            $mapping[SYNC_POOMCONTACTS2_ACCOUNTNAME] = [
+                self::STREAMER_VAR => "accountname",
+                self::STREAMER_RONOTIFY => true,
+            ];
+            $mapping[SYNC_POOMCONTACTS2_NICKNAME] = [
+                self::STREAMER_VAR => "nickname",
+                self::STREAMER_RONOTIFY => true,
+            ];
+            $mapping[SYNC_POOMCONTACTS2_MMS] = [
+                self::STREAMER_VAR => "mms",
+                self::STREAMER_RONOTIFY => true,
+            ];
+        }
 
-		if (Request::GetProtocolVersion() >= 12.0) {
-			$mapping[SYNC_AIRSYNCBASE_BODY] = [
-				self::STREAMER_VAR => "asbody",
-				self::STREAMER_TYPE => "SyncBaseBody",
-				self::STREAMER_RONOTIFY => true,
-			];
+        if (Request::GetProtocolVersion() >= 12.0) {
+            $mapping[SYNC_AIRSYNCBASE_BODY] = [
+                self::STREAMER_VAR => "asbody",
+                self::STREAMER_TYPE => "SyncBaseBody",
+                self::STREAMER_RONOTIFY => true,
+            ];
 
-			// unset these properties because airsyncbase body and attachments will be used instead
-			unset($mapping[SYNC_POOMCONTACTS_BODY], $mapping[SYNC_POOMCONTACTS_BODYTRUNCATED]);
-		}
+            // unset these properties because airsyncbase body and attachments will be used instead
+            unset($mapping[SYNC_POOMCONTACTS_BODY], $mapping[SYNC_POOMCONTACTS_BODYTRUNCATED]);
+        }
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

lib/syncobjects/syncnote.php

Indentation +97 added lines, -97 removed lines

@@ -10,109 +10,109 @@
  */
 
 class SyncNote extends SyncObject {
-	// Outlook transports note colors as categories
-	private static $colors = [
-		0 => "Blue Category",
-		1 => "Green Category",
-		2 => "Red Category",
-		3 => "Yellow Category",
-		4 => "White Category",
-	];
+    // Outlook transports note colors as categories
+    private static $colors = [
+        0 => "Blue Category",
+        1 => "Green Category",
+        2 => "Red Category",
+        3 => "Yellow Category",
+        4 => "White Category",
+    ];
 
-	// Purple and orange are not supported in PidLidNoteColor
-	private static $unsupportedColors = [
-		"Purple Category",
-		"Orange Category",
-	];
+    // Purple and orange are not supported in PidLidNoteColor
+    private static $unsupportedColors = [
+        "Purple Category",
+        "Orange Category",
+    ];
 
-	public $asbody;
-	public $categories;
-	public $lastmodified;
-	public $messageclass;
-	public $subject;
-	public $Color;
+    public $asbody;
+    public $categories;
+    public $lastmodified;
+    public $messageclass;
+    public $subject;
+    public $Color;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_AIRSYNCBASE_BODY => [
-				self::STREAMER_VAR => "asbody",
-				self::STREAMER_TYPE => "SyncBaseBody",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_NOTES_CATEGORIES => [
-				self::STREAMER_VAR => "categories",
-				self::STREAMER_ARRAY => SYNC_NOTES_CATEGORY,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_NOTES_LASTMODIFIEDDATE => [
-				self::STREAMER_VAR => "lastmodified",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_NOTES_MESSAGECLASS => [
-				self::STREAMER_VAR => "messageclass",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_NOTES_SUBJECT => [
-				self::STREAMER_VAR => "subject",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_NOTES_IGNORE_COLOR => [
-				self::STREAMER_VAR => "Color",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_AIRSYNCBASE_BODY => [
+                self::STREAMER_VAR => "asbody",
+                self::STREAMER_TYPE => "SyncBaseBody",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_NOTES_CATEGORIES => [
+                self::STREAMER_VAR => "categories",
+                self::STREAMER_ARRAY => SYNC_NOTES_CATEGORY,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_NOTES_LASTMODIFIEDDATE => [
+                self::STREAMER_VAR => "lastmodified",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_NOTES_MESSAGECLASS => [
+                self::STREAMER_VAR => "messageclass",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_NOTES_SUBJECT => [
+                self::STREAMER_VAR => "subject",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_NOTES_IGNORE_COLOR => [
+                self::STREAMER_VAR => "Color",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
+            ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 
-	/**
-	 * Sets the color index from a known category.
-	 */
-	public function SetColorFromCategory() {
-		if (!empty($this->categories)) {
-			$result = array_intersect($this->categories, array_values(self::$colors));
-			if (empty($result)) {
-				$result = array_intersect($this->categories, array_values(self::$unsupportedColors));
-				if (!empty($result)) {
-					SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncNote->SetColorFromCategory(): unsupported color '%s', setting to color white", $result[0]));
-					$result = ["White Category"];
-				}
-			}
-			if (!empty($result)) {
-				$this->Color = array_search($result[0], self::$colors);
-			}
-		}
-		// unset or empty category means we have to reset the color to yellow
-		else {
-			$this->Color = 3;
-		}
-	}
+    /**
+     * Sets the color index from a known category.
+     */
+    public function SetColorFromCategory() {
+        if (!empty($this->categories)) {
+            $result = array_intersect($this->categories, array_values(self::$colors));
+            if (empty($result)) {
+                $result = array_intersect($this->categories, array_values(self::$unsupportedColors));
+                if (!empty($result)) {
+                    SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncNote->SetColorFromCategory(): unsupported color '%s', setting to color white", $result[0]));
+                    $result = ["White Category"];
+                }
+            }
+            if (!empty($result)) {
+                $this->Color = array_search($result[0], self::$colors);
+            }
+        }
+        // unset or empty category means we have to reset the color to yellow
+        else {
+            $this->Color = 3;
+        }
+    }
 
-	/**
-	 * Sets the category for a Color if color categories are not yet set.
-	 *
-	 * @return bool
-	 */
-	public function SetCategoryFromColor() {
-		// is a color other than yellow set
-		if (isset($this->Color) && $this->Color != 3 && $this->Color > -1 && $this->Color < 5) {
-			// check existing categories - do not rewrite category if the category is already a supported or unsupported color
-			if (!empty($this->categories)) {
-				$insecUnsupp = array_intersect($this->categories, array_values(self::$unsupportedColors));
-				$insecColors = array_intersect($this->categories, array_values(self::$colors));
-				if (!empty($insecUnsupp) || !empty($insecColors)) {
-					return false;
-				}
-			}
-			if (!isset($this->categories)) {
-				$this->categories = [];
-			}
-			$this->categories[] = self::$colors[$this->Color];
+    /**
+     * Sets the category for a Color if color categories are not yet set.
+     *
+     * @return bool
+     */
+    public function SetCategoryFromColor() {
+        // is a color other than yellow set
+        if (isset($this->Color) && $this->Color != 3 && $this->Color > -1 && $this->Color < 5) {
+            // check existing categories - do not rewrite category if the category is already a supported or unsupported color
+            if (!empty($this->categories)) {
+                $insecUnsupp = array_intersect($this->categories, array_values(self::$unsupportedColors));
+                $insecColors = array_intersect($this->categories, array_values(self::$colors));
+                if (!empty($insecUnsupp) || !empty($insecColors)) {
+                    return false;
+                }
+            }
+            if (!isset($this->categories)) {
+                $this->categories = [];
+            }
+            $this->categories[] = self::$colors[$this->Color];
 
-			return true;
-		}
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

lib/syncobjects/syncuserinformation.php

Indentation +28 added lines, -28 removed lines

@@ -10,36 +10,36 @@
  */
 
 class SyncUserInformation extends SyncObject {
-	public $emailaddresses;
-	public $accounts;
-	public $Status;
+    public $emailaddresses;
+    public $accounts;
+    public $Status;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_SETTINGS_PROP_STATUS => [
-				self::STREAMER_VAR => "Status",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_SETTINGS_PROP_STATUS => [
+                self::STREAMER_VAR => "Status",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
+            ],
+        ];
 
-		// In AS protocol versions 12.0, 12.1 and 14.0 EmailAddresses element is child of Get in UserSettings
-		// Since AS protocol version 14.1 EmailAddresses element is child of Account element of Get in UserSettings
-		if (Request::GetProtocolVersion() >= 12.0) {
-			$mapping[SYNC_SETTINGS_EMAILADDRESSES] = [
-				self::STREAMER_VAR => "emailaddresses",
-				self::STREAMER_ARRAY => SYNC_SETTINGS_SMPTADDRESS,
-			];
-		}
+        // In AS protocol versions 12.0, 12.1 and 14.0 EmailAddresses element is child of Get in UserSettings
+        // Since AS protocol version 14.1 EmailAddresses element is child of Account element of Get in UserSettings
+        if (Request::GetProtocolVersion() >= 12.0) {
+            $mapping[SYNC_SETTINGS_EMAILADDRESSES] = [
+                self::STREAMER_VAR => "emailaddresses",
+                self::STREAMER_ARRAY => SYNC_SETTINGS_SMPTADDRESS,
+            ];
+        }
 
-		if (Request::GetProtocolVersion() >= 14.1) {
-			unset($mapping[SYNC_SETTINGS_EMAILADDRESSES]);
-			$mapping[SYNC_SETTINGS_ACCOUNTS] = [
-				self::STREAMER_VAR => "accounts",
-				self::STREAMER_TYPE => "SyncAccount",
-				self::STREAMER_ARRAY => SYNC_SETTINGS_ACCOUNT,
-			];
-		}
+        if (Request::GetProtocolVersion() >= 14.1) {
+            unset($mapping[SYNC_SETTINGS_EMAILADDRESSES]);
+            $mapping[SYNC_SETTINGS_ACCOUNTS] = [
+                self::STREAMER_VAR => "accounts",
+                self::STREAMER_TYPE => "SyncAccount",
+                self::STREAMER_ARRAY => SYNC_SETTINGS_ACCOUNT,
+            ];
+        }
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

lib/syncobjects/synctask.php

Indentation +163 added lines, -163 removed lines

@@ -10,180 +10,180 @@
  */
 
 class SyncTask extends SyncObject {
-	public $body;
-	public $complete;
-	public $datecompleted;
-	public $duedate;
-	public $utcduedate;
-	public $importance;
-	public $recurrence;
-	public $regenerate;
-	public $deadoccur;
-	public $reminderset;
-	public $remindertime;
-	public $sensitivity;
-	public $startdate;
-	public $utcstartdate;
-	public $subject;
-	public $rtf;
-	public $categories;
+    public $body;
+    public $complete;
+    public $datecompleted;
+    public $duedate;
+    public $utcduedate;
+    public $importance;
+    public $recurrence;
+    public $regenerate;
+    public $deadoccur;
+    public $reminderset;
+    public $remindertime;
+    public $sensitivity;
+    public $startdate;
+    public $utcstartdate;
+    public $subject;
+    public $rtf;
+    public $categories;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_POOMTASKS_BODY => [
-				self::STREAMER_VAR => "body",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_COMPLETE => [
-				self::STREAMER_VAR => "complete",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
-					self::STREAMER_CHECK_ZEROORONE => self::STREAMER_CHECK_SETZERO,
-				],
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_DATECOMPLETED => [
-				self::STREAMER_VAR => "datecompleted",
-				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_UTCDUEDATE => [
-				self::STREAMER_VAR => "utcduedate",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_RONOTIFY => true,
-			],
-			// Importance values
-			// 0 = Low
-			// 1 = Normal
-			// 2 = High
-			// even the default value 1 is optional, the native android client 2.2 interprets a non-existing value as 0 (low)
-			SYNC_POOMTASKS_IMPORTANCE => [self::STREAMER_VAR => "importance",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETONE,
-					self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2],
-				],
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_RECURRENCE => [
-				self::STREAMER_VAR => "recurrence",
-				self::STREAMER_TYPE => "SyncTaskRecurrence",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_REGENERATE => [
-				self::STREAMER_VAR => "regenerate",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_DEADOCCUR => [
-				self::STREAMER_VAR => "deadoccur",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_REMINDERSET => [
-				self::STREAMER_VAR => "reminderset",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
-					self::STREAMER_CHECK_ZEROORONE => self::STREAMER_CHECK_SETZERO,
-				],
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_REMINDERTIME => [
-				self::STREAMER_VAR => "remindertime",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_RONOTIFY => true,
-			],
-			// Sensitivity values
-			// 0 = Normal
-			// 1 = Personal
-			// 2 = Private
-			// 3 = Confident
-			SYNC_POOMTASKS_SENSITIVITY => [
-				self::STREAMER_VAR => "sensitivity",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3]],
-				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_UTCSTARTDATE => [
-				self::STREAMER_VAR => "utcstartdate",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_SUBJECT => [
-				self::STREAMER_VAR => "subject",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMTASKS_RTF => [self::STREAMER_VAR => "rtf"],
-			SYNC_POOMTASKS_CATEGORIES => [
-				self::STREAMER_VAR => "categories",
-				self::STREAMER_ARRAY => SYNC_POOMTASKS_CATEGORY,
-				self::STREAMER_RONOTIFY => true,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_POOMTASKS_BODY => [
+                self::STREAMER_VAR => "body",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_COMPLETE => [
+                self::STREAMER_VAR => "complete",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
+                    self::STREAMER_CHECK_ZEROORONE => self::STREAMER_CHECK_SETZERO,
+                ],
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_DATECOMPLETED => [
+                self::STREAMER_VAR => "datecompleted",
+                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_UTCDUEDATE => [
+                self::STREAMER_VAR => "utcduedate",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            // Importance values
+            // 0 = Low
+            // 1 = Normal
+            // 2 = High
+            // even the default value 1 is optional, the native android client 2.2 interprets a non-existing value as 0 (low)
+            SYNC_POOMTASKS_IMPORTANCE => [self::STREAMER_VAR => "importance",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETONE,
+                    self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2],
+                ],
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_RECURRENCE => [
+                self::STREAMER_VAR => "recurrence",
+                self::STREAMER_TYPE => "SyncTaskRecurrence",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_REGENERATE => [
+                self::STREAMER_VAR => "regenerate",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_DEADOCCUR => [
+                self::STREAMER_VAR => "deadoccur",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_REMINDERSET => [
+                self::STREAMER_VAR => "reminderset",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
+                    self::STREAMER_CHECK_ZEROORONE => self::STREAMER_CHECK_SETZERO,
+                ],
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_REMINDERTIME => [
+                self::STREAMER_VAR => "remindertime",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            // Sensitivity values
+            // 0 = Normal
+            // 1 = Personal
+            // 2 = Private
+            // 3 = Confident
+            SYNC_POOMTASKS_SENSITIVITY => [
+                self::STREAMER_VAR => "sensitivity",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3]],
+                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_UTCSTARTDATE => [
+                self::STREAMER_VAR => "utcstartdate",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_SUBJECT => [
+                self::STREAMER_VAR => "subject",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMTASKS_RTF => [self::STREAMER_VAR => "rtf"],
+            SYNC_POOMTASKS_CATEGORIES => [
+                self::STREAMER_VAR => "categories",
+                self::STREAMER_ARRAY => SYNC_POOMTASKS_CATEGORY,
+                self::STREAMER_RONOTIFY => true,
+            ],
+        ];
 
-		if (Request::GetProtocolVersion() >= 12.0) {
-			$mapping[SYNC_AIRSYNCBASE_BODY] = [
-				self::STREAMER_VAR => "asbody",
-				self::STREAMER_TYPE => "SyncBaseBody",
-				self::STREAMER_RONOTIFY => true,
-			];
+        if (Request::GetProtocolVersion() >= 12.0) {
+            $mapping[SYNC_AIRSYNCBASE_BODY] = [
+                self::STREAMER_VAR => "asbody",
+                self::STREAMER_TYPE => "SyncBaseBody",
+                self::STREAMER_RONOTIFY => true,
+            ];
 
-			// unset these properties because airsyncbase body and attachments will be used instead
-			unset($mapping[SYNC_POOMTASKS_BODY]);
-		}
+            // unset these properties because airsyncbase body and attachments will be used instead
+            unset($mapping[SYNC_POOMTASKS_BODY]);
+        }
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 
-	/**
-	 * Method checks if the object has the minimum of required parameters
-	 * and fulfills semantic dependencies.
-	 *
-	 * This overloads the general check() with special checks to be executed
-	 *
-	 * @param bool $logAsDebug (opt) default is false, so messages are logged in WARN log level
-	 *
-	 * @return bool
-	 */
-	public function Check($logAsDebug = false) {
-		$ret = parent::Check($logAsDebug);
+    /**
+     * Method checks if the object has the minimum of required parameters
+     * and fulfills semantic dependencies.
+     *
+     * This overloads the general check() with special checks to be executed
+     *
+     * @param bool $logAsDebug (opt) default is false, so messages are logged in WARN log level
+     *
+     * @return bool
+     */
+    public function Check($logAsDebug = false) {
+        $ret = parent::Check($logAsDebug);
 
-		// semantic checks general "turn off switch"
-		if (defined("DO_SEMANTIC_CHECKS") && DO_SEMANTIC_CHECKS === false) {
-			return $ret;
-		}
+        // semantic checks general "turn off switch"
+        if (defined("DO_SEMANTIC_CHECKS") && DO_SEMANTIC_CHECKS === false) {
+            return $ret;
+        }
 
-		if (!$ret) {
-			return false;
-		}
+        if (!$ret) {
+            return false;
+        }
 
-		if (isset($this->startdate, $this->duedate) && $this->duedate < $this->startdate) {
-			SLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter 'startdate' is HIGHER than 'duedate'. Check failed!", get_class($this)));
+        if (isset($this->startdate, $this->duedate) && $this->duedate < $this->startdate) {
+            SLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter 'startdate' is HIGHER than 'duedate'. Check failed!", get_class($this)));
 
-			return false;
-		}
+            return false;
+        }
 
-		if (isset($this->utcstartdate, $this->utcduedate) && $this->utcduedate < $this->utcstartdate) {
-			SLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter 'utcstartdate' is HIGHER than 'utcduedate'. Check failed!", get_class($this)));
+        if (isset($this->utcstartdate, $this->utcduedate) && $this->utcduedate < $this->utcstartdate) {
+            SLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter 'utcstartdate' is HIGHER than 'utcduedate'. Check failed!", get_class($this)));
 
-			return false;
-		}
+            return false;
+        }
 
-		if (isset($this->duedate) && $this->duedate != Utils::getDayStartOfTimestamp($this->duedate)) {
-			$this->duedate = Utils::getDayStartOfTimestamp($this->duedate);
-			SLog::Write(LOGLEVEL_DEBUG, "Set the due time to the start of the day");
-			if (isset($this->startdate) && $this->duedate < $this->startdate) {
-				$this->startdate = Utils::getDayStartOfTimestamp($this->startdate);
-				SLog::Write(LOGLEVEL_DEBUG, "Set the start date to the start of the day");
-			}
-		}
+        if (isset($this->duedate) && $this->duedate != Utils::getDayStartOfTimestamp($this->duedate)) {
+            $this->duedate = Utils::getDayStartOfTimestamp($this->duedate);
+            SLog::Write(LOGLEVEL_DEBUG, "Set the due time to the start of the day");
+            if (isset($this->startdate) && $this->duedate < $this->startdate) {
+                $this->startdate = Utils::getDayStartOfTimestamp($this->startdate);
+                SLog::Write(LOGLEVEL_DEBUG, "Set the start date to the start of the day");
+            }
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

lib/syncobjects/syncoof.php

Indentation +43 added lines, -43 removed lines

@@ -10,49 +10,49 @@
  */
 
 class SyncOOF extends SyncObject {
-	public $oofstate;
-	public $starttime;
-	public $endtime;
-	public $oofmessage = [];
-	public $bodytype;
-	public $Status;
+    public $oofstate;
+    public $starttime;
+    public $endtime;
+    public $oofmessage = [];
+    public $bodytype;
+    public $Status;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_SETTINGS_OOFSTATE => [
-				self::STREAMER_VAR => "oofstate",
-				self::STREAMER_CHECKS => [
-					[self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2]],
-				],
-			],
-			SYNC_SETTINGS_STARTTIME => [
-				self::STREAMER_VAR => "starttime",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-			],
-			SYNC_SETTINGS_ENDTIME => [
-				self::STREAMER_VAR => "endtime",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-			],
-			SYNC_SETTINGS_OOFMESSAGE => [
-				self::STREAMER_VAR => "oofmessage",
-				self::STREAMER_TYPE => "SyncOOFMessage",
-				self::STREAMER_PROP => self::STREAMER_TYPE_NO_CONTAINER,
-				self::STREAMER_ARRAY => SYNC_SETTINGS_OOFMESSAGE,
-			],
-			SYNC_SETTINGS_BODYTYPE => [
-				self::STREAMER_VAR => "bodytype",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_ONEVALUEOF => [
-						SYNC_SETTINGSOOF_BODYTYPE_HTML,
-						ucfirst(strtolower(SYNC_SETTINGSOOF_BODYTYPE_TEXT)),
-					],
-				],
-			],
-			SYNC_SETTINGS_PROP_STATUS => [
-				self::STREAMER_VAR => "Status",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE, ],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_SETTINGS_OOFSTATE => [
+                self::STREAMER_VAR => "oofstate",
+                self::STREAMER_CHECKS => [
+                    [self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2]],
+                ],
+            ],
+            SYNC_SETTINGS_STARTTIME => [
+                self::STREAMER_VAR => "starttime",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+            ],
+            SYNC_SETTINGS_ENDTIME => [
+                self::STREAMER_VAR => "endtime",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+            ],
+            SYNC_SETTINGS_OOFMESSAGE => [
+                self::STREAMER_VAR => "oofmessage",
+                self::STREAMER_TYPE => "SyncOOFMessage",
+                self::STREAMER_PROP => self::STREAMER_TYPE_NO_CONTAINER,
+                self::STREAMER_ARRAY => SYNC_SETTINGS_OOFMESSAGE,
+            ],
+            SYNC_SETTINGS_BODYTYPE => [
+                self::STREAMER_VAR => "bodytype",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_ONEVALUEOF => [
+                        SYNC_SETTINGSOOF_BODYTYPE_HTML,
+                        ucfirst(strtolower(SYNC_SETTINGSOOF_BODYTYPE_TEXT)),
+                    ],
+                ],
+            ],
+            SYNC_SETTINGS_PROP_STATUS => [
+                self::STREAMER_VAR => "Status",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE, ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

lib/syncobjects/syncappointment.php

Indentation +298 added lines, -298 removed lines

@@ -10,326 +10,326 @@
  */
 
 class SyncAppointment extends SyncObject {
-	public $timezone;
-	public $dtstamp;
-	public $starttime;
-	public $subject;
-	public $uid;
-	public $organizername;
-	public $organizeremail;
-	public $location;
-	public $endtime;
-	public $recurrence;
-	public $sensitivity;
-	public $busystatus;
-	public $alldayevent;
-	public $reminder;
-	public $rtf;
-	public $meetingstatus;
-	public $attendees;
-	public $body;
-	public $bodytruncated;
-	public $exceptions;
-	public $deleted;
-	public $exceptionstarttime;
-	public $categories;
+    public $timezone;
+    public $dtstamp;
+    public $starttime;
+    public $subject;
+    public $uid;
+    public $organizername;
+    public $organizeremail;
+    public $location;
+    public $endtime;
+    public $recurrence;
+    public $sensitivity;
+    public $busystatus;
+    public $alldayevent;
+    public $reminder;
+    public $rtf;
+    public $meetingstatus;
+    public $attendees;
+    public $body;
+    public $bodytruncated;
+    public $exceptions;
+    public $deleted;
+    public $exceptionstarttime;
+    public $categories;
 
-	// AS 12.0 props
-	public $asbody;
-	public $nativebodytype;
+    // AS 12.0 props
+    public $asbody;
+    public $nativebodytype;
 
-	// AS 14.0 props
-	public $disallownewtimeprop;
-	public $responsetype;
-	public $responserequested;
+    // AS 14.0 props
+    public $disallownewtimeprop;
+    public $responsetype;
+    public $responserequested;
 
-	// AS 14.1 props
-	public $onlineMeetingConfLink;
-	public $onlineMeetingExternalLink;
+    // AS 14.1 props
+    public $onlineMeetingConfLink;
+    public $onlineMeetingExternalLink;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_POOMCAL_TIMEZONE => [
-				self::STREAMER_VAR => "timezone",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCAL_DTSTAMP => [
-				self::STREAMER_VAR => "dtstamp",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO],
-			],
-			SYNC_POOMCAL_STARTTIME => [
-				self::STREAMER_VAR => "starttime",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPLOWER => SYNC_POOMCAL_ENDTIME],
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCAL_SUBJECT => [
-				self::STREAMER_VAR => "subject",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETEMPTY],
-				self::STREAMER_RONOTIFY => true,
-				self::STREAMER_PRIVATE => self::STRIP_PRIVATE_SUBSTITUTE,
-			],
-			SYNC_POOMCAL_UID => [self::STREAMER_VAR => "uid"],
-			SYNC_POOMCAL_ORGANIZERNAME => [
-				self::STREAMER_VAR => "organizername", // verified below
-				self::STREAMER_PRIVATE => 'Undisclosed Organizer',
-			],
-			SYNC_POOMCAL_ORGANIZEREMAIL => [
-				self::STREAMER_VAR => "organizeremail", // verified below
-				self::STREAMER_PRIVATE => 'undisclosed@localhost',
-			],
-			SYNC_POOMCAL_LOCATION => [
-				self::STREAMER_VAR => "location",
-				self::STREAMER_RONOTIFY => true,
-				self::STREAMER_PRIVATE => true,
-			],
-			SYNC_POOMCAL_ENDTIME => [
-				self::STREAMER_VAR => "endtime",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => SYNC_POOMCAL_STARTTIME],
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCAL_RECURRENCE => [
-				self::STREAMER_VAR => "recurrence",
-				self::STREAMER_TYPE => "SyncRecurrence",
-				self::STREAMER_RONOTIFY => true,
-			],
-			// Sensitivity values
-			// 0 = Normal
-			// 1 = Personal
-			// 2 = Private
-			// 3 = Confident
-			SYNC_POOMCAL_SENSITIVITY => [
-				self::STREAMER_VAR => "sensitivity",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3]],
-				self::STREAMER_RONOTIFY => true,
-				self::STREAMER_VALUEMAP => [0 => "Normal",
-					1 => "Personal",
-					2 => "Private",
-					3 => "Confident",
-				],
-			],
-			// Busystatus values
-			// 0 = Free
-			// 1 = Tentative
-			// 2 = Busy
-			// 3 = Out of office
-			// 4 = Working Elsewhere
-			SYNC_POOMCAL_BUSYSTATUS => [
-				self::STREAMER_VAR => "busystatus",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETTWO,
-					self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3, 4],
-				],
-				self::STREAMER_RONOTIFY => true,
-				// if private is stripped, value will be set to 2 (busy)
-				self::STREAMER_PRIVATE => 2,
-				self::STREAMER_VALUEMAP => [
-					0 => "Free",
-					1 => "Tentative",
-					2 => "Busy",
-					3 => "Out of office",
-					4 => "Working Elsewhere",
-				],
-			],
-			SYNC_POOMCAL_ALLDAYEVENT => [
-				self::STREAMER_VAR => "alldayevent",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ZEROORONE => self::STREAMER_CHECK_SETZERO],
-				self::STREAMER_RONOTIFY => true,
-				self::STREAMER_VALUEMAP => [
-					0 => "No",
-					1 => "Yes",
-				],
-			],
-			SYNC_POOMCAL_REMINDER => [
-				self::STREAMER_VAR => "reminder",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -1],
-				self::STREAMER_RONOTIFY => true,
-				// if private is stripped, value will be unset (no reminder)
-				self::STREAMER_PRIVATE => true,
-			],
-			SYNC_POOMCAL_RTF => [
-				self::STREAMER_VAR => "rtf",
-				self::STREAMER_PRIVATE => true,
-			],
-			// Meetingstatus values
-			//  0 = is not a meeting
-			//  1 = is a meeting
-			//  3 = Meeting received
-			//  5 = Meeting is canceled
-			//  7 = Meeting is canceled and received
-			//  9 = as 1
-			// 11 = as 3
-			// 13 = as 5
-			// 15 = as 7
-			SYNC_POOMCAL_MEETINGSTATUS => [
-				self::STREAMER_VAR => "meetingstatus",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 3, 5, 7, 9, 11, 13, 15]],
-				self::STREAMER_RONOTIFY => true,
-				self::STREAMER_VALUEMAP => [
-					0 => "Not a meeting",
-					1 => "Meeting",
-					3 => "Meeting received",
-					5 => "Meeting canceled",
-					7 => "Meeting canceled and received",
-					9 => "Meeting",
-					11 => "Meeting received",
-					13 => "Meeting canceled",
-					15 => "Meeting canceled and received",
-				],
-			],
-			SYNC_POOMCAL_ATTENDEES => [
-				self::STREAMER_VAR => "attendees",
-				self::STREAMER_TYPE => "SyncAttendee",
-				self::STREAMER_ARRAY => SYNC_POOMCAL_ATTENDEE,
-				self::STREAMER_RONOTIFY => true,
-				self::STREAMER_PRIVATE => true,
-			],
-			SYNC_POOMCAL_BODY => [
-				self::STREAMER_VAR => "body",
-				self::STREAMER_RONOTIFY => true,
-				self::STREAMER_PRIVATE => true,
-			],
-			SYNC_POOMCAL_BODYTRUNCATED => [
-				self::STREAMER_VAR => "bodytruncated",
-				self::STREAMER_PRIVATE => true,
-			],
-			SYNC_POOMCAL_EXCEPTIONS => [
-				self::STREAMER_VAR => "exceptions",
-				self::STREAMER_TYPE => "SyncAppointmentException",
-				self::STREAMER_ARRAY => SYNC_POOMCAL_EXCEPTION,
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMCAL_CATEGORIES => [
-				self::STREAMER_VAR => "categories",
-				self::STREAMER_ARRAY => SYNC_POOMCAL_CATEGORY,
-				self::STREAMER_RONOTIFY => true,
-				self::STREAMER_PRIVATE => true,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_POOMCAL_TIMEZONE => [
+                self::STREAMER_VAR => "timezone",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCAL_DTSTAMP => [
+                self::STREAMER_VAR => "dtstamp",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO],
+            ],
+            SYNC_POOMCAL_STARTTIME => [
+                self::STREAMER_VAR => "starttime",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPLOWER => SYNC_POOMCAL_ENDTIME],
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCAL_SUBJECT => [
+                self::STREAMER_VAR => "subject",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETEMPTY],
+                self::STREAMER_RONOTIFY => true,
+                self::STREAMER_PRIVATE => self::STRIP_PRIVATE_SUBSTITUTE,
+            ],
+            SYNC_POOMCAL_UID => [self::STREAMER_VAR => "uid"],
+            SYNC_POOMCAL_ORGANIZERNAME => [
+                self::STREAMER_VAR => "organizername", // verified below
+                self::STREAMER_PRIVATE => 'Undisclosed Organizer',
+            ],
+            SYNC_POOMCAL_ORGANIZEREMAIL => [
+                self::STREAMER_VAR => "organizeremail", // verified below
+                self::STREAMER_PRIVATE => 'undisclosed@localhost',
+            ],
+            SYNC_POOMCAL_LOCATION => [
+                self::STREAMER_VAR => "location",
+                self::STREAMER_RONOTIFY => true,
+                self::STREAMER_PRIVATE => true,
+            ],
+            SYNC_POOMCAL_ENDTIME => [
+                self::STREAMER_VAR => "endtime",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => SYNC_POOMCAL_STARTTIME],
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCAL_RECURRENCE => [
+                self::STREAMER_VAR => "recurrence",
+                self::STREAMER_TYPE => "SyncRecurrence",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            // Sensitivity values
+            // 0 = Normal
+            // 1 = Personal
+            // 2 = Private
+            // 3 = Confident
+            SYNC_POOMCAL_SENSITIVITY => [
+                self::STREAMER_VAR => "sensitivity",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3]],
+                self::STREAMER_RONOTIFY => true,
+                self::STREAMER_VALUEMAP => [0 => "Normal",
+                    1 => "Personal",
+                    2 => "Private",
+                    3 => "Confident",
+                ],
+            ],
+            // Busystatus values
+            // 0 = Free
+            // 1 = Tentative
+            // 2 = Busy
+            // 3 = Out of office
+            // 4 = Working Elsewhere
+            SYNC_POOMCAL_BUSYSTATUS => [
+                self::STREAMER_VAR => "busystatus",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETTWO,
+                    self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3, 4],
+                ],
+                self::STREAMER_RONOTIFY => true,
+                // if private is stripped, value will be set to 2 (busy)
+                self::STREAMER_PRIVATE => 2,
+                self::STREAMER_VALUEMAP => [
+                    0 => "Free",
+                    1 => "Tentative",
+                    2 => "Busy",
+                    3 => "Out of office",
+                    4 => "Working Elsewhere",
+                ],
+            ],
+            SYNC_POOMCAL_ALLDAYEVENT => [
+                self::STREAMER_VAR => "alldayevent",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ZEROORONE => self::STREAMER_CHECK_SETZERO],
+                self::STREAMER_RONOTIFY => true,
+                self::STREAMER_VALUEMAP => [
+                    0 => "No",
+                    1 => "Yes",
+                ],
+            ],
+            SYNC_POOMCAL_REMINDER => [
+                self::STREAMER_VAR => "reminder",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -1],
+                self::STREAMER_RONOTIFY => true,
+                // if private is stripped, value will be unset (no reminder)
+                self::STREAMER_PRIVATE => true,
+            ],
+            SYNC_POOMCAL_RTF => [
+                self::STREAMER_VAR => "rtf",
+                self::STREAMER_PRIVATE => true,
+            ],
+            // Meetingstatus values
+            //  0 = is not a meeting
+            //  1 = is a meeting
+            //  3 = Meeting received
+            //  5 = Meeting is canceled
+            //  7 = Meeting is canceled and received
+            //  9 = as 1
+            // 11 = as 3
+            // 13 = as 5
+            // 15 = as 7
+            SYNC_POOMCAL_MEETINGSTATUS => [
+                self::STREAMER_VAR => "meetingstatus",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 3, 5, 7, 9, 11, 13, 15]],
+                self::STREAMER_RONOTIFY => true,
+                self::STREAMER_VALUEMAP => [
+                    0 => "Not a meeting",
+                    1 => "Meeting",
+                    3 => "Meeting received",
+                    5 => "Meeting canceled",
+                    7 => "Meeting canceled and received",
+                    9 => "Meeting",
+                    11 => "Meeting received",
+                    13 => "Meeting canceled",
+                    15 => "Meeting canceled and received",
+                ],
+            ],
+            SYNC_POOMCAL_ATTENDEES => [
+                self::STREAMER_VAR => "attendees",
+                self::STREAMER_TYPE => "SyncAttendee",
+                self::STREAMER_ARRAY => SYNC_POOMCAL_ATTENDEE,
+                self::STREAMER_RONOTIFY => true,
+                self::STREAMER_PRIVATE => true,
+            ],
+            SYNC_POOMCAL_BODY => [
+                self::STREAMER_VAR => "body",
+                self::STREAMER_RONOTIFY => true,
+                self::STREAMER_PRIVATE => true,
+            ],
+            SYNC_POOMCAL_BODYTRUNCATED => [
+                self::STREAMER_VAR => "bodytruncated",
+                self::STREAMER_PRIVATE => true,
+            ],
+            SYNC_POOMCAL_EXCEPTIONS => [
+                self::STREAMER_VAR => "exceptions",
+                self::STREAMER_TYPE => "SyncAppointmentException",
+                self::STREAMER_ARRAY => SYNC_POOMCAL_EXCEPTION,
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMCAL_CATEGORIES => [
+                self::STREAMER_VAR => "categories",
+                self::STREAMER_ARRAY => SYNC_POOMCAL_CATEGORY,
+                self::STREAMER_RONOTIFY => true,
+                self::STREAMER_PRIVATE => true,
+            ],
+        ];
 
-		if (Request::GetProtocolVersion() >= 12.0) {
-			$mapping[SYNC_AIRSYNCBASE_BODY] = [
-				self::STREAMER_VAR => "asbody",
-				self::STREAMER_TYPE => "SyncBaseBody",
-				self::STREAMER_RONOTIFY => true,
-				self::STREAMER_PRIVATE => true,
-			];
+        if (Request::GetProtocolVersion() >= 12.0) {
+            $mapping[SYNC_AIRSYNCBASE_BODY] = [
+                self::STREAMER_VAR => "asbody",
+                self::STREAMER_TYPE => "SyncBaseBody",
+                self::STREAMER_RONOTIFY => true,
+                self::STREAMER_PRIVATE => true,
+            ];
 
-			$mapping[SYNC_AIRSYNCBASE_NATIVEBODYTYPE] = [self::STREAMER_VAR => "nativebodytype"];
+            $mapping[SYNC_AIRSYNCBASE_NATIVEBODYTYPE] = [self::STREAMER_VAR => "nativebodytype"];
 
-			// unset these properties because airsyncbase body and attachments will be used instead
-			unset($mapping[SYNC_POOMCAL_BODY], $mapping[SYNC_POOMCAL_BODYTRUNCATED]);
-		}
+            // unset these properties because airsyncbase body and attachments will be used instead
+            unset($mapping[SYNC_POOMCAL_BODY], $mapping[SYNC_POOMCAL_BODYTRUNCATED]);
+        }
 
-		if (Request::GetProtocolVersion() >= 14.0) {
-			$mapping[SYNC_POOMCAL_DISALLOWNEWTIMEPROPOSAL] = [
-				self::STREAMER_VAR => "disallownewtimeprop",
-				self::STREAMER_RONOTIFY => true,
-				self::STREAMER_PRIVATE => 1,
-			]; // don't permit new time proposal
-			$mapping[SYNC_POOMCAL_RESPONSEREQUESTED] = [
-				self::STREAMER_VAR => "responserequested",
-				self::STREAMER_RONOTIFY => true,
-			];
-			$mapping[SYNC_POOMCAL_RESPONSETYPE] = [
-				self::STREAMER_VAR => "responsetype",
-				self::STREAMER_RONOTIFY => true,
-			];
-		}
+        if (Request::GetProtocolVersion() >= 14.0) {
+            $mapping[SYNC_POOMCAL_DISALLOWNEWTIMEPROPOSAL] = [
+                self::STREAMER_VAR => "disallownewtimeprop",
+                self::STREAMER_RONOTIFY => true,
+                self::STREAMER_PRIVATE => 1,
+            ]; // don't permit new time proposal
+            $mapping[SYNC_POOMCAL_RESPONSEREQUESTED] = [
+                self::STREAMER_VAR => "responserequested",
+                self::STREAMER_RONOTIFY => true,
+            ];
+            $mapping[SYNC_POOMCAL_RESPONSETYPE] = [
+                self::STREAMER_VAR => "responsetype",
+                self::STREAMER_RONOTIFY => true,
+            ];
+        }
 
-		if (Request::GetProtocolVersion() >= 14.1) {
-			$mapping[SYNC_POOMCAL_ONLINEMEETINGCONFLINK] = [
-				self::STREAMER_VAR => "onlineMeetingConfLink",
-				self::STREAMER_RONOTIFY => true,
-			];
-			$mapping[SYNC_POOMCAL_ONLINEMEETINGEXTERNALLINK] = [
-				self::STREAMER_VAR => "onlineMeetingExternalLink",
-				self::STREAMER_RONOTIFY => true,
-			];
-		}
+        if (Request::GetProtocolVersion() >= 14.1) {
+            $mapping[SYNC_POOMCAL_ONLINEMEETINGCONFLINK] = [
+                self::STREAMER_VAR => "onlineMeetingConfLink",
+                self::STREAMER_RONOTIFY => true,
+            ];
+            $mapping[SYNC_POOMCAL_ONLINEMEETINGEXTERNALLINK] = [
+                self::STREAMER_VAR => "onlineMeetingExternalLink",
+                self::STREAMER_RONOTIFY => true,
+            ];
+        }
 
-		parent::__construct($mapping);
+        parent::__construct($mapping);
 
-		// Indicates that this SyncObject supports the private flag and stripping of private data.
-		$this->supportsPrivateStripping = true;
-	}
+        // Indicates that this SyncObject supports the private flag and stripping of private data.
+        $this->supportsPrivateStripping = true;
+    }
 
-	/**
-	 * Method checks if the object has the minimum of required parameters
-	 * and fulfills semantic dependencies.
-	 *
-	 * This overloads the general check() with special checks to be executed
-	 * Checks if SYNC_POOMCAL_ORGANIZERNAME and SYNC_POOMCAL_ORGANIZEREMAIL are correctly set
-	 *
-	 * @param bool $logAsDebug (opt) default is false, so messages are logged in WARN log level
-	 *
-	 * @return bool
-	 */
-	public function Check($logAsDebug = false) {
-		// Fix starttime and endtime if they are not set on NEW appointments - see https://jira.z-hub.io/browse/ZP-983
-		if ($this->flags === SYNC_NEWMESSAGE) {
-			$time = time();
-			$calcstart = $time + 1800 - ($time % 1800); // round up to the next half hour
+    /**
+     * Method checks if the object has the minimum of required parameters
+     * and fulfills semantic dependencies.
+     *
+     * This overloads the general check() with special checks to be executed
+     * Checks if SYNC_POOMCAL_ORGANIZERNAME and SYNC_POOMCAL_ORGANIZEREMAIL are correctly set
+     *
+     * @param bool $logAsDebug (opt) default is false, so messages are logged in WARN log level
+     *
+     * @return bool
+     */
+    public function Check($logAsDebug = false) {
+        // Fix starttime and endtime if they are not set on NEW appointments - see https://jira.z-hub.io/browse/ZP-983
+        if ($this->flags === SYNC_NEWMESSAGE) {
+            $time = time();
+            $calcstart = $time + 1800 - ($time % 1800); // round up to the next half hour
 
-			// Check error cases first
-			// Case 2: starttime not set, endtime in the past
-			if (!isset($this->starttime) && isset($this->endtime) && $this->endtime < $time) {
-				SLog::Write(LOGLEVEL_WARN, "SyncAppointment->Check(): Parameter 'starttime' not set while 'endtime' is in the past (case 2). Aborting.");
+            // Check error cases first
+            // Case 2: starttime not set, endtime in the past
+            if (!isset($this->starttime) && isset($this->endtime) && $this->endtime < $time) {
+                SLog::Write(LOGLEVEL_WARN, "SyncAppointment->Check(): Parameter 'starttime' not set while 'endtime' is in the past (case 2). Aborting.");
 
-				return false;
-			}
-			// Case 3b: starttime not set, endtime in the future (3) but before the calculated starttime (3b)
-			if (!isset($this->starttime) && isset($this->endtime) && $this->endtime > $time && $this->endtime < $calcstart) {
-				SLog::Write(LOGLEVEL_WARN, "SyncAppointment->Check(): Parameter 'starttime' not set while 'endtime' is in the future but before the calculated starttime (case 3b). Aborting.");
+                return false;
+            }
+            // Case 3b: starttime not set, endtime in the future (3) but before the calculated starttime (3b)
+            if (!isset($this->starttime) && isset($this->endtime) && $this->endtime > $time && $this->endtime < $calcstart) {
+                SLog::Write(LOGLEVEL_WARN, "SyncAppointment->Check(): Parameter 'starttime' not set while 'endtime' is in the future but before the calculated starttime (case 3b). Aborting.");
 
-				return false;
-			}
-			// Case 5: starttime in the future but no endtime set
-			if (isset($this->starttime) && $this->starttime > $time && !isset($this->endtime)) {
-				SLog::Write(LOGLEVEL_WARN, "SyncAppointment->Check(): Parameter 'starttime' is in the future but 'endtime' is not set (case 5). Aborting.");
+                return false;
+            }
+            // Case 5: starttime in the future but no endtime set
+            if (isset($this->starttime) && $this->starttime > $time && !isset($this->endtime)) {
+                SLog::Write(LOGLEVEL_WARN, "SyncAppointment->Check(): Parameter 'starttime' is in the future but 'endtime' is not set (case 5). Aborting.");
 
-				return false;
-			}
+                return false;
+            }
 
-			// Set starttime to the rounded up next half hour
-			// Case 1, 3a (endtime won't be changed as it's set)
-			if (!isset($this->starttime)) {
-				$this->starttime = $calcstart;
-				SLog::Write(LOGLEVEL_WBXML, sprintf("SyncAppointment->Check(): Parameter 'starttime' was not set, setting it to %d (%s).", $this->starttime, gmstrftime("%Y%m%dT%H%M%SZ", $this->starttime)));
-			}
-			// Case 1, 4
-			if (!isset($this->endtime)) {
-				$this->endtime = $calcstart + 1800; // 30 min after calcstart
-				SLog::Write(LOGLEVEL_WBXML, sprintf("SyncAppointment->Check(): Parameter 'endtime' was not set, setting it to %d (%s).", $this->endtime, gmstrftime("%Y%m%dT%H%M%SZ", $this->endtime)));
-			}
-		}
+            // Set starttime to the rounded up next half hour
+            // Case 1, 3a (endtime won't be changed as it's set)
+            if (!isset($this->starttime)) {
+                $this->starttime = $calcstart;
+                SLog::Write(LOGLEVEL_WBXML, sprintf("SyncAppointment->Check(): Parameter 'starttime' was not set, setting it to %d (%s).", $this->starttime, gmstrftime("%Y%m%dT%H%M%SZ", $this->starttime)));
+            }
+            // Case 1, 4
+            if (!isset($this->endtime)) {
+                $this->endtime = $calcstart + 1800; // 30 min after calcstart
+                SLog::Write(LOGLEVEL_WBXML, sprintf("SyncAppointment->Check(): Parameter 'endtime' was not set, setting it to %d (%s).", $this->endtime, gmstrftime("%Y%m%dT%H%M%SZ", $this->endtime)));
+            }
+        }
 
-		$ret = parent::Check($logAsDebug);
+        $ret = parent::Check($logAsDebug);
 
-		// semantic checks general "turn off switch"
-		if (defined("DO_SEMANTIC_CHECKS") && DO_SEMANTIC_CHECKS === false) {
-			return $ret;
-		}
+        // semantic checks general "turn off switch"
+        if (defined("DO_SEMANTIC_CHECKS") && DO_SEMANTIC_CHECKS === false) {
+            return $ret;
+        }
 
-		if (!$ret) {
-			return false;
-		}
+        if (!$ret) {
+            return false;
+        }
 
-		if ($this->meetingstatus > 0) {
-			if (!isset($this->organizername) || !isset($this->organizeremail)) {
-				SLog::Write(LOGLEVEL_WARN, "SyncAppointment->Check(): Parameter 'organizername' and 'organizeremail' should be set for a meeting request");
-			}
-		}
+        if ($this->meetingstatus > 0) {
+            if (!isset($this->organizername) || !isset($this->organizeremail)) {
+                SLog::Write(LOGLEVEL_WARN, "SyncAppointment->Check(): Parameter 'organizername' and 'organizeremail' should be set for a meeting request");
+            }
+        }
 
-		// do not sync a recurrent appointment without a timezone (except all day events)
-		if (isset($this->recurrence) && !isset($this->timezone) && empty($this->alldayevent)) {
-			SLog::Write(LOGLEVEL_ERROR, "SyncAppointment->Check(): timezone for a recurring appointment is not set.");
+        // do not sync a recurrent appointment without a timezone (except all day events)
+        if (isset($this->recurrence) && !isset($this->timezone) && empty($this->alldayevent)) {
+            SLog::Write(LOGLEVEL_ERROR, "SyncAppointment->Check(): timezone for a recurring appointment is not set.");
 
-			return false;
-		}
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

lib/syncobjects/syncmeetingrequest.php

Indentation +136 added lines, -136 removed lines

@@ -10,144 +10,144 @@
  */
 
 class SyncMeetingRequest extends SyncObject {
-	public $alldayevent;
-	public $starttime;
-	public $dtstamp;
-	public $endtime;
-	public $instancetype;
-	public $location;
-	public $organizer;
-	public $recurrenceid;
-	public $reminder;
-	public $responserequested;
-	public $recurrences;
-	public $sensitivity;
-	public $busystatus;
-	public $timezone;
-	public $globalobjid;
-	public $meetingmessagetype;
-	public $disallownewtimeproposal;
+    public $alldayevent;
+    public $starttime;
+    public $dtstamp;
+    public $endtime;
+    public $instancetype;
+    public $location;
+    public $organizer;
+    public $recurrenceid;
+    public $reminder;
+    public $responserequested;
+    public $recurrences;
+    public $sensitivity;
+    public $busystatus;
+    public $timezone;
+    public $globalobjid;
+    public $meetingmessagetype;
+    public $disallownewtimeproposal;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_POOMMAIL_ALLDAYEVENT => [
-				self::STREAMER_VAR => "alldayevent",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ZEROORONE => self::STREAMER_CHECK_SETZERO],
-			],
-			SYNC_POOMMAIL_STARTTIME => [
-				self::STREAMER_VAR => "starttime",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
-					self::STREAMER_CHECK_CMPLOWER => SYNC_POOMMAIL_ENDTIME,
-				],
-			],
-			SYNC_POOMMAIL_DTSTAMP => [
-				self::STREAMER_VAR => "dtstamp",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO],
-			],
-			SYNC_POOMMAIL_ENDTIME => [
-				self::STREAMER_VAR => "endtime",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETONE,
-					self::STREAMER_CHECK_CMPHIGHER => SYNC_POOMMAIL_STARTTIME,
-				],
-			],
-			// Instancetype values
-			// 0 = single appointment
-			// 1 = master recurring appointment
-			// 2 = single instance of recurring appointment
-			// 3 = exception of recurring appointment
-			SYNC_POOMMAIL_INSTANCETYPE => [
-				self::STREAMER_VAR => "instancetype",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
-					self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3],
-				],
-			],
-			SYNC_POOMMAIL_LOCATION => [self::STREAMER_VAR => "location"],
-			SYNC_POOMMAIL_ORGANIZER => [
-				self::STREAMER_VAR => "organizer",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETEMPTY],
-			],
-			SYNC_POOMMAIL_RECURRENCEID => [
-				self::STREAMER_VAR => "recurrenceid",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
-			],
-			SYNC_POOMMAIL_REMINDER => [
-				self::STREAMER_VAR => "reminder",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -1],
-			],
-			SYNC_POOMMAIL_RESPONSEREQUESTED => [self::STREAMER_VAR => "responserequested"],
-			SYNC_POOMMAIL_RECURRENCES => [
-				self::STREAMER_VAR => "recurrences",
-				self::STREAMER_TYPE => "SyncMeetingRequestRecurrence",
-				self::STREAMER_ARRAY => SYNC_POOMMAIL_RECURRENCE,
-			],
-			// Sensitivity values
-			// 0 = Normal
-			// 1 = Personal
-			// 2 = Private
-			// 3 = Confident
-			SYNC_POOMMAIL_SENSITIVITY => [
-				self::STREAMER_VAR => "sensitivity",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
-					self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3],
-				],
-			],
-			// Busystatus values
-			// 0 = Free
-			// 1 = Tentative
-			// 2 = Busy
-			// 3 = Out of office
-			// 4 = Working Elsewhere
-			SYNC_POOMMAIL_BUSYSTATUS => [
-				self::STREAMER_VAR => "busystatus",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETTWO,
-					self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3, 4],
-				],
-			],
-			SYNC_POOMMAIL_TIMEZONE => [
-				self::STREAMER_VAR => "timezone",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => base64_encode(pack("la64vvvvvvvv" . "la64vvvvvvvv" . "l", 0, "", 0, 0, 0, 0, 0, 0, 0, 0, 0, "", 0, 0, 0, 0, 0, 0, 0, 0, 0)),
-				],
-			],
-			SYNC_POOMMAIL_GLOBALOBJID => [self::STREAMER_VAR => "globalobjid"],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_POOMMAIL_ALLDAYEVENT => [
+                self::STREAMER_VAR => "alldayevent",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ZEROORONE => self::STREAMER_CHECK_SETZERO],
+            ],
+            SYNC_POOMMAIL_STARTTIME => [
+                self::STREAMER_VAR => "starttime",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
+                    self::STREAMER_CHECK_CMPLOWER => SYNC_POOMMAIL_ENDTIME,
+                ],
+            ],
+            SYNC_POOMMAIL_DTSTAMP => [
+                self::STREAMER_VAR => "dtstamp",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO],
+            ],
+            SYNC_POOMMAIL_ENDTIME => [
+                self::STREAMER_VAR => "endtime",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETONE,
+                    self::STREAMER_CHECK_CMPHIGHER => SYNC_POOMMAIL_STARTTIME,
+                ],
+            ],
+            // Instancetype values
+            // 0 = single appointment
+            // 1 = master recurring appointment
+            // 2 = single instance of recurring appointment
+            // 3 = exception of recurring appointment
+            SYNC_POOMMAIL_INSTANCETYPE => [
+                self::STREAMER_VAR => "instancetype",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
+                    self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3],
+                ],
+            ],
+            SYNC_POOMMAIL_LOCATION => [self::STREAMER_VAR => "location"],
+            SYNC_POOMMAIL_ORGANIZER => [
+                self::STREAMER_VAR => "organizer",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETEMPTY],
+            ],
+            SYNC_POOMMAIL_RECURRENCEID => [
+                self::STREAMER_VAR => "recurrenceid",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE_DASHES,
+            ],
+            SYNC_POOMMAIL_REMINDER => [
+                self::STREAMER_VAR => "reminder",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -1],
+            ],
+            SYNC_POOMMAIL_RESPONSEREQUESTED => [self::STREAMER_VAR => "responserequested"],
+            SYNC_POOMMAIL_RECURRENCES => [
+                self::STREAMER_VAR => "recurrences",
+                self::STREAMER_TYPE => "SyncMeetingRequestRecurrence",
+                self::STREAMER_ARRAY => SYNC_POOMMAIL_RECURRENCE,
+            ],
+            // Sensitivity values
+            // 0 = Normal
+            // 1 = Personal
+            // 2 = Private
+            // 3 = Confident
+            SYNC_POOMMAIL_SENSITIVITY => [
+                self::STREAMER_VAR => "sensitivity",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
+                    self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3],
+                ],
+            ],
+            // Busystatus values
+            // 0 = Free
+            // 1 = Tentative
+            // 2 = Busy
+            // 3 = Out of office
+            // 4 = Working Elsewhere
+            SYNC_POOMMAIL_BUSYSTATUS => [
+                self::STREAMER_VAR => "busystatus",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETTWO,
+                    self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3, 4],
+                ],
+            ],
+            SYNC_POOMMAIL_TIMEZONE => [
+                self::STREAMER_VAR => "timezone",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_REQUIRED => base64_encode(pack("la64vvvvvvvv" . "la64vvvvvvvv" . "l", 0, "", 0, 0, 0, 0, 0, 0, 0, 0, 0, "", 0, 0, 0, 0, 0, 0, 0, 0, 0)),
+                ],
+            ],
+            SYNC_POOMMAIL_GLOBALOBJID => [self::STREAMER_VAR => "globalobjid"],
+        ];
 
-		if (Request::GetProtocolVersion() >= 14.0) {
-			$mapping[SYNC_POOMMAIL_DISALLOWNEWTIMEPROPOSAL] = [
-				self::STREAMER_VAR => "disallownewtimeproposal",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
-					self::STREAMER_CHECK_ONEVALUEOF => [0, 1],
-				],
-			];
-		}
+        if (Request::GetProtocolVersion() >= 14.0) {
+            $mapping[SYNC_POOMMAIL_DISALLOWNEWTIMEPROPOSAL] = [
+                self::STREAMER_VAR => "disallownewtimeproposal",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
+                    self::STREAMER_CHECK_ONEVALUEOF => [0, 1],
+                ],
+            ];
+        }
 
-		if (Request::GetProtocolVersion() >= 14.1) {
-			// MeetingMessageType values
-			// 0 = A silent update was performed, or the message type is unspecified.
-			// 1 = Initial meeting request.
-			// 2 = Full update.
-			// 3 = Informational update.
-			// 4 = Outdated. A newer meeting request or meeting update was received after this message.
-			// 5 = Identifies the delegator's copy of the meeting request.
-			// 6 = Identifies that the meeting request has been delegated and the meeting request cannot be responded to.
-			$mapping[SYNC_POOMMAIL2_MEETINGMESSAGETYPE] = [
-				self::STREAMER_VAR => "meetingmessagetype",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
-					self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3, 4, 5, 6],
-				],
-			];
-		}
+        if (Request::GetProtocolVersion() >= 14.1) {
+            // MeetingMessageType values
+            // 0 = A silent update was performed, or the message type is unspecified.
+            // 1 = Initial meeting request.
+            // 2 = Full update.
+            // 3 = Informational update.
+            // 4 = Outdated. A newer meeting request or meeting update was received after this message.
+            // 5 = Identifies the delegator's copy of the meeting request.
+            // 6 = Identifies that the meeting request has been delegated and the meeting request cannot be responded to.
+            $mapping[SYNC_POOMMAIL2_MEETINGMESSAGETYPE] = [
+                self::STREAMER_VAR => "meetingmessagetype",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
+                    self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3, 4, 5, 6],
+                ],
+            ];
+        }
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
 			SYNC_POOMMAIL_TIMEZONE => [
 				self::STREAMER_VAR => "timezone",
 				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => base64_encode(pack("la64vvvvvvvv" . "la64vvvvvvvv" . "l", 0, "", 0, 0, 0, 0, 0, 0, 0, 0, 0, "", 0, 0, 0, 0, 0, 0, 0, 0, 0)),
+					self::STREAMER_CHECK_REQUIRED => base64_encode(pack("la64vvvvvvvv"."la64vvvvvvvv"."l", 0, "", 0, 0, 0, 0, 0, 0, 0, 0, 0, "", 0, 0, 0, 0, 0, 0, 0, 0, 0)),
 				],
 			],
 			SYNC_POOMMAIL_GLOBALOBJID => [self::STREAMER_VAR => "globalobjid"],

lib/syncobjects/syncresolverecipientsresponse.php

Indentation +17 added lines, -17 removed lines

@@ -10,23 +10,23 @@
  */
 
 class SyncResolveRecipientsResponse extends SyncObject {
-	public $to;
-	public $status;
-	public $recipientcount;
-	public $recipient;
+    public $to;
+    public $status;
+    public $recipientcount;
+    public $recipient;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_RESOLVERECIPIENTS_TO => [self::STREAMER_VAR => "to"],
-			SYNC_RESOLVERECIPIENTS_STATUS => [self::STREAMER_VAR => "status"],
-			SYNC_RESOLVERECIPIENTS_RECIPIENTCOUNT => [self::STREAMER_VAR => "recipientcount"],
-			SYNC_RESOLVERECIPIENTS_RECIPIENT => [
-				self::STREAMER_VAR => "recipient",
-				self::STREAMER_TYPE => "SyncResolveRecipient",
-				self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_RECIPIENT,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_RESOLVERECIPIENTS_TO => [self::STREAMER_VAR => "to"],
+            SYNC_RESOLVERECIPIENTS_STATUS => [self::STREAMER_VAR => "status"],
+            SYNC_RESOLVERECIPIENTS_RECIPIENTCOUNT => [self::STREAMER_VAR => "recipientcount"],
+            SYNC_RESOLVERECIPIENTS_RECIPIENT => [
+                self::STREAMER_VAR => "recipient",
+                self::STREAMER_TYPE => "SyncResolveRecipient",
+                self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_RECIPIENT,
+            ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

lib/syncobjects/syncresolverecipientscertificates.php

Indentation +23 added lines, -23 removed lines

@@ -10,29 +10,29 @@
  */
 
 class SyncResolveRecipientsCertificates extends SyncObject {
-	public $status;
-	public $certificatecount;
-	public $recipientcount;
-	public $certificate;
-	public $minicertificate;
+    public $status;
+    public $certificatecount;
+    public $recipientcount;
+    public $certificate;
+    public $minicertificate;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_RESOLVERECIPIENTS_STATUS => [self::STREAMER_VAR => "status"],
-			SYNC_RESOLVERECIPIENTS_CERTIFICATECOUNT => [self::STREAMER_VAR => "certificatecount"],
-			SYNC_RESOLVERECIPIENTS_RECIPIENTCOUNT => [self::STREAMER_VAR => "recipientcount"],
-			SYNC_RESOLVERECIPIENTS_CERTIFICATE => [
-				self::STREAMER_VAR => "certificate",
-				self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_CERTIFICATE,
-				self::STREAMER_PROP => self::STREAMER_TYPE_NO_CONTAINER,
-			],
-			SYNC_RESOLVERECIPIENTS_MINICERTIFICATE => [
-				self::STREAMER_VAR => "minicertificate",
-				self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_MINICERTIFICATE,
-				self::STREAMER_PROP => self::STREAMER_TYPE_NO_CONTAINER,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_RESOLVERECIPIENTS_STATUS => [self::STREAMER_VAR => "status"],
+            SYNC_RESOLVERECIPIENTS_CERTIFICATECOUNT => [self::STREAMER_VAR => "certificatecount"],
+            SYNC_RESOLVERECIPIENTS_RECIPIENTCOUNT => [self::STREAMER_VAR => "recipientcount"],
+            SYNC_RESOLVERECIPIENTS_CERTIFICATE => [
+                self::STREAMER_VAR => "certificate",
+                self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_CERTIFICATE,
+                self::STREAMER_PROP => self::STREAMER_TYPE_NO_CONTAINER,
+            ],
+            SYNC_RESOLVERECIPIENTS_MINICERTIFICATE => [
+                self::STREAMER_VAR => "minicertificate",
+                self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_MINICERTIFICATE,
+                self::STREAMER_PROP => self::STREAMER_TYPE_NO_CONTAINER,
+            ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }