Inspection of "Merge branch '44-apply-php-cs-fixer-code-style' in..." - grommunio/grommunio-sync - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 34e8da...f497d2 )

unknown

created 2022-06-04 08:39 UTC

Status

Indentation +22 added lines, -22 removed lines patch added patch discarded remove patch

@@ -10,28 +10,28 @@
 block discarded – undo
  */
 
 class SyncValidateCert extends SyncObject {
-	public $certificatechain;
-	public $certificates;
-	public $checkCRL;
-	public $Status;
+    public $certificatechain;
+    public $certificates;
+    public $checkCRL;
+    public $Status;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_VALIDATECERT_CERTIFICATECHAIN => [
-				self::STREAMER_VAR => "certificatechain",
-				self::STREAMER_ARRAY => SYNC_VALIDATECERT_CERTIFICATE,
-			],
-			SYNC_VALIDATECERT_CERTIFICATES => [
-				self::STREAMER_VAR => "certificates",
-				self::STREAMER_ARRAY => SYNC_VALIDATECERT_CERTIFICATE,
-			],
-			SYNC_VALIDATECERT_CHECKCRL => [self::STREAMER_VAR => "checkCRL"],
-			SYNC_SETTINGS_PROP_STATUS => [
-				self::STREAMER_VAR => "Status",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_VALIDATECERT_CERTIFICATECHAIN => [
+                self::STREAMER_VAR => "certificatechain",
+                self::STREAMER_ARRAY => SYNC_VALIDATECERT_CERTIFICATE,
+            ],
+            SYNC_VALIDATECERT_CERTIFICATES => [
+                self::STREAMER_VAR => "certificates",
+                self::STREAMER_ARRAY => SYNC_VALIDATECERT_CERTIFICATE,
+            ],
+            SYNC_VALIDATECERT_CHECKCRL => [self::STREAMER_VAR => "checkCRL"],
+            SYNC_SETTINGS_PROP_STATUS => [
+                self::STREAMER_VAR => "Status",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
+            ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

Please login to merge, or discard this patch.

lib/syncobjects/syncfolder.php 1 patch

Indentation +67 added lines, -67 removed lines patch added patch discarded remove patch

@@ -10,75 +10,75 @@
 block discarded – undo
  */
 
 class SyncFolder extends SyncObject {
-	public $serverid;
-	public $parentid;
-	public $displayname;
-	public $type;
-	public $Store;
-	public $NoBackendFolder;
-	public $BackendId;
-	public $Flags;
-	public $TypeReal;
+    public $serverid;
+    public $parentid;
+    public $displayname;
+    public $type;
+    public $Store;
+    public $NoBackendFolder;
+    public $BackendId;
+    public $Flags;
+    public $TypeReal;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_FOLDERHIERARCHY_SERVERENTRYID => [
-				self::STREAMER_VAR => "serverid",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => false],
-			],
-			SYNC_FOLDERHIERARCHY_PARENTID => [
-				self::STREAMER_VAR => "parentid",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO],
-			],
-			SYNC_FOLDERHIERARCHY_DISPLAYNAME => [
-				self::STREAMER_VAR => "displayname",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => "Unknown"],
-			],
-			SYNC_FOLDERHIERARCHY_TYPE => [self::STREAMER_VAR => "type",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => 18,
-					self::STREAMER_CHECK_CMPHIGHER => 0,
-					self::STREAMER_CHECK_CMPLOWER => 20,
-				],
-			],
-			SYNC_FOLDERHIERARCHY_IGNORE_STORE => [
-				self::STREAMER_VAR => "Store",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
-			],
-			SYNC_FOLDERHIERARCHY_IGNORE_NOBCKENDFLD => [
-				self::STREAMER_VAR => "NoBackendFolder",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
-			],
-			SYNC_FOLDERHIERARCHY_IGNORE_BACKENDID => [
-				self::STREAMER_VAR => "BackendId",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
-			],
-			SYNC_FOLDERHIERARCHY_IGNORE_FLAGS => [
-				self::STREAMER_VAR => "Flags",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
-			],
-			SYNC_FOLDERHIERARCHY_IGNORE_TYPEREAL => [
-				self::STREAMER_VAR => "TypeReal",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_FOLDERHIERARCHY_SERVERENTRYID => [
+                self::STREAMER_VAR => "serverid",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => false],
+            ],
+            SYNC_FOLDERHIERARCHY_PARENTID => [
+                self::STREAMER_VAR => "parentid",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO],
+            ],
+            SYNC_FOLDERHIERARCHY_DISPLAYNAME => [
+                self::STREAMER_VAR => "displayname",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => "Unknown"],
+            ],
+            SYNC_FOLDERHIERARCHY_TYPE => [self::STREAMER_VAR => "type",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_REQUIRED => 18,
+                    self::STREAMER_CHECK_CMPHIGHER => 0,
+                    self::STREAMER_CHECK_CMPLOWER => 20,
+                ],
+            ],
+            SYNC_FOLDERHIERARCHY_IGNORE_STORE => [
+                self::STREAMER_VAR => "Store",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
+            ],
+            SYNC_FOLDERHIERARCHY_IGNORE_NOBCKENDFLD => [
+                self::STREAMER_VAR => "NoBackendFolder",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
+            ],
+            SYNC_FOLDERHIERARCHY_IGNORE_BACKENDID => [
+                self::STREAMER_VAR => "BackendId",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
+            ],
+            SYNC_FOLDERHIERARCHY_IGNORE_FLAGS => [
+                self::STREAMER_VAR => "Flags",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
+            ],
+            SYNC_FOLDERHIERARCHY_IGNORE_TYPEREAL => [
+                self::STREAMER_VAR => "TypeReal",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
+            ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 
-	/**
-	 * Returns a SyncFolder object with the serverid and optional parentid set.
-	 *
-	 * @param string $serverid
-	 * @param string $parentid
-	 *
-	 * @return SyncFolder object
-	 */
-	public static function GetObject($serverid, $parentid = false) {
-		$folder = new SyncFolder();
-		$folder->serverid = $serverid;
-		$folder->parentid = $parentid;
+    /**
+     * Returns a SyncFolder object with the serverid and optional parentid set.
+     *
+     * @param string $serverid
+     * @param string $parentid
+     *
+     * @return SyncFolder object
+     */
+    public static function GetObject($serverid, $parentid = false) {
+        $folder = new SyncFolder();
+        $folder->serverid = $serverid;
+        $folder->parentid = $parentid;
 
-		return $folder;
-	}
+        return $folder;
+    }
 }

Please login to merge, or discard this patch.

lib/syncobjects/syncrightsmanagementlicense.php 1 patch

Indentation +77 added lines, -77 removed lines patch added patch discarded remove patch

