grommunio / grommunio-web

server/includes/core/class.properties.php

Spacing +21 added lines, -21 removed lines

@@ -247,14 +247,14 @@ 
 				$properties["reminderset"] = "PT_BOOLEAN:PSETID_Common:0x8503";
 				$properties["flag_request"] = "PT_STRING8:PSETID_Common:0x8530";
 				$properties["flag_due_by"] = "PT_SYSTIME:PSETID_Common:0x8560";
-				$properties["updatecounter"] = "PT_LONG:PSETID_Appointment:0x8201";                                     // AppointmentSequenceNumber
-				$properties["last_updatecounter"] = "PT_LONG:PSETID_Appointment:0x8203";                        // AppointmentLastSequence
+				$properties["updatecounter"] = "PT_LONG:PSETID_Appointment:0x8201"; // AppointmentSequenceNumber
+				$properties["last_updatecounter"] = "PT_LONG:PSETID_Appointment:0x8203"; // AppointmentLastSequence
 				$properties["busystatus"] = "PT_LONG:PSETID_Appointment:0x8205";
 				$properties["intendedbusystatus"] = "PT_LONG:PSETID_Appointment:0x8224";
 				$properties["start"] = "PT_SYSTIME:PSETID_Appointment:0x820d";
 				$properties["responselocation"] = "PT_STRING8:PSETID_Meeting:0x2";
 				$properties["location"] = "PT_STRING8:PSETID_Appointment:0x8208";
-				$properties["requestsent"] = "PT_BOOLEAN:PSETID_Appointment:0x8229";            // PidLidFInvited, MeetingRequestWasSent
+				$properties["requestsent"] = "PT_BOOLEAN:PSETID_Appointment:0x8229"; // PidLidFInvited, MeetingRequestWasSent
 				$properties["startdate"] = "PT_SYSTIME:PSETID_Appointment:0x820d";
 				$properties["duedate"] = "PT_SYSTIME:PSETID_Appointment:0x820e";
 				$properties["commonstart"] = "PT_SYSTIME:PSETID_Common:0x8516";
@@ -262,11 +262,11 @@ 
 				$properties["recurring"] = "PT_BOOLEAN:PSETID_Appointment:0x8223";
 				$properties["clipstart"] = "PT_SYSTIME:PSETID_Appointment:0x8235";
 				$properties["clipend"] = "PT_SYSTIME:PSETID_Appointment:0x8236";
