Passed
Branch 45-mixed-bag-of-php-modernizat... (2062ef)
by Mike
04:17
created
mapi/mapicode.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
  * @param mixed $code
28 28
  */
29 29
 function make_mapi_e($code) {
30
-	return (int) mapi_make_scode(1, $code);
30
+	return (int)mapi_make_scode(1, $code);
31 31
 }
32 32
 
33 33
 /**
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
  * @param mixed $code
37 37
  */
38 38
 function make_mapi_s($code) {
39
-	return (int) mapi_make_scode(0, $code);
39
+	return (int)mapi_make_scode(0, $code);
40 40
 }
41 41
 
42 42
 /* From mapicode.h */
Please login to merge, or discard this patch.
mapi/class.recurrence.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -598,8 +598,8 @@  discard block
 block discarded – undo
598 598
 			}
599 599
 
600 600
 			// get timings of the first occurrence
601
-			$firstoccstartdate = isset($startocc) ? $start + (((int) $startocc) * 60) : $start;
602
-			$firstoccenddate = isset($endocc) ? $end + (((int) $endocc) * 60) : $end;
601
+			$firstoccstartdate = isset($startocc) ? $start + (((int)$startocc) * 60) : $start;
602
+			$firstoccenddate = isset($endocc) ? $end + (((int)$endocc) * 60) : $end;
603 603
 
604 604
 			$start = gmdate(_('d-m-Y'), $firstoccstartdate);
605 605
 			$end = gmdate(_('d-m-Y'), $firstoccenddate);
@@ -743,7 +743,7 @@  discard block
 block discarded – undo
743 743
 			$props[PR_EXCEPTION_ENDTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["duedate"]]);
744 744
 			mapi_setprops($attachment, $props);
745 745
 
746
-			$imessage = mapi_attach_openobj($attachment, MAPI_CREATE | MAPI_MODIFY);
746
+			$imessage = mapi_attach_openobj($attachment, MAPI_CREATE|MAPI_MODIFY);
747 747
 