@@ -10,83 +10,83 @@
 block discarded – undo
  */
 
 class SyncRightsManagementLicense extends SyncObject {
-	public $contentExpiryDate;
-	public $contentOwner;
-	public $editAllowed;
-	public $exportAllowed;
-	public $extractAllowed;
-	public $forwardAllowed;
-	public $modifyRecipientsAllowed;
-	public $owner;
-	public $printAllowed;
-	public $programmaticAccessAllowed;
-	public $replyAllAllowed;
-	public $replyAllowed;
-	public $description;
-	public $id;
-	public $name;
+    public $contentExpiryDate;
+    public $contentOwner;
+    public $editAllowed;
+    public $exportAllowed;
+    public $extractAllowed;
+    public $forwardAllowed;
+    public $modifyRecipientsAllowed;
+    public $owner;
+    public $printAllowed;
+    public $programmaticAccessAllowed;
+    public $replyAllAllowed;
+    public $replyAllowed;
+    public $description;
+    public $id;
+    public $name;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_RIGHTSMANAGEMENT_CONTENTEXPIRYDATE => [
-				self::STREAMER_VAR => "contentExpiryDate",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
-			],
-			SYNC_RIGHTSMANAGEMENT_CONTENTOWNER => [
-				self::STREAMER_VAR => "contentOwner",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 320],
-			],
-			SYNC_RIGHTSMANAGEMENT_EDITALLOWED => [
-				self::STREAMER_VAR => "editAllowed",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-			],
-			SYNC_RIGHTSMANAGEMENT_EXPORTALLOWED => [
-				self::STREAMER_VAR => "exportAllowed",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-			],
-			SYNC_RIGHTSMANAGEMENT_EXTRACTALLOWED => [
-				self::STREAMER_VAR => "extractAllowed",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-			],
-			SYNC_RIGHTSMANAGEMENT_FORWARDALLOWED => [
-				self::STREAMER_VAR => "forwardAllowed",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-			],
-			SYNC_RIGHTSMANAGEMENT_MODIFYRECIPIENTSALLOWED => [
-				self::STREAMER_VAR => "modifyRecipientsAllowed",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-			],
-			SYNC_RIGHTSMANAGEMENT_OWNER => [
-				self::STREAMER_VAR => "owner",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-			],
-			SYNC_RIGHTSMANAGEMENT_PRINTALLOWED => [
-				self::STREAMER_VAR => "printAllowed",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-			],
-			SYNC_RIGHTSMANAGEMENT_PROGRAMMATICACCESSALLOWED => [
-				self::STREAMER_VAR => "programmaticAccessAllowed",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-			],
-			SYNC_RIGHTSMANAGEMENT_REPLYALLALLOWED => [
-				self::STREAMER_VAR => "replyAllAllowed",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-			],
-			SYNC_RIGHTSMANAGEMENT_REPLYALLOWED => [
-				self::STREAMER_VAR => "replyAllowed",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
-			],
-			SYNC_RIGHTSMANAGEMENT_TEMPLATEDESCRIPTION => [
-				self::STREAMER_VAR => "description",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 10240],
-			],
-			SYNC_RIGHTSMANAGEMENT_TEMPLATEID => [self::STREAMER_VAR => "id"],
-			SYNC_RIGHTSMANAGEMENT_TEMPLATENAME => [
-				self::STREAMER_VAR => "name",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 256],
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_RIGHTSMANAGEMENT_CONTENTEXPIRYDATE => [
+                self::STREAMER_VAR => "contentExpiryDate",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
+            ],
+            SYNC_RIGHTSMANAGEMENT_CONTENTOWNER => [
+                self::STREAMER_VAR => "contentOwner",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 320],
+            ],
+            SYNC_RIGHTSMANAGEMENT_EDITALLOWED => [
+                self::STREAMER_VAR => "editAllowed",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+            ],
+            SYNC_RIGHTSMANAGEMENT_EXPORTALLOWED => [
+                self::STREAMER_VAR => "exportAllowed",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+            ],
+            SYNC_RIGHTSMANAGEMENT_EXTRACTALLOWED => [
+                self::STREAMER_VAR => "extractAllowed",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+            ],
+            SYNC_RIGHTSMANAGEMENT_FORWARDALLOWED => [
+                self::STREAMER_VAR => "forwardAllowed",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+            ],
+            SYNC_RIGHTSMANAGEMENT_MODIFYRECIPIENTSALLOWED => [
+                self::STREAMER_VAR => "modifyRecipientsAllowed",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+            ],
+            SYNC_RIGHTSMANAGEMENT_OWNER => [
+                self::STREAMER_VAR => "owner",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+            ],
+            SYNC_RIGHTSMANAGEMENT_PRINTALLOWED => [
+                self::STREAMER_VAR => "printAllowed",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+            ],
+            SYNC_RIGHTSMANAGEMENT_PROGRAMMATICACCESSALLOWED => [
+                self::STREAMER_VAR => "programmaticAccessAllowed",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+            ],
+            SYNC_RIGHTSMANAGEMENT_REPLYALLALLOWED => [
+                self::STREAMER_VAR => "replyAllAllowed",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+            ],
+            SYNC_RIGHTSMANAGEMENT_REPLYALLOWED => [
+                self::STREAMER_VAR => "replyAllowed",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
+            ],
+            SYNC_RIGHTSMANAGEMENT_TEMPLATEDESCRIPTION => [
+                self::STREAMER_VAR => "description",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 10240],
+            ],
+            SYNC_RIGHTSMANAGEMENT_TEMPLATEID => [self::STREAMER_VAR => "id"],
+            SYNC_RIGHTSMANAGEMENT_TEMPLATENAME => [
+                self::STREAMER_VAR => "name",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 256],
+            ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

Please login to merge, or discard this patch.