-				$properties["start_recur_date"] = "PT_LONG:PSETID_Meeting:0xD";                         // StartRecurTime
-				$properties["start_recur_time"] = "PT_LONG:PSETID_Meeting:0xE";                         // StartRecurTime
-				$properties["end_recur_date"] = "PT_LONG:PSETID_Meeting:0xF";                           // EndRecurDate
-				$properties["end_recur_time"] = "PT_LONG:PSETID_Meeting:0x10";                          // EndRecurTime
-				$properties["is_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA";                          // LID_IS_EXCEPTION
+				$properties["start_recur_date"] = "PT_LONG:PSETID_Meeting:0xD"; // StartRecurTime
+				$properties["start_recur_time"] = "PT_LONG:PSETID_Meeting:0xE"; // StartRecurTime
+				$properties["end_recur_date"] = "PT_LONG:PSETID_Meeting:0xF"; // EndRecurDate
+				$properties["end_recur_time"] = "PT_LONG:PSETID_Meeting:0x10"; // EndRecurTime
+				$properties["is_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA"; // LID_IS_EXCEPTION
 				// Propose new time properties
 				$properties["proposed_start_whole"] = "PT_SYSTIME:PSETID_Appointment:0x8250";
 				$properties["proposed_end_whole"] = "PT_SYSTIME:PSETID_Appointment:0x8251";
@@ -639,7 +639,7 @@ 
 				$properties = [];
 				$properties["entryid"] = PR_ENTRYID;
 				$properties["parent_entryid"] = PR_PARENT_ENTRYID;
-				$properties["store_entryid"] = PR_STORE_ENTRYID;	// is this required ???
+				$properties["store_entryid"] = PR_STORE_ENTRYID; // is this required ???
 				$properties["icon_index"] = PR_ICON_INDEX;
 				$properties["message_class"] = PR_MESSAGE_CLASS;
 				$properties["message_flags"] = PR_MESSAGE_FLAGS;
@@ -955,9 +955,9 @@ 
 				$properties["appointment_location"] = "PT_STRING8:PSETID_Appointment:0x8208";
 				$properties["appointment_recurring_pattern"] = "PT_STRING8:PSETID_Appointment:0x8232";
 				$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:0x8223";
-				$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:0x8235";	// ClipStart
-				$properties["appointment_enddate_recurring"] = "PT_SYSTIME:PSETID_Appointment:0x8236";		// ClipEnd
-				$properties["appointment_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA";						// LID_IS_EXCEPTION
+				$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:0x8235"; // ClipStart
+				$properties["appointment_enddate_recurring"] = "PT_SYSTIME:PSETID_Appointment:0x8236"; // ClipEnd
+				$properties["appointment_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA"; // LID_IS_EXCEPTION
 				$properties["appointment_location"] = "PT_STRING8:PSETID_Appointment:0x8208";
 				// Propose new time properties
 				$properties["proposed_start_date"] = "PT_SYSTIME:PSETID_Appointment:0x8250";
@@ -1243,18 +1243,18 @@ 
 				$properties["subject"] = PR_SUBJECT;
 				$properties["object_type"] = PR_OBJECT_TYPE;
 
-				$properties["reminder"] = "PT_BOOLEAN:PSETID_Common:0x8503";				// PidLidReminderSet
-				$properties["reminder_minutes"] = "PT_LONG:PSETID_Common:0x8501";			// PidLidReminderDelta
-				$properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:0x8502";			// PidLidReminderTime
-				$properties["flagdueby"] = "PT_SYSTIME:PSETID_Common:0x8560";				// PidLidReminderSignalTime
+				$properties["reminder"] = "PT_BOOLEAN:PSETID_Common:0x8503"; // PidLidReminderSet
+				$properties["reminder_minutes"] = "PT_LONG:PSETID_Common:0x8501"; // PidLidReminderDelta
+				$properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:0x8502"; // PidLidReminderTime
+				$properties["flagdueby"] = "PT_SYSTIME:PSETID_Common:0x8560"; // PidLidReminderSignalTime
 
-				$properties["task_duedate"] = "PT_SYSTIME:PSETID_Task:0x8105";				// PidLidTaskDueDate
-				$properties["task_startdate"] = "PT_SYSTIME:PSETID_Task:0x8104";			// PidLidTaskStartDate
-				$properties["task_resetreminder"] = "PT_BOOLEAN:PSETID_Task:0x8107";		// PidLidTaskResetReminder
-				$properties["task_recurring"] = "PT_BOOLEAN:PSETID_Task:0x8126";			// PidLidTaskFRecurring
+				$properties["task_duedate"] = "PT_SYSTIME:PSETID_Task:0x8105"; // PidLidTaskDueDate
+				$properties["task_startdate"] = "PT_SYSTIME:PSETID_Task:0x8104"; // PidLidTaskStartDate
+				$properties["task_resetreminder"] = "PT_BOOLEAN:PSETID_Task:0x8107"; // PidLidTaskResetReminder
+				$properties["task_recurring"] = "PT_BOOLEAN:PSETID_Task:0x8126"; // PidLidTaskFRecurring
 				$properties["taskmode"] = "PT_LONG:PSETID_Common:0x8518";
 
-				$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:0x8223";			// PidLidRecurring
+				$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:0x8223"; // PidLidRecurring
 				$properties["appointment_startdate"] = "PT_SYSTIME:PSETID_Appointment:0x820d";
 				$properties["appointment_enddate"] = "PT_SYSTIME:PSETID_Appointment:0x820e";
 				$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:0x8235";

server/includes/core/class.mapisession.php

Spacing +2 added lines, -2 removed lines

@@ -1074,7 +1074,7 @@ 
 						// Postfix display name of every contact folder with respective owner name
 						// it is mandatory to keep display-name different
 						$userStoreProps = mapi_getprops($openedUserStore, [PR_MAILBOX_OWNER_NAME]);
-						for ($i = 0,$len = count($userContactFolders); $i < $len; ++$i) {
+						for ($i = 0, $len = count($userContactFolders); $i < $len; ++$i) {
 							$userContactFolders[$i][PR_DISPLAY_NAME] = $userContactFolders[$i][PR_DISPLAY_NAME] . " - " . $userStoreProps[PR_MAILBOX_OWNER_NAME];
 						}
 
@@ -1098,7 +1098,7 @@ 
 
 				// Create the lists of store entryids, folder entryids and folder names to be added
 				// to the profile section
-				for ($i = 0,$len = count($contactFolders); $i < $len; ++$i) {
+				for ($i = 0, $len = count($contactFolders); $i < $len; ++$i) {
 					$contact_store_entryids[] = $contactFolders[$i][PR_STORE_ENTRYID];
 					$contact_folder_entryids[] = $contactFolders[$i][PR_ENTRYID];
 					$contact_folder_names[] = $contactFolders[$i][PR_DISPLAY_NAME];

server/includes/core/constants.php

Spacing +7 added lines, -7 removed lines

@@ -26,17 +26,17 @@
 
 	// used by distribution lists
 	define("DL_GUID", pack("H*", "C091ADD3519DCF11A4A900AA0047FAA4"));
-	define("DL_USER", 0xC3);		//	195
-	define("DL_USER2", 0xD3);		//	211
-	define("DL_USER3", 0xE3);		//	227
+	define("DL_USER", 0xC3); //	195
+	define("DL_USER2", 0xD3); //	211
+	define("DL_USER3", 0xE3); //	227
 	/*
 	 * According to Exchange protocol, type property for oneoff contact
 	 * will be 0x00.
 	 */
-	define("DL_EXTERNAL_MEMBER", 0x00);		//	0
-	define("DL_DIST", 0xB4);		//	180
-	define("DL_USER_AB", 0xB5);		//	181
-	define("DL_DIST_AB", 0xB6);		//	182
+	define("DL_EXTERNAL_MEMBER", 0x00); //	0
+	define("DL_DIST", 0xB4); //	180
+	define("DL_USER_AB", 0xB5); //	181
+	define("DL_DIST_AB", 0xB6); //	182
 
 	// @FIXME these needs to be changed in mapitags.php
 

server/includes/core/class.configcheck.php

Spacing +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
 
 		# Replicate value logic from php-src/ext/zlib/zlib.c
 		$sv = ini_get("zlib.output_compression");
-		$sv = strcasecmp($sv, "on") == 0 ? 1 :
-			  (strcasecmp($sv, "off") == 0 ? 0 : intval($sv));
+		$sv = strcasecmp($sv, "on") == 0 ? 1 : (strcasecmp($sv, "off") == 0 ? 0 : intval($sv));
 		if ($sv != 0) {
 			$this->error_config("zlib.output_compression", "off", "With this option enabled, it could occur that XMLHTTP requests will fail");
 		}

server/includes/core/class.language.php

Spacing +2 added lines, -2 removed lines

@@ -389,7 +389,7 @@ 
 				if ($data_orig_strs[$i]['length'] > 0) {	// fread does not accept length=0
 					$length = $data_orig_strs[$i]['length'];
 					$orig_str = unpack('a' . $length . 'str', fread($fp, $length));
-					$translation_data[$i]['msgid'] = $orig_str['str'];	// unpack converts to array :S
+					$translation_data[$i]['msgid'] = $orig_str['str']; // unpack converts to array :S
 
 					// Find context in the original string
 					if (strpos($translation_data[$i]['msgid'], "\004") !== false) {
@@ -416,7 +416,7 @@ 
 				if ($data_transl_strs[$i]['length'] > 0) {	// fread does not accept length=0
 					$length = $data_transl_strs[$i]['length'];
 					$trans_str = unpack('a' . $length . 'str', fread($fp, $length));
-					$translation_data[$i]['msgstr'] = $trans_str['str'];	// unpack converts to array :S
+					$translation_data[$i]['msgstr'] = $trans_str['str']; // unpack converts to array :S
 
 					// If there are plural forms in the source string,
 					// then the translated string must contain plural

server/includes/core/class.entryid.php

Spacing +35 added lines, -36 removed lines

@@ -55,13 +55,13 @@ 
 			$entryId = strtoupper($entryid);
 
 			$res = [
-				'abFlags' => '',		// BYTE[4],   4 bytes,  8 hex characters
-				'guid' => '',		// GUID,     16 bytes, 32 hex characters
-				'version' => '',		// ULONG,     4 bytes,  8 hex characters
-				'type' => '',		// ULONG,     4 bytes,  8 hex characters
-				'uniqueId' => '',		// ULONG,    16 bytes,  32 hex characters
-				'server' => '',		// CHAR,     variable length
-				'padding' => '',		// TCHAR[3],  4 bytes,  8 hex characters (upto 4 bytes)
+				'abFlags' => '', // BYTE[4],   4 bytes,  8 hex characters
+				'guid' => '', // GUID,     16 bytes, 32 hex characters
+				'version' => '', // ULONG,     4 bytes,  8 hex characters
+				'type' => '', // ULONG,     4 bytes,  8 hex characters
+				'uniqueId' => '', // ULONG,    16 bytes,  32 hex characters
+				'server' => '', // CHAR,     variable length
+				'padding' => '', // TCHAR[3],  4 bytes,  8 hex characters (upto 4 bytes)
 			];
 
 			$res['length'] = strlen($entryId);
@@ -100,13 +100,13 @@ 
 			$entryId = strtoupper($entryid);
 
 			$res = [
-				'abFlags' => '',		// BYTE[4],   4 bytes,  8 hex characters
-				'guid' => '',		// GUID,     16 bytes, 32 hex characters
-				'version' => '',		// ULONG,     4 bytes,  8 hex characters
-				'type' => '',		// ULONG,     4 bytes,  8 hex characters
-				'id' => '',		// ULONG,     4 bytes,  8 hex characters
-				'server' => '',		// CHAR,     variable length
-				'padding' => '',		// TCHAR[3],  4 bytes,  8 hex characters (upto 4 bytes)
+				'abFlags' => '', // BYTE[4],   4 bytes,  8 hex characters
+				'guid' => '', // GUID,     16 bytes, 32 hex characters
+				'version' => '', // ULONG,     4 bytes,  8 hex characters
+				'type' => '', // ULONG,     4 bytes,  8 hex characters
+				'id' => '', // ULONG,     4 bytes,  8 hex characters
+				'server' => '', // CHAR,     variable length
+				'padding' => '', // TCHAR[3],  4 bytes,  8 hex characters (upto 4 bytes)
 			];
 
 			$res['length'] = strlen($entryId);
@@ -185,13 +185,13 @@ 
 			$entryId = strtoupper($entryId);
 
 			$res = [
-				'abFlags' => '',		// BYTE[4],   4 bytes,  8 hex characters
-				'guid' => '',		// GUID,     16 bytes, 32 hex characters
-				'version' => '',		// ULONG,     4 bytes,  8 hex characters
-				'type' => '',		// ULONG,     4 bytes,  8 hex characters
-				'id' => '',		// ULONG,    16 bytes,  32 hex characters
-				'extid' => '',		// CHAR,     variable length
-				'padding' => '',		// TCHAR[3],  4 bytes,  8 hex characters (upto 4 bytes)
+				'abFlags' => '', // BYTE[4],   4 bytes,  8 hex characters
+				'guid' => '', // GUID,     16 bytes, 32 hex characters
+				'version' => '', // ULONG,     4 bytes,  8 hex characters
+				'type' => '', // ULONG,     4 bytes,  8 hex characters
+				'id' => '', // ULONG,    16 bytes,  32 hex characters
+				'extid' => '', // CHAR,     variable length
+				'padding' => '', // TCHAR[3],  4 bytes,  8 hex characters (upto 4 bytes)
 			];
 
 			$res['length'] = strlen($entryId);
@@ -636,8 +636,7 @@ 
 				}
 			}
 			elseif ($checkValue !== null && $val != $checkValue) {
-				$user = $GLOBALS["mapisession"] !== null ? $GLOBALS["mapisession"]->getUserName() :
-						"<mapisession not yet initialized>";
+				$user = $GLOBALS["mapisession"] !== null ? $GLOBALS["mapisession"]->getUserName() : "<mapisession not yet initialized>";
 				error_log(sprintf(
 					"Unexpected value in store entryid for user %s. Entryid: %s key: '%s' value: '%s' expected: %s",
 					$user,
@@ -667,13 +666,13 @@ 
 			$entryId = strtoupper($entryId);
 
 			$res = [
-				'providerguid' => '',			// GUID,     16 bytes, 32 hex characters
-				'messagetype' => '',			// UINT,      2 bytes,  4 hex characters
-				'folderdbguid' => '',			// GUID,     16 bytes, 32 hex characters
-				'foldercounter' => '',		// ULONG,     6 bytes, 12 hex characters
-				'padding' => '',					// TCHAR[3],  2 bytes,  4 hex characters
-				'messagedbguid' => '',		// GUID,     16 bytes, 32 hex characters
-				'messagecounter' => '',	// ULONG,     6 bytes, 12 hex characters
+				'providerguid' => '', // GUID,     16 bytes, 32 hex characters
+				'messagetype' => '', // UINT,      2 bytes,  4 hex characters
+				'folderdbguid' => '', // GUID,     16 bytes, 32 hex characters
+				'foldercounter' => '', // ULONG,     6 bytes, 12 hex characters
+				'padding' => '', // TCHAR[3],  2 bytes,  4 hex characters
+				'messagedbguid' => '', // GUID,     16 bytes, 32 hex characters
+				'messagecounter' => '', // ULONG,     6 bytes, 12 hex characters
 			];
 
 			if (!$entryId) {
@@ -733,12 +732,12 @@ 
 			$entryId = strtoupper($entryId);
 
 			$res = [
-				'abflags' => '',					// BYTE[4],   4 bytes,  8 hex characters
-				'providerguid' => '',			// GUID,     16 bytes, 32 hex characters
-				'foldertype' => '',				// UINT,      2 bytes,  4 hex characters
-				'folderdbguid' => '',			// GUID,     16 bytes, 32 hex characters
-				'foldercounter' => '',		// ULONG,     6 bytes, 12 hex characters
-				'padding' => '',					// TCHAR[3],  2 bytes,  4 hex characters
+				'abflags' => '', // BYTE[4],   4 bytes,  8 hex characters
+				'providerguid' => '', // GUID,     16 bytes, 32 hex characters
+				'foldertype' => '', // UINT,      2 bytes,  4 hex characters
+				'folderdbguid' => '', // GUID,     16 bytes, 32 hex characters
+				'foldercounter' => '', // ULONG,     6 bytes, 12 hex characters
+				'padding' => '', // TCHAR[3],  2 bytes,  4 hex characters
 			];
 
 			if (!$entryId) {

server/includes/mapi/mapi.util.php

Spacing +2 added lines, -2 removed lines

@@ -217,7 +217,7 @@ 
 		// OR
 		[RES_OR,
 			[
-				[RES_AND,	// Normal items: itemEnd must be after viewStart, itemStart must be before viewEnd
+				[RES_AND, // Normal items: itemEnd must be after viewStart, itemStart must be before viewEnd
 					[
 						[RES_PROPERTY,
 							[RELOP => RELOP_GT,
@@ -241,7 +241,7 @@ 
 					],
 				],
 			], // EXISTS OR
-		];		// global OR
+		]; // global OR
 
 	// Get requested properties, plus whatever we need
 	$proplist = [PR_ENTRYID, $properties["recurring"], $properties["recurring_data"], $properties["timezone_data"]];

server/includes/loader.php

Spacing +1 added lines, -1 removed lines

@@ -360,7 +360,7 @@
 			];
 			$fileDependencies[$filename] = [
 				'depends' => [],
-				'core' => $core,		// Based on tag or on class or on file path?
+				'core' => $core, // Based on tag or on class or on file path?
 			];
 
 			for ($j = 0, $lenJ = count($class[1]); $j < $lenJ; ++$j) {

plugins/files/php/Files/Backend/Webdav/sabredav/FilesWebDavClient.php

Spacing +2 added lines, -2 removed lines

@@ -58,8 +58,8 @@
 		curl_setopt($curl, CURLOPT_USERPWD, $this->userName . ":" . $this->password);
 		curl_setopt($curl, CURLOPT_FILE, $file_handle);
 		curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
-		curl_setopt($curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
-		curl_setopt($curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+		curl_setopt($curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS);
+		curl_setopt($curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS);
 
 		curl_exec($curl);