748 748
 			if ($copy_attach_from) {
749 749
 				$attachmentTable = mapi_message_getattachmenttable($copy_attach_from);
@@ -751,7 +751,7 @@  discard block
 block discarded – undo
751 751
 					$attachments = mapi_table_queryallrows($attachmentTable, [PR_ATTACH_NUM, PR_ATTACH_SIZE, PR_ATTACH_LONG_FILENAME, PR_ATTACHMENT_HIDDEN, PR_DISPLAY_NAME, PR_ATTACH_METHOD]);
752 752
 
753 753
 					foreach ($attachments as $attach_props) {
754
-						$attach_old = mapi_message_openattach($copy_attach_from, (int) $attach_props[PR_ATTACH_NUM]);
754
+						$attach_old = mapi_message_openattach($copy_attach_from, (int)$attach_props[PR_ATTACH_NUM]);
755 755
 						$attach_newResourceMsg = mapi_message_createattach($imessage);
756 756
 						mapi_copyto($attach_old, [], [], $attach_newResourceMsg, 0);
757 757
 						mapi_savechanges($attach_newResourceMsg);
@@ -1123,13 +1123,13 @@  discard block
 block discarded – undo
1123 1123
 			// Remove all deleted recipients
1124 1124
 			if (isset($exception_recips['remove'])) {
1125 1125
 				foreach ($exception_recips['remove'] as &$recip) {
1126
-					if (!isset($recip[PR_RECIPIENT_FLAGS]) || $recip[PR_RECIPIENT_FLAGS] != (recipReserved | recipExceptionalDeleted | recipSendable)) {
1127
-						$recip[PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalDeleted;
1126
+					if (!isset($recip[PR_RECIPIENT_FLAGS]) || $recip[PR_RECIPIENT_FLAGS] != (recipReserved|recipExceptionalDeleted|recipSendable)) {
1127
+						$recip[PR_RECIPIENT_FLAGS] = recipSendable|recipExceptionalDeleted;
1128 1128
 					}
1129 1129
 					else {
1130
-						$recip[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
1130
+						$recip[PR_RECIPIENT_FLAGS] = recipReserved|recipExceptionalDeleted|recipSendable;
1131 1131
 					}
1132
-					$recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone;        // No Response required
1132
+					$recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone; // No Response required
1133 1133
 				}
1134 1134
 				unset($recip);
1135 1135
 				mapi_message_modifyrecipients($exception, MODRECIP_MODIFY, $exception_recips['remove']);
@@ -1199,13 +1199,13 @@  discard block
 block discarded – undo
1199 1199
 
1200 1200
 						// If recipient is not in list of deleted recipient, add him
1201 1201
 						if (!$foundInDeletedRecipients) {
1202
-							if (!isset($recipient[PR_RECIPIENT_FLAGS]) || $recipient[PR_RECIPIENT_FLAGS] != (recipReserved | recipExceptionalDeleted | recipSendable)) {
1203
-								$recipient[PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalDeleted;
1202
+							if (!isset($recipient[PR_RECIPIENT_FLAGS]) || $recipient[PR_RECIPIENT_FLAGS] != (recipReserved|recipExceptionalDeleted|recipSendable)) {
1203
+								$recipient[PR_RECIPIENT_FLAGS] = recipSendable|recipExceptionalDeleted;
1204 1204
 							}
1205 1205
 							else {
1206
-								$recipient[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
1206
+								$recipient[PR_RECIPIENT_FLAGS] = recipReserved|recipExceptionalDeleted|recipSendable;
1207 1207
 							}
1208
-							$recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;    // No Response required
1208
+							$recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone; // No Response required
1209 1209
 							$deletedRecipients[] = $recipient;
1210 1210
 						}
1211 1211
 					}
@@ -1265,12 +1265,12 @@  discard block
 block discarded – undo
1265 1265
 			$hasOrganizer = false;
1266 1266
 			// Check if meeting already has an organizer.
1267 1267
 			foreach ($recipients as $key => $recipient) {
1268
-				if (isset($recipient[PR_RECIPIENT_FLAGS]) && $recipient[PR_RECIPIENT_FLAGS] == (recipSendable | recipOrganizer)) {
1268
+				if (isset($recipient[PR_RECIPIENT_FLAGS]) && $recipient[PR_RECIPIENT_FLAGS] == (recipSendable|recipOrganizer)) {
1269 1269
 					$hasOrganizer = true;
1270 1270
 				}
1271 1271
 				elseif ($isException && !isset($recipient[PR_RECIPIENT_FLAGS])) {
1272 1272
 					// Recipients for an occurrence
1273
-					$recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalResponse;
1273
+					$recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable|recipExceptionalResponse;
1274 1274
 				}
1275 1275
 			}
1276 1276
 
@@ -1284,7 +1284,7 @@  discard block
 block discarded – undo
1284 1284
 				$organizer[PR_RECIPIENT_DISPLAY_NAME] = $messageProps[PR_SENT_REPRESENTING_NAME];
1285 1285
 				$organizer[PR_ADDRTYPE] = empty($messageProps[PR_SENT_REPRESENTING_ADDRTYPE]) ? 'SMTP' : $messageProps[PR_SENT_REPRESENTING_ADDRTYPE];
1286 1286
 				$organizer[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;
1287
-				$organizer[PR_RECIPIENT_FLAGS] = recipSendable | recipOrganizer;
1287
+				$organizer[PR_RECIPIENT_FLAGS] = recipSendable|recipOrganizer;
1288 1288
 				$organizer[PR_SEARCH_KEY] = $messageProps[PR_SENT_REPRESENTING_SEARCH_KEY];
1289 1289
 
1290 1290
 				// Add organizer to recipients list.
Please login to merge, or discard this patch.
mapi/class.freebusypublish.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -218,7 +218,7 @@
 block discarded – undo
218 218
 					],
219 219
 				], // EXISTS OR
220 220
 			],
221
-		];        // global OR
221
+		]; // global OR
222 222
 
223 223
 		$contents = mapi_folder_getcontentstable($this->calendar);
224 224
 		mapi_table_restrict($contents, $restrict);
Please login to merge, or discard this patch.
mapi/mapidefs.php 1 patch
Spacing   +96 added lines, -96 removed lines patch added patch discarded remove patch
@@ -16,40 +16,40 @@  discard block
 block discarded – undo
16 16
 
17 17
 /* Object type */
18 18
 
19
-define('MAPI_STORE', 0x00000001);    /* Message Store */
20
-define('MAPI_ADDRBOOK', 0x00000002);    /* Address Book */
21
-define('MAPI_FOLDER', 0x00000003);    /* Folder */
22
-define('MAPI_ABCONT', 0x00000004);    /* Address Book Container */
23
-define('MAPI_MESSAGE', 0x00000005);    /* Message */
24
-define('MAPI_MAILUSER', 0x00000006);    /* Individual Recipient */
25
-define('MAPI_ATTACH', 0x00000007);    /* Attachment */
26
-define('MAPI_DISTLIST', 0x00000008);    /* Distribution List Recipient */
27
-define('MAPI_PROFSECT', 0x00000009);    /* Profile Section */
28
-define('MAPI_STATUS', 0x0000000A);    /* Status Object */
29
-define('MAPI_SESSION', 0x0000000B);    /* Session */
30
-define('MAPI_FORMINFO', 0x0000000C);    /* Form Information */
19
+define('MAPI_STORE', 0x00000001); /* Message Store */
20
+define('MAPI_ADDRBOOK', 0x00000002); /* Address Book */
21
+define('MAPI_FOLDER', 0x00000003); /* Folder */
22
+define('MAPI_ABCONT', 0x00000004); /* Address Book Container */
23
+define('MAPI_MESSAGE', 0x00000005); /* Message */
24
+define('MAPI_MAILUSER', 0x00000006); /* Individual Recipient */
25
+define('MAPI_ATTACH', 0x00000007); /* Attachment */
26
+define('MAPI_DISTLIST', 0x00000008); /* Distribution List Recipient */
27
+define('MAPI_PROFSECT', 0x00000009); /* Profile Section */
28
+define('MAPI_STATUS', 0x0000000A); /* Status Object */
29
+define('MAPI_SESSION', 0x0000000B); /* Session */
30
+define('MAPI_FORMINFO', 0x0000000C); /* Form Information */
31 31
 
32 32
 define('MV_FLAG', 0x1000);
33 33
 define('MV_INSTANCE', 0x2000);
34
-define('MVI_FLAG', MV_FLAG | MV_INSTANCE);
35
-
36
-define('PT_UNSPECIFIED', 0);    /* (Reserved for interface use) type doesn't matter to caller */
37
-define('PT_NULL', 1);    /* NULL property value */
38
-define('PT_I2', 2);    /* Signed 16-bit value */
39
-define('PT_LONG', 3);    /* Signed 32-bit value */
40
-define('PT_R4', 4);    /* 4-byte floating point */
41
-define('PT_DOUBLE', 5);    /* Floating point double */
42
-define('PT_CURRENCY', 6);    /* Signed 64-bit int (decimal w/    4 digits right of decimal pt) */
43
-define('PT_APPTIME', 7);    /* Application time */
44
-define('PT_ERROR', 10);    /* 32-bit error value */
45
-define('PT_BOOLEAN', 11);    /* 16-bit boolean (non-zero true) */
46
-define('PT_OBJECT', 13);    /* Embedded object in a property */
47
-define('PT_I8', 20);    /* 8-byte signed integer */
48
-define('PT_STRING8', 30);    /* Null terminated 8-bit character string */
49
-define('PT_UNICODE', 31);    /* Null terminated Unicode string */
50
-define('PT_SYSTIME', 64);    /* FILETIME 64-bit int w/ number of 100ns periods since Jan 1,1601 */
51
-define('PT_CLSID', 72);    /* OLE GUID */
52
-define('PT_BINARY', 258);   /* Uninterpreted (counted byte array) */
34
+define('MVI_FLAG', MV_FLAG|MV_INSTANCE);
35
+
36
+define('PT_UNSPECIFIED', 0); /* (Reserved for interface use) type doesn't matter to caller */
37
+define('PT_NULL', 1); /* NULL property value */
38
+define('PT_I2', 2); /* Signed 16-bit value */
39
+define('PT_LONG', 3); /* Signed 32-bit value */
40
+define('PT_R4', 4); /* 4-byte floating point */
41
+define('PT_DOUBLE', 5); /* Floating point double */
42
+define('PT_CURRENCY', 6); /* Signed 64-bit int (decimal w/    4 digits right of decimal pt) */
43
+define('PT_APPTIME', 7); /* Application time */
44
+define('PT_ERROR', 10); /* 32-bit error value */
45
+define('PT_BOOLEAN', 11); /* 16-bit boolean (non-zero true) */
46
+define('PT_OBJECT', 13); /* Embedded object in a property */
47
+define('PT_I8', 20); /* 8-byte signed integer */
48
+define('PT_STRING8', 30); /* Null terminated 8-bit character string */
49
+define('PT_UNICODE', 31); /* Null terminated Unicode string */
50
+define('PT_SYSTIME', 64); /* FILETIME 64-bit int w/ number of 100ns periods since Jan 1,1601 */
51
+define('PT_CLSID', 72); /* OLE GUID */
52
+define('PT_BINARY', 258); /* Uninterpreted (counted byte array) */
53 53
 /* Changes are likely to these numbers, and to their structures. */
54 54
 
55 55
 /* Alternate property type names for ease of use */
@@ -61,18 +61,18 @@  discard block
 block discarded – undo
61 61
 
62 62
 define('PT_TSTRING', PT_STRING8);
63 63
 
64
-define('PT_MV_I2', (MV_FLAG | PT_I2));
65
-define('PT_MV_LONG', (MV_FLAG | PT_LONG));
66
-define('PT_MV_R4', (MV_FLAG | PT_R4));
67
-define('PT_MV_DOUBLE', (MV_FLAG | PT_DOUBLE));
68
-define('PT_MV_CURRENCY', (MV_FLAG | PT_CURRENCY));
69
-define('PT_MV_APPTIME', (MV_FLAG | PT_APPTIME));
70
-define('PT_MV_SYSTIME', (MV_FLAG | PT_SYSTIME));
71
-define('PT_MV_STRING8', (MV_FLAG | PT_STRING8));
72
-define('PT_MV_BINARY', (MV_FLAG | PT_BINARY));
73
-define('PT_MV_UNICODE', (MV_FLAG | PT_UNICODE));
74
-define('PT_MV_CLSID', (MV_FLAG | PT_CLSID));
75
-define('PT_MV_I8', (MV_FLAG | PT_I8));
64
+define('PT_MV_I2', (MV_FLAG|PT_I2));
65
+define('PT_MV_LONG', (MV_FLAG|PT_LONG));
66
+define('PT_MV_R4', (MV_FLAG|PT_R4));
67
+define('PT_MV_DOUBLE', (MV_FLAG|PT_DOUBLE));
68
+define('PT_MV_CURRENCY', (MV_FLAG|PT_CURRENCY));
69
+define('PT_MV_APPTIME', (MV_FLAG|PT_APPTIME));
70
+define('PT_MV_SYSTIME', (MV_FLAG|PT_SYSTIME));
71
+define('PT_MV_STRING8', (MV_FLAG|PT_STRING8));
72
+define('PT_MV_BINARY', (MV_FLAG|PT_BINARY));
73
+define('PT_MV_UNICODE', (MV_FLAG|PT_UNICODE));
74
+define('PT_MV_CLSID', (MV_FLAG|PT_CLSID));
75
+define('PT_MV_I8', (MV_FLAG|PT_I8));
76 76
 
77 77
 define('PT_MV_TSTRING', PT_MV_STRING8);
78 78
 /* bit 0: set if descending, clear if ascending */
@@ -190,14 +190,14 @@  discard block
 block discarded – undo
190 190
 
191 191
 /* Values for PR_RESOURCE_TYPE, _METHODS, _FLAGS */
192 192
 
193
-define('MAPI_STORE_PROVIDER', 33);    /* Message Store */
194
-define('MAPI_AB', 34);    /* Address Book */
195
-define('MAPI_AB_PROVIDER', 35);    /* Address Book Provider */
196
-define('MAPI_TRANSPORT_PROVIDER', 36);    /* Transport Provider */
197
-define('MAPI_SPOOLER', 37);    /* Message Spooler */
198
-define('MAPI_PROFILE_PROVIDER', 38);    /* Profile Provider */
199
-define('MAPI_SUBSYSTEM', 39);    /* Overall Subsystem Status */
200
-define('MAPI_HOOK_PROVIDER', 40);    /* Spooler Hook */
193
+define('MAPI_STORE_PROVIDER', 33); /* Message Store */
194
+define('MAPI_AB', 34); /* Address Book */
195
+define('MAPI_AB_PROVIDER', 35); /* Address Book Provider */
196
+define('MAPI_TRANSPORT_PROVIDER', 36); /* Transport Provider */
197
+define('MAPI_SPOOLER', 37); /* Message Spooler */
198
+define('MAPI_PROFILE_PROVIDER', 38); /* Profile Provider */
199
+define('MAPI_SUBSYSTEM', 39); /* Overall Subsystem Status */
200
+define('MAPI_HOOK_PROVIDER', 40); /* Spooler Hook */
201 201
 define('STATUS_VALIDATE_STATE', 0x00000001);
202 202
 define('STATUS_SETTINGS_DIALOG', 0x00000002);
203 203
 define('STATUS_CHANGE_PASSWORD', 0x00000004);
@@ -243,10 +243,10 @@  discard block
 block discarded – undo
243 243
 define('MODRECIP_MODIFY', 0x00000004);
244 244
 define('MODRECIP_REMOVE', 0x00000008);
245 245
 
246
-define('MAPI_ORIG', 0);          /* Recipient is message originator */
247
-define('MAPI_TO', 1);          /* Recipient is a primary recipient */
248
-define('MAPI_CC', 2);          /* Recipient is a copy recipient */
249
-define('MAPI_BCC', 3);          /* Recipient is blind copy recipient */
246
+define('MAPI_ORIG', 0); /* Recipient is message originator */
247
+define('MAPI_TO', 1); /* Recipient is a primary recipient */
248
+define('MAPI_CC', 2); /* Recipient is a copy recipient */
249
+define('MAPI_BCC', 3); /* Recipient is blind copy recipient */
250 250
 
251 251
 /* IAttach Interface ------------------------------------------------------- */
252 252
 
@@ -438,23 +438,23 @@  discard block
 block discarded – undo
438 438
 define('BMR_NEZ', 0x00000001);
439 439
 
440 440
 /* array index values of restrictions -- same values are used in php-ext/main.cpp::PHPArraytoSRestriction() */
441
-define('VALUE', 0);        // propval
442
-define('RELOP', 1);        // compare method
443
-define('FUZZYLEVEL', 2);        // string search flags
444
-define('CB', 3);        // size restriction
445
-define('ULTYPE', 4);        // bit mask restriction type BMR_xxx
446
-define('ULMASK', 5);        // bitmask
447
-define('ULPROPTAG', 6);        // property
448
-define('ULPROPTAG1', 7);        // RES_COMPAREPROPS 1st property
449
-define('ULPROPTAG2', 8);        // RES_COMPAREPROPS 2nd property
450
-define('PROPS', 9);        // RES_COMMENT properties
451
-define('RESTRICTION', 10);       // RES_COMMENT and RES_SUBRESTRICTION restriction
441
+define('VALUE', 0); // propval
442
+define('RELOP', 1); // compare method
443
+define('FUZZYLEVEL', 2); // string search flags
444
+define('CB', 3); // size restriction
445
+define('ULTYPE', 4); // bit mask restriction type BMR_xxx
446
+define('ULMASK', 5); // bitmask
447
+define('ULPROPTAG', 6); // property
448
+define('ULPROPTAG1', 7); // RES_COMPAREPROPS 1st property
449
+define('ULPROPTAG2', 8); // RES_COMPAREPROPS 2nd property
450
+define('PROPS', 9); // RES_COMMENT properties
451
+define('RESTRICTION', 10); // RES_COMMENT and RES_SUBRESTRICTION restriction
452 452
 
453 453
 /* GUID's for PR_MDB_PROVIDER */
454
-define("ZARAFA_SERVICE_GUID", makeGuid("{3C253DCA-D227-443C-94FE-425FAB958C19}"));    // default store
455
-define("ZARAFA_STORE_PUBLIC_GUID", makeGuid("{70FAB278-F7AF-CD11-9BC8-00AA002FC45A}"));    // public store
456
-define("ZARAFA_STORE_DELEGATE_GUID", makeGuid("{7C7C1085-BC6D-4E53-9DAB-8A53F8DEF808}"));    // other store
457
-define('ZARAFA_STORE_ARCHIVER_GUID', makeGuid("{BC8953AD-2E3F-4172-9404-896FF459870F}"));    // archive store
454
+define("ZARAFA_SERVICE_GUID", makeGuid("{3C253DCA-D227-443C-94FE-425FAB958C19}")); // default store
455
+define("ZARAFA_STORE_PUBLIC_GUID", makeGuid("{70FAB278-F7AF-CD11-9BC8-00AA002FC45A}")); // public store
456
+define("ZARAFA_STORE_DELEGATE_GUID", makeGuid("{7C7C1085-BC6D-4E53-9DAB-8A53F8DEF808}")); // other store
457
+define('ZARAFA_STORE_ARCHIVER_GUID', makeGuid("{BC8953AD-2E3F-4172-9404-896FF459870F}")); // archive store
458 458
 
459 459
 /* global profile section guid */
460 460
 define('pbGlobalProfileSectionGuid', makeGuid("{C8B0DB13-05AA-1A10-9BB0-00AA002FC45A}"));
@@ -481,10 +481,10 @@  discard block
 block discarded – undo
481 481
 // define('ecrightsContact'                       ,0x00000200);
482 482
 define('ecRightsFolderVisible', 0x00000400);
483 483
 
484
-define('ecRightsAll', ecRightsReadAny | ecRightsCreate | ecRightsEditOwned | ecRightsDeleteOwned | ecRightsEditAny | ecRightsDeleteAny | ecRightsCreateSubfolder | ecRightsFolderAccess | ecRightsFolderVisible);
485
-define('ecRightsFullControl', ecRightsReadAny | ecRightsCreate | ecRightsEditOwned | ecRightsDeleteOwned | ecRightsEditAny | ecRightsDeleteAny | ecRightsCreateSubfolder | ecRightsFolderVisible);
486
-define('ecRightsDefault', ecRightsNone | ecRightsFolderVisible);
487
-define('ecRightsDefaultPublic', ecRightsReadAny | ecRightsFolderVisible);
484
+define('ecRightsAll', ecRightsReadAny|ecRightsCreate|ecRightsEditOwned|ecRightsDeleteOwned|ecRightsEditAny|ecRightsDeleteAny|ecRightsCreateSubfolder|ecRightsFolderAccess|ecRightsFolderVisible);
485
+define('ecRightsFullControl', ecRightsReadAny|ecRightsCreate|ecRightsEditOwned|ecRightsDeleteOwned|ecRightsEditAny|ecRightsDeleteAny|ecRightsCreateSubfolder|ecRightsFolderVisible);
486
+define('ecRightsDefault', ecRightsNone|ecRightsFolderVisible);
487
+define('ecRightsDefaultPublic', ecRightsReadAny|ecRightsFolderVisible);
488 488
 define('ecRightsAdmin', 0x00001000);
489 489
 define('ecRightsAllMask', 0x000015FB);
490 490
 
@@ -500,7 +500,7 @@  discard block
 block discarded – undo
500 500
 define('ROW_ADD', 0x0001);
501 501
 define('ROW_MODIFY', 0x0002);
502 502
 define('ROW_REMOVE', 0x0004);
503
-define('ROW_EMPTY', (ROW_ADD | ROW_REMOVE));
503
+define('ROW_EMPTY', (ROW_ADD|ROW_REMOVE));
504 504
 
505 505
 // new property types
506 506
 define('PT_SRESTRICTION', 0x00FD);
@@ -570,38 +570,38 @@  discard block
 block discarded – undo
570 570
 define('SYNC_NO_FOREIGN_KEYS', 0x100);
571 571
 define('SYNC_LIMITED_IMESSAGE', 0x200);
572 572
 define('SYNC_CATCHUP', 0x400);
573
-define('SYNC_NEW_MESSAGE', 0x800);         // only applicable to ImportMessageChange()
574
-define('SYNC_MSG_SELECTIVE', 0x1000);        // Used internally.      Will reject if used by clients.
573
+define('SYNC_NEW_MESSAGE', 0x800); // only applicable to ImportMessageChange()
574
+define('SYNC_MSG_SELECTIVE', 0x1000); // Used internally.      Will reject if used by clients.
575 575
 define('SYNC_BEST_BODY', 0x2000);
576 576
 define('SYNC_IGNORE_SPECIFIED_ON_ASSOCIATED', 0x4000);
577
-define('SYNC_PROGRESS_MODE', 0x8000);        // AirMapi progress mode
577
+define('SYNC_PROGRESS_MODE', 0x8000); // AirMapi progress mode
578 578
 define('SYNC_FXRECOVERMODE', 0x10000);
579 579
 define('SYNC_DEFER_CONFIG', 0x20000);
580
-define('SYNC_FORCE_UNICODE', 0x40000);       // Forces server to return Unicode properties
581
-define('SYNC_STATE_READONLY', 0x80000);       // Server will not update the states in the DB, setting up exporter with this flag states are read only
580
+define('SYNC_FORCE_UNICODE', 0x40000); // Forces server to return Unicode properties
581
+define('SYNC_STATE_READONLY', 0x80000); // Server will not update the states in the DB, setting up exporter with this flag states are read only
582 582
 
583
-define('EMS_AB_ADDRESS_LOOKUP', 0x00000001);    // Flag for resolvename to resolve only exact matches
583
+define('EMS_AB_ADDRESS_LOOKUP', 0x00000001); // Flag for resolvename to resolve only exact matches
584 584
 
585
-define('TBL_BATCH', 0x00000002);    // Batch multiple table commands
585
+define('TBL_BATCH', 0x00000002); // Batch multiple table commands
586 586
 
587 587
 /* Flags for recipients in exceptions */
588
-define('recipSendable', 0x00000001);    // sendable attendee.
589
-define('recipOrganizer', 0x00000002);    // meeting organizer
590
-define('recipExceptionalResponse', 0x00000010);    // attendee gave a response for the exception
591
-define('recipExceptionalDeleted', 0x00000020);    // recipientRow exists, but it is treated as if the corresponding recipient is deleted from meeting
592
-define('recipOriginal', 0x00000100);    // recipient is an original Attendee
588
+define('recipSendable', 0x00000001); // sendable attendee.
589
+define('recipOrganizer', 0x00000002); // meeting organizer
590
+define('recipExceptionalResponse', 0x00000010); // attendee gave a response for the exception
591
+define('recipExceptionalDeleted', 0x00000020); // recipientRow exists, but it is treated as if the corresponding recipient is deleted from meeting
592
+define('recipOriginal', 0x00000100); // recipient is an original Attendee
593 593
 define('recipReserved', 0x00000200);
594 594
 
595 595
 /* Flags which indicates type of Meeting Object */
596
-define('mtgEmpty', 0x00000000);    // Unspecified.
597
-define('mtgRequest', 0x00000001);    // Initial meeting request.
598
-define('mtgFull', 0x00010000);    // Full update.
599
-define('mtgInfo', 0x00020000);    // Informational update.
600
-define('mtgOutOfDate', 0x00080000);    // A newer Meeting Request object or Meeting Update object was received after this one.
601
-define('mtgDelegatorCopy', 0x00100000);    // This is set on the delegator's copy when a delegate will handle meeting-related objects.
602
-
603
-define('MAPI_ONE_OFF_UNICODE', 0x8000);        // the flag that defines whether the embedded strings are Unicode in one off entryids.
604
-define('MAPI_ONE_OFF_NO_RICH_INFO', 0x0001);        // the flag that specifies whether the recipient gets TNEF or not.
596
+define('mtgEmpty', 0x00000000); // Unspecified.
597
+define('mtgRequest', 0x00000001); // Initial meeting request.
598
+define('mtgFull', 0x00010000); // Full update.
599
+define('mtgInfo', 0x00020000); // Informational update.
600
+define('mtgOutOfDate', 0x00080000); // A newer Meeting Request object or Meeting Update object was received after this one.
601
+define('mtgDelegatorCopy', 0x00100000); // This is set on the delegator's copy when a delegate will handle meeting-related objects.
602
+
603
+define('MAPI_ONE_OFF_UNICODE', 0x8000); // the flag that defines whether the embedded strings are Unicode in one off entryids.
604
+define('MAPI_ONE_OFF_NO_RICH_INFO', 0x0001); // the flag that specifies whether the recipient gets TNEF or not.
605 605
 
606 606
 /* Mask flags for mapi_msgstore_advise */
607 607
 define('fnevCriticalError', 0x00000001);
Please login to merge, or discard this patch.
lib/syncobjects/syncprovisioning.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -236,7 +236,7 @@
 block discarded – undo
236 236
 					self::STREAMER_VAR => "unapprovedinromapplist",
237 237
 					self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
238 238
 					self::STREAMER_ARRAY => SYNC_PROVISION_APPNAME,
239
-				],  // TODO check
239
+				], // TODO check
240 240
 				SYNC_PROVISION_APPROVEDAPPLIST => [
241 241
 					self::STREAMER_VAR => "approvedapplist",
242 242
 					self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
Please login to merge, or discard this patch.
lib/grommunio/mapiutils.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 					],
143 143
 				], // EXISTS OR
144 144
 			],
145
-		];        // global OR
145
+		]; // global OR
146 146
 	}