lib/syncobjects/syncdevicepassword.php 1 patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -10,18 +10,18 @@
 block discarded – undo
  */
 
 class SyncDevicePassword extends SyncObject {
-	public $password;
-	public $Status;
+    public $password;
+    public $Status;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_SETTINGS_PW => [self::STREAMER_VAR => "password"],
-			SYNC_SETTINGS_PROP_STATUS => [
-				self::STREAMER_VAR => "Status",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_SETTINGS_PW => [self::STREAMER_VAR => "password"],
+            SYNC_SETTINGS_PROP_STATUS => [
+                self::STREAMER_VAR => "Status",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
+            ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

Please login to merge, or discard this patch.

lib/syncobjects/syncresolverecipients.php 1 patch

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -10,30 +10,30 @@
 block discarded – undo
  */
 
 class SyncResolveRecipients extends SyncObject {
-	public $to = [];
-	public $options;
-	public $status;
-	public $response;
+    public $to = [];
+    public $options;
+    public $status;
+    public $response;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_RESOLVERECIPIENTS_TO => [
-				self::STREAMER_VAR => "to",
-				self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_TO,
-				self::STREAMER_PROP => self::STREAMER_TYPE_NO_CONTAINER,
-			],
-			SYNC_RESOLVERECIPIENTS_OPTIONS => [
-				self::STREAMER_VAR => "options",
-				self::STREAMER_TYPE => "SyncResolveRecipientsOptions",
-			],
-			SYNC_RESOLVERECIPIENTS_STATUS => [self::STREAMER_VAR => "status"],
-			SYNC_RESOLVERECIPIENTS_RESPONSE => [
-				self::STREAMER_VAR => "response",
-				self::STREAMER_TYPE => "SyncResolveRecipientsResponse",
-				self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_RESPONSE,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_RESOLVERECIPIENTS_TO => [
+                self::STREAMER_VAR => "to",
+                self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_TO,
+                self::STREAMER_PROP => self::STREAMER_TYPE_NO_CONTAINER,
+            ],
+            SYNC_RESOLVERECIPIENTS_OPTIONS => [
+                self::STREAMER_VAR => "options",
+                self::STREAMER_TYPE => "SyncResolveRecipientsOptions",
+            ],
+            SYNC_RESOLVERECIPIENTS_STATUS => [self::STREAMER_VAR => "status"],
+            SYNC_RESOLVERECIPIENTS_RESPONSE => [
+                self::STREAMER_VAR => "response",
+                self::STREAMER_TYPE => "SyncResolveRecipientsResponse",
+                self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_RESPONSE,
+            ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

Please login to merge, or discard this patch.

lib/syncobjects/syncrightsmanagementtemplate.php 1 patch

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -10,23 +10,23 @@
 block discarded – undo
  */
 
 class SyncRightsManagementTemplate extends SyncObject {
-	public $description;
-	public $id;
-	public $name;
+    public $description;
+    public $id;
+    public $name;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_RIGHTSMANAGEMENT_TEMPLATEDESCRIPTION => [
-				self::STREAMER_VAR => "description",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 10240],
-			],
-			SYNC_RIGHTSMANAGEMENT_TEMPLATEID => [self::STREAMER_VAR => "id"],
-			SYNC_RIGHTSMANAGEMENT_TEMPLATENAME => [
-				self::STREAMER_VAR => "name",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 256],
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_RIGHTSMANAGEMENT_TEMPLATEDESCRIPTION => [
+                self::STREAMER_VAR => "description",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 10240],
+            ],
+            SYNC_RIGHTSMANAGEMENT_TEMPLATEID => [self::STREAMER_VAR => "id"],
+            SYNC_RIGHTSMANAGEMENT_TEMPLATENAME => [
+                self::STREAMER_VAR => "name",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 256],
+            ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

Please login to merge, or discard this patch.

lib/syncobjects/syncresolverecipientspicture.php 1 patch

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -10,24 +10,24 @@
 block discarded – undo
  */
 
 class SyncResolveRecipientsPicture extends SyncObject {
-	public $maxsize;
-	public $maxpictures;
-	public $status;
-	public $data;
+    public $maxsize;
+    public $maxpictures;
+    public $status;
+    public $data;
 
-	public function __construct() {
-		$mapping = [];
+    public function __construct() {
+        $mapping = [];
 
-		if (Request::GetProtocolVersion() >= 14.1) {
-			$mapping[SYNC_RESOLVERECIPIENTS_MAXSIZE] = [self::STREAMER_VAR => "maxsize"];
-			$mapping[SYNC_RESOLVERECIPIENTS_MAXPICTURES] = [self::STREAMER_VAR => "maxpictures"];
-			$mapping[SYNC_RESOLVERECIPIENTS_STATUS] = [self::STREAMER_VAR => "status"];
-			$mapping[SYNC_RESOLVERECIPIENTS_DATA] = [
-				self::STREAMER_VAR => "data",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASBASE64,
-			];
-		}
+        if (Request::GetProtocolVersion() >= 14.1) {
+            $mapping[SYNC_RESOLVERECIPIENTS_MAXSIZE] = [self::STREAMER_VAR => "maxsize"];
+            $mapping[SYNC_RESOLVERECIPIENTS_MAXPICTURES] = [self::STREAMER_VAR => "maxpictures"];
+            $mapping[SYNC_RESOLVERECIPIENTS_STATUS] = [self::STREAMER_VAR => "status"];
+            $mapping[SYNC_RESOLVERECIPIENTS_DATA] = [
+                self::STREAMER_VAR => "data",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASBASE64,
+            ];
+        }
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

Please login to merge, or discard this patch.

lib/syncobjects/syncattachment.php 1 patch

Indentation +35 added lines, -35 removed lines patch added patch discarded remove patch

@@ -10,41 +10,41 @@
 block discarded – undo
  */
 
 class SyncAttachment extends SyncObject {
-	public $attmethod;
-	public $attsize;
-	public $displayname;
-	public $attname;
-	public $attoid;
-	public $attremoved;
+    public $attmethod;
+    public $attsize;
+    public $displayname;
+    public $attname;
+    public $attoid;
+    public $attremoved;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_POOMMAIL_ATTMETHOD => [
-				self::STREAMER_VAR => "attmethod",
-				self::STREAMER_RONOTIFY => true,
-			],
-			SYNC_POOMMAIL_ATTSIZE => [
-				self::STREAMER_VAR => "attsize",
-				self::STREAMER_CHECKS => [
-					self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
-					self::STREAMER_CHECK_CMPHIGHER => -1,
-				],
-			],
-			SYNC_POOMMAIL_DISPLAYNAME => [
-				self::STREAMER_VAR => "displayname",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETEMPTY],
-			],
-			SYNC_POOMMAIL_ATTNAME => [
-				self::STREAMER_VAR => "attname",
-				self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETEMPTY],
-			],
-			SYNC_POOMMAIL_ATTOID => [self::STREAMER_VAR => "attoid"],
-			SYNC_POOMMAIL_ATTREMOVED => [
-				self::STREAMER_VAR => "attremoved",
-				self::STREAMER_RONOTIFY => true,
-			],
-		];
+    public function __construct() {
+        $mapping = [
+            SYNC_POOMMAIL_ATTMETHOD => [
+                self::STREAMER_VAR => "attmethod",
+                self::STREAMER_RONOTIFY => true,
+            ],
+            SYNC_POOMMAIL_ATTSIZE => [
+                self::STREAMER_VAR => "attsize",
+                self::STREAMER_CHECKS => [
+                    self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
+                    self::STREAMER_CHECK_CMPHIGHER => -1,
+                ],
+            ],
+            SYNC_POOMMAIL_DISPLAYNAME => [
+                self::STREAMER_VAR => "displayname",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETEMPTY],
+            ],
+            SYNC_POOMMAIL_ATTNAME => [
+                self::STREAMER_VAR => "attname",
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETEMPTY],
+            ],
+            SYNC_POOMMAIL_ATTOID => [self::STREAMER_VAR => "attoid"],
+            SYNC_POOMMAIL_ATTREMOVED => [
+                self::STREAMER_VAR => "attremoved",
+                self::STREAMER_RONOTIFY => true,
+            ],
+        ];
 
-		parent::__construct($mapping);
-	}
+        parent::__construct($mapping);
+    }
 }

Please login to merge, or discard this patch.

lib/syncobjects/syncbasebody.php 1 patch

Indentation +35 added lines, -35 removed lines patch added patch discarded remove patch

@@ -10,42 +10,42 @@
 block discarded – undo
  */
 
 class SyncBaseBody extends SyncObject {
-	public $type; // Possible types are plain text, html, rtf and mime
-	public $estimatedDataSize;
-	public $truncated;
-	public $data;
-	public $preview;
+    public $type; // Possible types are plain text, html, rtf and mime
+    public $estimatedDataSize;
+    public $truncated;
+    public $data;
+    public $preview;
 
-	public function __construct() {
-		$mapping = [
-			SYNC_AIRSYNCBASE_TYPE => [
-				self::STREAMER_VAR => "type",
-			],
-			SYNC_AIRSYNCBASE_ESTIMATEDDATASIZE => [
-				self::STREAMER_VAR => "estimatedDataSize",
-				// when stripping private we set the body to self::STRIP_PRIVATE_SUBSTITUTE, so the size needs to be its length
-				self::STREAMER_PRIVATE => strlen(self::STRIP_PRIVATE_SUBSTITUTE),
-			],
-			SYNC_AIRSYNCBASE_TRUNCATED => [self::STREAMER_VAR => "truncated"],
-			SYNC_AIRSYNCBASE_DATA => [
-				self::STREAMER_VAR => "data",
-				self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASPLAIN,
-				self::STREAMER_PROP => self::STREAMER_TYPE_MULTIPART,
-				self::STREAMER_RONOTIFY => true,
-				// replace the body with self::STRIP_PRIVATE_SUBSTITUTE when stripping private
-				self::STREAMER_PRIVATE => StringStreamWrapper::Open(self::STRIP_PRIVATE_SUBSTITUTE),
-			],
-		];
-		if (Request::GetProtocolVersion() >= 14.0) {
-			$mapping[SYNC_AIRSYNCBASE_PREVIEW] = [
-				self::STREAMER_VAR => "preview",
-				self::STREAMER_PRIVATE => self::STRIP_PRIVATE_SUBSTITUTE,
-			];
-		}
+    public function __construct() {
+        $mapping = [
+            SYNC_AIRSYNCBASE_TYPE => [
+                self::STREAMER_VAR => "type",
+            ],
+            SYNC_AIRSYNCBASE_ESTIMATEDDATASIZE => [
+                self::STREAMER_VAR => "estimatedDataSize",
+                // when stripping private we set the body to self::STRIP_PRIVATE_SUBSTITUTE, so the size needs to be its length
+                self::STREAMER_PRIVATE => strlen(self::STRIP_PRIVATE_SUBSTITUTE),
+            ],
+            SYNC_AIRSYNCBASE_TRUNCATED => [self::STREAMER_VAR => "truncated"],
+            SYNC_AIRSYNCBASE_DATA => [
+                self::STREAMER_VAR => "data",
+                self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASPLAIN,
+                self::STREAMER_PROP => self::STREAMER_TYPE_MULTIPART,
+                self::STREAMER_RONOTIFY => true,
+                // replace the body with self::STRIP_PRIVATE_SUBSTITUTE when stripping private
+                self::STREAMER_PRIVATE => StringStreamWrapper::Open(self::STRIP_PRIVATE_SUBSTITUTE),
+            ],
+        ];
+        if (Request::GetProtocolVersion() >= 14.0) {
+            $mapping[SYNC_AIRSYNCBASE_PREVIEW] = [
+                self::STREAMER_VAR => "preview",
+                self::STREAMER_PRIVATE => self::STRIP_PRIVATE_SUBSTITUTE,
+            ];
+        }
 
-		parent::__construct($mapping);
+        parent::__construct($mapping);
 
-		// Indicates that this SyncObject supports the private flag and stripping of private data.
-		$this->supportsPrivateStripping = true;
-	}
+        // Indicates that this SyncObject supports the private flag and stripping of private data.
+        $this->supportsPrivateStripping = true;
+    }
 }

Please login to merge, or discard this patch.

		@@ -10,28 +10,28 @@
		block discarded – undo
10	10	*/
11	11
12	12	class SyncValidateCert extends SyncObject {
13		- public $certificatechain;
14		- public $certificates;
15		- public $checkCRL;
16		- public $Status;
	13	+ public $certificatechain;
	14	+ public $certificates;
	15	+ public $checkCRL;
	16	+ public $Status;
17	17
18		- public function __construct() {
19		- $mapping = [
20		- SYNC_VALIDATECERT_CERTIFICATECHAIN => [
21		- self::STREAMER_VAR => "certificatechain",
22		- self::STREAMER_ARRAY => SYNC_VALIDATECERT_CERTIFICATE,
23		- ],
24		- SYNC_VALIDATECERT_CERTIFICATES => [
25		- self::STREAMER_VAR => "certificates",
26		- self::STREAMER_ARRAY => SYNC_VALIDATECERT_CERTIFICATE,
27		- ],
28		- SYNC_VALIDATECERT_CHECKCRL => [self::STREAMER_VAR => "checkCRL"],
29		- SYNC_SETTINGS_PROP_STATUS => [
30		- self::STREAMER_VAR => "Status",
31		- self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
32		- ],
33		- ];
	18	+ public function __construct() {
	19	+ $mapping = [
	20	+ SYNC_VALIDATECERT_CERTIFICATECHAIN => [
	21	+ self::STREAMER_VAR => "certificatechain",
	22	+ self::STREAMER_ARRAY => SYNC_VALIDATECERT_CERTIFICATE,
	23	+ ],
	24	+ SYNC_VALIDATECERT_CERTIFICATES => [
	25	+ self::STREAMER_VAR => "certificates",
	26	+ self::STREAMER_ARRAY => SYNC_VALIDATECERT_CERTIFICATE,
	27	+ ],
	28	+ SYNC_VALIDATECERT_CHECKCRL => [self::STREAMER_VAR => "checkCRL"],
	29	+ SYNC_SETTINGS_PROP_STATUS => [
	30	+ self::STREAMER_VAR => "Status",
	31	+ self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
	32	+ ],
	33	+ ];
34	34
35		- parent::__construct($mapping);
36		- }
	35	+ parent::__construct($mapping);
	36	+ }
37	37	}

		@@ -10,75 +10,75 @@
		block discarded – undo
10	10	*/
11	11
12	12	class SyncFolder extends SyncObject {
13		- public $serverid;
14		- public $parentid;
15		- public $displayname;
16		- public $type;
17		- public $Store;
18		- public $NoBackendFolder;
19		- public $BackendId;
20		- public $Flags;
21		- public $TypeReal;
	13	+ public $serverid;
	14	+ public $parentid;
	15	+ public $displayname;
	16	+ public $type;
	17	+ public $Store;
	18	+ public $NoBackendFolder;
	19	+ public $BackendId;
	20	+ public $Flags;
	21	+ public $TypeReal;
22	22
23		- public function __construct() {
24		- $mapping = [
25		- SYNC_FOLDERHIERARCHY_SERVERENTRYID => [
26		- self::STREAMER_VAR => "serverid",
27		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => false],
28		- ],
29		- SYNC_FOLDERHIERARCHY_PARENTID => [
30		- self::STREAMER_VAR => "parentid",
31		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO],
32		- ],
33		- SYNC_FOLDERHIERARCHY_DISPLAYNAME => [
34		- self::STREAMER_VAR => "displayname",
35		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => "Unknown"],
36		- ],
37		- SYNC_FOLDERHIERARCHY_TYPE => [self::STREAMER_VAR => "type",
38		- self::STREAMER_CHECKS => [
39		- self::STREAMER_CHECK_REQUIRED => 18,
40		- self::STREAMER_CHECK_CMPHIGHER => 0,
41		- self::STREAMER_CHECK_CMPLOWER => 20,
42		- ],
43		- ],
44		- SYNC_FOLDERHIERARCHY_IGNORE_STORE => [
45		- self::STREAMER_VAR => "Store",
46		- self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
47		- ],
48		- SYNC_FOLDERHIERARCHY_IGNORE_NOBCKENDFLD => [
49		- self::STREAMER_VAR => "NoBackendFolder",
50		- self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
51		- ],
52		- SYNC_FOLDERHIERARCHY_IGNORE_BACKENDID => [
53		- self::STREAMER_VAR => "BackendId",
54		- self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
55		- ],
56		- SYNC_FOLDERHIERARCHY_IGNORE_FLAGS => [
57		- self::STREAMER_VAR => "Flags",
58		- self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
59		- ],
60		- SYNC_FOLDERHIERARCHY_IGNORE_TYPEREAL => [
61		- self::STREAMER_VAR => "TypeReal",
62		- self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
63		- ],
64		- ];
	23	+ public function __construct() {
	24	+ $mapping = [
	25	+ SYNC_FOLDERHIERARCHY_SERVERENTRYID => [
	26	+ self::STREAMER_VAR => "serverid",
	27	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => false],
	28	+ ],
	29	+ SYNC_FOLDERHIERARCHY_PARENTID => [
	30	+ self::STREAMER_VAR => "parentid",
	31	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO],
	32	+ ],
	33	+ SYNC_FOLDERHIERARCHY_DISPLAYNAME => [
	34	+ self::STREAMER_VAR => "displayname",
	35	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => "Unknown"],
	36	+ ],
	37	+ SYNC_FOLDERHIERARCHY_TYPE => [self::STREAMER_VAR => "type",
	38	+ self::STREAMER_CHECKS => [
	39	+ self::STREAMER_CHECK_REQUIRED => 18,
	40	+ self::STREAMER_CHECK_CMPHIGHER => 0,
	41	+ self::STREAMER_CHECK_CMPLOWER => 20,
	42	+ ],
	43	+ ],
	44	+ SYNC_FOLDERHIERARCHY_IGNORE_STORE => [
	45	+ self::STREAMER_VAR => "Store",
	46	+ self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
	47	+ ],
	48	+ SYNC_FOLDERHIERARCHY_IGNORE_NOBCKENDFLD => [
	49	+ self::STREAMER_VAR => "NoBackendFolder",
	50	+ self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
	51	+ ],
	52	+ SYNC_FOLDERHIERARCHY_IGNORE_BACKENDID => [
	53	+ self::STREAMER_VAR => "BackendId",
	54	+ self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
	55	+ ],
	56	+ SYNC_FOLDERHIERARCHY_IGNORE_FLAGS => [
	57	+ self::STREAMER_VAR => "Flags",
	58	+ self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
	59	+ ],
	60	+ SYNC_FOLDERHIERARCHY_IGNORE_TYPEREAL => [
	61	+ self::STREAMER_VAR => "TypeReal",
	62	+ self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
	63	+ ],
	64	+ ];
65	65
66		- parent::__construct($mapping);
67		- }
	66	+ parent::__construct($mapping);
	67	+ }
68	68
69		- /**
70		- * Returns a SyncFolder object with the serverid and optional parentid set.
71		- *
72		- * @param string $serverid
73		- * @param string $parentid
74		- *
75		- * @return SyncFolder object
76		- */
77		- public static function GetObject($serverid, $parentid = false) {
78		- $folder = new SyncFolder();
79		- $folder->serverid = $serverid;
80		- $folder->parentid = $parentid;
	69	+ /**
	70	+ * Returns a SyncFolder object with the serverid and optional parentid set.
	71	+ *
	72	+ * @param string $serverid
	73	+ * @param string $parentid
	74	+ *
	75	+ * @return SyncFolder object
	76	+ */
	77	+ public static function GetObject($serverid, $parentid = false) {
	78	+ $folder = new SyncFolder();
	79	+ $folder->serverid = $serverid;
	80	+ $folder->parentid = $parentid;
81	81
82		- return $folder;
83		- }
	82	+ return $folder;
	83	+ }
84	84	}

		@@ -10,83 +10,83 @@
		block discarded – undo
10	10	*/
11	11
12	12	class SyncRightsManagementLicense extends SyncObject {
13		- public $contentExpiryDate;
14		- public $contentOwner;
15		- public $editAllowed;
16		- public $exportAllowed;
17		- public $extractAllowed;
18		- public $forwardAllowed;
19		- public $modifyRecipientsAllowed;
20		- public $owner;
21		- public $printAllowed;
22		- public $programmaticAccessAllowed;
23		- public $replyAllAllowed;
24		- public $replyAllowed;
25		- public $description;
26		- public $id;
27		- public $name;
	13	+ public $contentExpiryDate;
	14	+ public $contentOwner;
	15	+ public $editAllowed;
	16	+ public $exportAllowed;
	17	+ public $extractAllowed;
	18	+ public $forwardAllowed;
	19	+ public $modifyRecipientsAllowed;
	20	+ public $owner;
	21	+ public $printAllowed;
	22	+ public $programmaticAccessAllowed;
	23	+ public $replyAllAllowed;
	24	+ public $replyAllowed;
	25	+ public $description;
	26	+ public $id;
	27	+ public $name;
28	28
29		- public function __construct() {
30		- $mapping = [
31		- SYNC_RIGHTSMANAGEMENT_CONTENTEXPIRYDATE => [
32		- self::STREAMER_VAR => "contentExpiryDate",
33		- self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
34		- ],
35		- SYNC_RIGHTSMANAGEMENT_CONTENTOWNER => [
36		- self::STREAMER_VAR => "contentOwner",
37		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 320],
38		- ],
39		- SYNC_RIGHTSMANAGEMENT_EDITALLOWED => [
40		- self::STREAMER_VAR => "editAllowed",
41		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
42		- ],
43		- SYNC_RIGHTSMANAGEMENT_EXPORTALLOWED => [
44		- self::STREAMER_VAR => "exportAllowed",
45		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
46		- ],
47		- SYNC_RIGHTSMANAGEMENT_EXTRACTALLOWED => [
48		- self::STREAMER_VAR => "extractAllowed",
49		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
50		- ],
51		- SYNC_RIGHTSMANAGEMENT_FORWARDALLOWED => [
52		- self::STREAMER_VAR => "forwardAllowed",
53		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
54		- ],
55		- SYNC_RIGHTSMANAGEMENT_MODIFYRECIPIENTSALLOWED => [
56		- self::STREAMER_VAR => "modifyRecipientsAllowed",
57		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
58		- ],
59		- SYNC_RIGHTSMANAGEMENT_OWNER => [
60		- self::STREAMER_VAR => "owner",
61		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
62		- ],
63		- SYNC_RIGHTSMANAGEMENT_PRINTALLOWED => [
64		- self::STREAMER_VAR => "printAllowed",
65		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
66		- ],
67		- SYNC_RIGHTSMANAGEMENT_PROGRAMMATICACCESSALLOWED => [
68		- self::STREAMER_VAR => "programmaticAccessAllowed",
69		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
70		- ],
71		- SYNC_RIGHTSMANAGEMENT_REPLYALLALLOWED => [
72		- self::STREAMER_VAR => "replyAllAllowed",
73		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
74		- ],
75		- SYNC_RIGHTSMANAGEMENT_REPLYALLOWED => [
76		- self::STREAMER_VAR => "replyAllowed",
77		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
78		- ],
79		- SYNC_RIGHTSMANAGEMENT_TEMPLATEDESCRIPTION => [
80		- self::STREAMER_VAR => "description",
81		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 10240],
82		- ],
83		- SYNC_RIGHTSMANAGEMENT_TEMPLATEID => [self::STREAMER_VAR => "id"],
84		- SYNC_RIGHTSMANAGEMENT_TEMPLATENAME => [
85		- self::STREAMER_VAR => "name",
86		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 256],
87		- ],
88		- ];
	29	+ public function __construct() {
	30	+ $mapping = [
	31	+ SYNC_RIGHTSMANAGEMENT_CONTENTEXPIRYDATE => [
	32	+ self::STREAMER_VAR => "contentExpiryDate",
	33	+ self::STREAMER_TYPE => self::STREAMER_TYPE_DATE,
	34	+ ],
	35	+ SYNC_RIGHTSMANAGEMENT_CONTENTOWNER => [
	36	+ self::STREAMER_VAR => "contentOwner",
	37	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 320],
	38	+ ],
	39	+ SYNC_RIGHTSMANAGEMENT_EDITALLOWED => [
	40	+ self::STREAMER_VAR => "editAllowed",
	41	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
	42	+ ],
	43	+ SYNC_RIGHTSMANAGEMENT_EXPORTALLOWED => [
	44	+ self::STREAMER_VAR => "exportAllowed",
	45	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
	46	+ ],
	47	+ SYNC_RIGHTSMANAGEMENT_EXTRACTALLOWED => [
	48	+ self::STREAMER_VAR => "extractAllowed",
	49	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
	50	+ ],
	51	+ SYNC_RIGHTSMANAGEMENT_FORWARDALLOWED => [
	52	+ self::STREAMER_VAR => "forwardAllowed",
	53	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
	54	+ ],
	55	+ SYNC_RIGHTSMANAGEMENT_MODIFYRECIPIENTSALLOWED => [
	56	+ self::STREAMER_VAR => "modifyRecipientsAllowed",
	57	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
	58	+ ],
	59	+ SYNC_RIGHTSMANAGEMENT_OWNER => [
	60	+ self::STREAMER_VAR => "owner",
	61	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
	62	+ ],
	63	+ SYNC_RIGHTSMANAGEMENT_PRINTALLOWED => [
	64	+ self::STREAMER_VAR => "printAllowed",
	65	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
	66	+ ],
	67	+ SYNC_RIGHTSMANAGEMENT_PROGRAMMATICACCESSALLOWED => [
	68	+ self::STREAMER_VAR => "programmaticAccessAllowed",
	69	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
	70	+ ],
	71	+ SYNC_RIGHTSMANAGEMENT_REPLYALLALLOWED => [
	72	+ self::STREAMER_VAR => "replyAllAllowed",
	73	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
	74	+ ],
	75	+ SYNC_RIGHTSMANAGEMENT_REPLYALLOWED => [
	76	+ self::STREAMER_VAR => "replyAllowed",
	77	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_ONEVALUEOF => [0, 1]],
	78	+ ],
	79	+ SYNC_RIGHTSMANAGEMENT_TEMPLATEDESCRIPTION => [
	80	+ self::STREAMER_VAR => "description",
	81	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 10240],
	82	+ ],
	83	+ SYNC_RIGHTSMANAGEMENT_TEMPLATEID => [self::STREAMER_VAR => "id"],
	84	+ SYNC_RIGHTSMANAGEMENT_TEMPLATENAME => [
	85	+ self::STREAMER_VAR => "name",
	86	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 256],
	87	+ ],
	88	+ ];