147 147
 
148 148
 	/**
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 						[
179 179
 							RES_CONTENT,
180 180
 							[
181
-								FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
181
+								FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE,
182 182
 								ULPROPTAG => PR_DISPLAY_NAME,
183 183
 								VALUE => $query,
184 184
 							],
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 						[
187 187
 							RES_CONTENT,
188 188
 							[
189
-								FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
189
+								FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE,
190 190
 								ULPROPTAG => PR_ACCOUNT,
191 191
 								VALUE => $query,
192 192
 							],
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 						[
195 195
 							RES_CONTENT,
196 196
 							[
197
-								FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
197
+								FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE,
198 198
 								ULPROPTAG => PR_SMTP_ADDRESS,
199 199
 								VALUE => $query,
200 200
 							],
@@ -678,7 +678,7 @@  discard block
 block discarded – undo
678 678
 				PR_SENT_REPRESENTING_ENTRYID => $props[PR_SENT_REPRESENTING_ENTRYID],
679 679
 				PR_SENT_REPRESENTING_SEARCH_KEY => $props[PR_SENT_REPRESENTING_SEARCH_KEY],
680 680
 				// mark the message as read if the main message has read flag
681
-				PR_MESSAGE_FLAGS => $read ? $mprops[PR_MESSAGE_FLAGS] | MSGFLAG_READ : $mprops[PR_MESSAGE_FLAGS],
681
+				PR_MESSAGE_FLAGS => $read ? $mprops[PR_MESSAGE_FLAGS]|MSGFLAG_READ : $mprops[PR_MESSAGE_FLAGS],
682 682
 			]);
683 683
 		}
684 684
 		// TODO check if we need to do this for encrypted (and signed?) message as well
@@ -749,13 +749,13 @@  discard block
 block discarded – undo
749 749
 		$entryId = strtoupper($entryid);
750 750
 
751 751
 		$res = [
752
-			'abFlags' => '',  // BYTE[4],  4 bytes,  8 hex characters
753
-			'guid' => '',  // GUID,    16 bytes, 32 hex characters
754
-			'version' => '',  // ULONG,    4 bytes,  8 hex characters
755
-			'type' => '',  // ULONG,    4 bytes,  8 hex characters
756
-			'id' => '',  // ULONG,    4 bytes,  8 hex characters
757
-			'server' => '',  // CHAR,    variable length
758
-			'padding' => '',  // TCHAR[3], 4 bytes,  8 hex characters (upto 4 bytes)
752
+			'abFlags' => '', // BYTE[4],  4 bytes,  8 hex characters
753
+			'guid' => '', // GUID,    16 bytes, 32 hex characters
754
+			'version' => '', // ULONG,    4 bytes,  8 hex characters
755
+			'type' => '', // ULONG,    4 bytes,  8 hex characters
756
+			'id' => '', // ULONG,    4 bytes,  8 hex characters
757
+			'server' => '', // CHAR,    variable length
758
+			'padding' => '', // TCHAR[3], 4 bytes,  8 hex characters (upto 4 bytes)
759 759
 		];
760 760
 
761 761
 		$res['length'] = strlen($entryId);
@@ -800,13 +800,13 @@  discard block
 block discarded – undo
800 800
 		$entryId = strtoupper($entryid);
801 801
 
802 802
 		$res = [
803
-			'abFlags' => '',  // BYTE[4],  4 bytes,  8 hex characters
804
-			'guid' => '',  // GUID,    16 bytes, 32 hex characters
805
-			'version' => '',  // ULONG,    4 bytes,  8 hex characters
806
-			'type' => '',  // ULONG,    4 bytes,  8 hex characters
807
-			'uniqueId' => '',  // ULONG,   16 bytes,  32 hex characters
808
-			'server' => '',  // CHAR,    variable length
809
-			'padding' => '',  // TCHAR[3], 4 bytes,  8 hex characters (upto 4 bytes)
803
+			'abFlags' => '', // BYTE[4],  4 bytes,  8 hex characters
804
+			'guid' => '', // GUID,    16 bytes, 32 hex characters
805
+			'version' => '', // ULONG,    4 bytes,  8 hex characters
806
+			'type' => '', // ULONG,    4 bytes,  8 hex characters
807
+			'uniqueId' => '', // ULONG,   16 bytes,  32 hex characters
808
+			'server' => '', // CHAR,    variable length
809
+			'padding' => '', // TCHAR[3], 4 bytes,  8 hex characters (upto 4 bytes)
810 810
 		];
811 811
 
812 812
 		$res['length'] = strlen($entryId);
Please login to merge, or discard this patch.
lib/grommunio/exporter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 
107 107
 		// change exporterflags if we are doing a ContentExport
108 108
 		if ($this->folderid) {
109
-			$this->exporterflags |= SYNC_NORMAL | SYNC_READ_STATE;
109
+			$this->exporterflags |= SYNC_NORMAL|SYNC_READ_STATE;
110 110
 
111 111
 			// Initial sync, we don't want deleted items. If the initial sync is chunked
112 112
 			// we check the change ID of the syncstate (0 at initial sync)
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 				if (!($this->flags & BACKEND_DISCARD_DATA)) {
116 116
 					SLog::Write(LOGLEVEL_DEBUG, "ExportChangesICS->Config(): syncing initial data");
117 117
 				}
118
-				$this->exporterflags |= SYNC_NO_SOFT_DELETIONS | SYNC_NO_DELETIONS;
118
+				$this->exporterflags |= SYNC_NO_SOFT_DELETIONS|SYNC_NO_DELETIONS;
119 119
 			}
120 120
 		}
121 121
 
Please login to merge, or discard this patch.
lib/core/gsyncdefs.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -984,7 +984,7 @@
 block discarded – undo
984 984
 define("LOGLEVEL_DEVICEID", 64);
985 985
 define("LOGLEVEL_WBXMLSTACK", 128);
986 986
 
987
-define("LOGLEVEL_ALL", LOGLEVEL_FATAL | LOGLEVEL_ERROR | LOGLEVEL_WARN | LOGLEVEL_INFO | LOGLEVEL_DEBUG | LOGLEVEL_WBXML);
987
+define("LOGLEVEL_ALL", LOGLEVEL_FATAL|LOGLEVEL_ERROR|LOGLEVEL_WARN|LOGLEVEL_INFO|LOGLEVEL_DEBUG|LOGLEVEL_WBXML);
988 988
 
989 989
 define("BACKEND_DISCARD_DATA", 1);
990 990
 
Please login to merge, or discard this patch.
lib/core/contentparameters.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 		}
75 75
 
76 76
 		$asb = new BodyPreference();
77
-		$arr = (array) $this->bodypref;
77
+		$arr = (array)$this->bodypref;
78 78
 		$arr[$type] = $asb;
79 79
 		$this->bodypref = $arr;
80 80
 
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 		}
99 99
 
100 100
 		$asb = new BodyPartPreference();
101
-		$arr = (array) $this->bodypartpref;
101
+		$arr = (array)$this->bodypartpref;
102 102
 		$arr[$type] = $asb;
103 103
 		$this->bodypartpref = $arr;
104 104
 
Please login to merge, or discard this patch.