89	89
90		- parent::__construct($mapping);
91		- }
	90	+ parent::__construct($mapping);
	91	+ }
92	92	}

		@@ -10,18 +10,18 @@
		block discarded – undo
10	10	*/
11	11
12	12	class SyncDevicePassword extends SyncObject {
13		- public $password;
14		- public $Status;
	13	+ public $password;
	14	+ public $Status;
15	15
16		- public function __construct() {
17		- $mapping = [
18		- SYNC_SETTINGS_PW => [self::STREAMER_VAR => "password"],
19		- SYNC_SETTINGS_PROP_STATUS => [
20		- self::STREAMER_VAR => "Status",
21		- self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
22		- ],
23		- ];
	16	+ public function __construct() {
	17	+ $mapping = [
	18	+ SYNC_SETTINGS_PW => [self::STREAMER_VAR => "password"],
	19	+ SYNC_SETTINGS_PROP_STATUS => [
	20	+ self::STREAMER_VAR => "Status",
	21	+ self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE,
	22	+ ],
	23	+ ];
24	24
25		- parent::__construct($mapping);
26		- }
	25	+ parent::__construct($mapping);
	26	+ }
27	27	}

		@@ -10,30 +10,30 @@
		block discarded – undo
10	10	*/
11	11
12	12	class SyncResolveRecipients extends SyncObject {
13		- public $to = [];
14		- public $options;
15		- public $status;
16		- public $response;
	13	+ public $to = [];
	14	+ public $options;
	15	+ public $status;
	16	+ public $response;
17	17
18		- public function __construct() {
19		- $mapping = [
20		- SYNC_RESOLVERECIPIENTS_TO => [
21		- self::STREAMER_VAR => "to",
22		- self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_TO,
23		- self::STREAMER_PROP => self::STREAMER_TYPE_NO_CONTAINER,
24		- ],
25		- SYNC_RESOLVERECIPIENTS_OPTIONS => [
26		- self::STREAMER_VAR => "options",
27		- self::STREAMER_TYPE => "SyncResolveRecipientsOptions",
28		- ],
29		- SYNC_RESOLVERECIPIENTS_STATUS => [self::STREAMER_VAR => "status"],
30		- SYNC_RESOLVERECIPIENTS_RESPONSE => [
31		- self::STREAMER_VAR => "response",
32		- self::STREAMER_TYPE => "SyncResolveRecipientsResponse",
33		- self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_RESPONSE,
34		- ],
35		- ];
	18	+ public function __construct() {
	19	+ $mapping = [
	20	+ SYNC_RESOLVERECIPIENTS_TO => [
	21	+ self::STREAMER_VAR => "to",
	22	+ self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_TO,
	23	+ self::STREAMER_PROP => self::STREAMER_TYPE_NO_CONTAINER,
	24	+ ],
	25	+ SYNC_RESOLVERECIPIENTS_OPTIONS => [
	26	+ self::STREAMER_VAR => "options",
	27	+ self::STREAMER_TYPE => "SyncResolveRecipientsOptions",
	28	+ ],
	29	+ SYNC_RESOLVERECIPIENTS_STATUS => [self::STREAMER_VAR => "status"],
	30	+ SYNC_RESOLVERECIPIENTS_RESPONSE => [
	31	+ self::STREAMER_VAR => "response",
	32	+ self::STREAMER_TYPE => "SyncResolveRecipientsResponse",
	33	+ self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_RESPONSE,
	34	+ ],
	35	+ ];
36	36
37		- parent::__construct($mapping);
38		- }
	37	+ parent::__construct($mapping);
	38	+ }
39	39	}

		@@ -10,23 +10,23 @@
		block discarded – undo
10	10	*/
11	11
12	12	class SyncRightsManagementTemplate extends SyncObject {
13		- public $description;
14		- public $id;
15		- public $name;
	13	+ public $description;
	14	+ public $id;
	15	+ public $name;
16	16
17		- public function __construct() {
18		- $mapping = [
19		- SYNC_RIGHTSMANAGEMENT_TEMPLATEDESCRIPTION => [
20		- self::STREAMER_VAR => "description",
21		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 10240],
22		- ],
23		- SYNC_RIGHTSMANAGEMENT_TEMPLATEID => [self::STREAMER_VAR => "id"],
24		- SYNC_RIGHTSMANAGEMENT_TEMPLATENAME => [
25		- self::STREAMER_VAR => "name",
26		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 256],
27		- ],
28		- ];
	17	+ public function __construct() {
	18	+ $mapping = [
	19	+ SYNC_RIGHTSMANAGEMENT_TEMPLATEDESCRIPTION => [
	20	+ self::STREAMER_VAR => "description",
	21	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 10240],
	22	+ ],
	23	+ SYNC_RIGHTSMANAGEMENT_TEMPLATEID => [self::STREAMER_VAR => "id"],
	24	+ SYNC_RIGHTSMANAGEMENT_TEMPLATENAME => [
	25	+ self::STREAMER_VAR => "name",
	26	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_LENGTHMAX => 256],
	27	+ ],
	28	+ ];
29	29
30		- parent::__construct($mapping);
31		- }
	30	+ parent::__construct($mapping);
	31	+ }
32	32	}

		@@ -10,24 +10,24 @@
		block discarded – undo
10	10	*/
11	11
12	12	class SyncResolveRecipientsPicture extends SyncObject {
13		- public $maxsize;
14		- public $maxpictures;
15		- public $status;
16		- public $data;
	13	+ public $maxsize;
	14	+ public $maxpictures;
	15	+ public $status;
	16	+ public $data;
17	17
18		- public function __construct() {
19		- $mapping = [];
	18	+ public function __construct() {
	19	+ $mapping = [];
20	20
21		- if (Request::GetProtocolVersion() >= 14.1) {
22		- $mapping[SYNC_RESOLVERECIPIENTS_MAXSIZE] = [self::STREAMER_VAR => "maxsize"];
23		- $mapping[SYNC_RESOLVERECIPIENTS_MAXPICTURES] = [self::STREAMER_VAR => "maxpictures"];
24		- $mapping[SYNC_RESOLVERECIPIENTS_STATUS] = [self::STREAMER_VAR => "status"];
25		- $mapping[SYNC_RESOLVERECIPIENTS_DATA] = [
26		- self::STREAMER_VAR => "data",
27		- self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASBASE64,
28		- ];
29		- }
	21	+ if (Request::GetProtocolVersion() >= 14.1) {
	22	+ $mapping[SYNC_RESOLVERECIPIENTS_MAXSIZE] = [self::STREAMER_VAR => "maxsize"];
	23	+ $mapping[SYNC_RESOLVERECIPIENTS_MAXPICTURES] = [self::STREAMER_VAR => "maxpictures"];
	24	+ $mapping[SYNC_RESOLVERECIPIENTS_STATUS] = [self::STREAMER_VAR => "status"];
	25	+ $mapping[SYNC_RESOLVERECIPIENTS_DATA] = [
	26	+ self::STREAMER_VAR => "data",
	27	+ self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASBASE64,
	28	+ ];
	29	+ }
30	30
31		- parent::__construct($mapping);
32		- }
	31	+ parent::__construct($mapping);
	32	+ }
33	33	}

		@@ -10,41 +10,41 @@
		block discarded – undo
10	10	*/
11	11
12	12	class SyncAttachment extends SyncObject {
13		- public $attmethod;
14		- public $attsize;
15		- public $displayname;
16		- public $attname;
17		- public $attoid;
18		- public $attremoved;
	13	+ public $attmethod;
	14	+ public $attsize;
	15	+ public $displayname;
	16	+ public $attname;
	17	+ public $attoid;
	18	+ public $attremoved;
19	19
20		- public function __construct() {
21		- $mapping = [
22		- SYNC_POOMMAIL_ATTMETHOD => [
23		- self::STREAMER_VAR => "attmethod",
24		- self::STREAMER_RONOTIFY => true,
25		- ],
26		- SYNC_POOMMAIL_ATTSIZE => [
27		- self::STREAMER_VAR => "attsize",
28		- self::STREAMER_CHECKS => [
29		- self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
30		- self::STREAMER_CHECK_CMPHIGHER => -1,
31		- ],
32		- ],
33		- SYNC_POOMMAIL_DISPLAYNAME => [
34		- self::STREAMER_VAR => "displayname",
35		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETEMPTY],
36		- ],
37		- SYNC_POOMMAIL_ATTNAME => [
38		- self::STREAMER_VAR => "attname",
39		- self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETEMPTY],
40		- ],
41		- SYNC_POOMMAIL_ATTOID => [self::STREAMER_VAR => "attoid"],
42		- SYNC_POOMMAIL_ATTREMOVED => [
43		- self::STREAMER_VAR => "attremoved",
44		- self::STREAMER_RONOTIFY => true,
45		- ],
46		- ];
	20	+ public function __construct() {
	21	+ $mapping = [
	22	+ SYNC_POOMMAIL_ATTMETHOD => [
	23	+ self::STREAMER_VAR => "attmethod",
	24	+ self::STREAMER_RONOTIFY => true,
	25	+ ],
	26	+ SYNC_POOMMAIL_ATTSIZE => [
	27	+ self::STREAMER_VAR => "attsize",
	28	+ self::STREAMER_CHECKS => [
	29	+ self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
	30	+ self::STREAMER_CHECK_CMPHIGHER => -1,
	31	+ ],
	32	+ ],
	33	+ SYNC_POOMMAIL_DISPLAYNAME => [
	34	+ self::STREAMER_VAR => "displayname",
	35	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETEMPTY],
	36	+ ],
	37	+ SYNC_POOMMAIL_ATTNAME => [
	38	+ self::STREAMER_VAR => "attname",
	39	+ self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETEMPTY],
	40	+ ],
	41	+ SYNC_POOMMAIL_ATTOID => [self::STREAMER_VAR => "attoid"],
	42	+ SYNC_POOMMAIL_ATTREMOVED => [
	43	+ self::STREAMER_VAR => "attremoved",
	44	+ self::STREAMER_RONOTIFY => true,
	45	+ ],
	46	+ ];
47	47
48		- parent::__construct($mapping);
49		- }
	48	+ parent::__construct($mapping);
	49	+ }
50	50	}

		@@ -10,42 +10,42 @@
		block discarded – undo
10	10	*/
11	11
12	12	class SyncBaseBody extends SyncObject {
13		- public $type; // Possible types are plain text, html, rtf and mime
14		- public $estimatedDataSize;
15		- public $truncated;
16		- public $data;
17		- public $preview;
	13	+ public $type; // Possible types are plain text, html, rtf and mime
	14	+ public $estimatedDataSize;
	15	+ public $truncated;
	16	+ public $data;
	17	+ public $preview;
18	18
19		- public function __construct() {
20		- $mapping = [
21		- SYNC_AIRSYNCBASE_TYPE => [
22		- self::STREAMER_VAR => "type",
23		- ],
24		- SYNC_AIRSYNCBASE_ESTIMATEDDATASIZE => [
25		- self::STREAMER_VAR => "estimatedDataSize",
26		- // when stripping private we set the body to self::STRIP_PRIVATE_SUBSTITUTE, so the size needs to be its length
27		- self::STREAMER_PRIVATE => strlen(self::STRIP_PRIVATE_SUBSTITUTE),
28		- ],
29		- SYNC_AIRSYNCBASE_TRUNCATED => [self::STREAMER_VAR => "truncated"],
30		- SYNC_AIRSYNCBASE_DATA => [
31		- self::STREAMER_VAR => "data",
32		- self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASPLAIN,
33		- self::STREAMER_PROP => self::STREAMER_TYPE_MULTIPART,
34		- self::STREAMER_RONOTIFY => true,
35		- // replace the body with self::STRIP_PRIVATE_SUBSTITUTE when stripping private
36		- self::STREAMER_PRIVATE => StringStreamWrapper::Open(self::STRIP_PRIVATE_SUBSTITUTE),
37		- ],
38		- ];
39		- if (Request::GetProtocolVersion() >= 14.0) {
40		- $mapping[SYNC_AIRSYNCBASE_PREVIEW] = [
41		- self::STREAMER_VAR => "preview",
42		- self::STREAMER_PRIVATE => self::STRIP_PRIVATE_SUBSTITUTE,
43		- ];
44		- }
	19	+ public function __construct() {
	20	+ $mapping = [
	21	+ SYNC_AIRSYNCBASE_TYPE => [
	22	+ self::STREAMER_VAR => "type",
	23	+ ],
	24	+ SYNC_AIRSYNCBASE_ESTIMATEDDATASIZE => [
	25	+ self::STREAMER_VAR => "estimatedDataSize",
	26	+ // when stripping private we set the body to self::STRIP_PRIVATE_SUBSTITUTE, so the size needs to be its length
	27	+ self::STREAMER_PRIVATE => strlen(self::STRIP_PRIVATE_SUBSTITUTE),
	28	+ ],
	29	+ SYNC_AIRSYNCBASE_TRUNCATED => [self::STREAMER_VAR => "truncated"],
	30	+ SYNC_AIRSYNCBASE_DATA => [
	31	+ self::STREAMER_VAR => "data",
	32	+ self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASPLAIN,
	33	+ self::STREAMER_PROP => self::STREAMER_TYPE_MULTIPART,
	34	+ self::STREAMER_RONOTIFY => true,
	35	+ // replace the body with self::STRIP_PRIVATE_SUBSTITUTE when stripping private
	36	+ self::STREAMER_PRIVATE => StringStreamWrapper::Open(self::STRIP_PRIVATE_SUBSTITUTE),
	37	+ ],
	38	+ ];
	39	+ if (Request::GetProtocolVersion() >= 14.0) {
	40	+ $mapping[SYNC_AIRSYNCBASE_PREVIEW] = [
	41	+ self::STREAMER_VAR => "preview",
	42	+ self::STREAMER_PRIVATE => self::STRIP_PRIVATE_SUBSTITUTE,
	43	+ ];
	44	+ }
45	45
46		- parent::__construct($mapping);
	46	+ parent::__construct($mapping);
47	47
48		- // Indicates that this SyncObject supports the private flag and stripping of private data.
49		- $this->supportsPrivateStripping = true;
50		- }
	48	+ // Indicates that this SyncObject supports the private flag and stripping of private data.
	49	+ $this->supportsPrivateStripping = true;
	50	+ }
51	51	}

grommunio / grommunio-sync

Push — master ( 34e8da...f497d2 )

Status

Category

Indentation +22 added lines, -22 removed lines patch added patch discarded remove patch

Indentation +67 added lines, -67 removed lines patch added patch discarded remove patch

Indentation +77 added lines, -77 removed lines patch added patch discarded remove patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

Indentation +35 added lines, -35 removed lines patch added patch discarded remove patch

Indentation +35 added lines, -35 removed lines patch added patch discarded remove patch