grommunio / grommunio-web

server/includes/core/class.language.php

Spacing +2 added lines, -2 removed lines

@@ -384,7 +384,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) {
@@ -411,7 +411,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

@@ -54,13 +54,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);
@@ -99,13 +99,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);
@@ -184,13 +184,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);
@@ -634,8 +634,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,
@@ -665,13 +664,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) {
@@ -731,12 +730,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/upload_attachment.php

Spacing +1 added lines, -1 removed lines

@@ -452,7 +452,7 @@
 		$props = [];
 
 		// Addresses field value.
-		$businessAddress = ($contactProps[$properties["business_address_street"]] ?? '' ) . "\n";
+		$businessAddress = ($contactProps[$properties["business_address_street"]] ?? '') . "\n";
 		$businessAddress .= ($contactProps[$properties["business_address_city"]] ?? '') . " ";
 		$businessAddress .= ($contactProps[$properties["business_address_state"]] ?? '') . " ";
 		$businessAddress .= ($contactProps[$properties["business_address_postal_code"]] ?? '') . "\n";

plugins/files/php/modules/class.fileslistmodule.php

Spacing +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
 		$backendDisplayName = $backend->backendDisplayName;
 		$backendVersion = $backend->backendVersion;
 		$cacheVersion = $this->getVersionFromCache($backendDisplayName, $accountID);
-		if(!is_string($cacheVersion)) {
+		if (!is_string($cacheVersion)) {
 			$cacheVersion = '0';
 		}
 		$dir = $this->getCache($accountID, $cachePath);

server/includes/core/class.properties.php

Spacing +22 added lines, -22 removed lines

@@ -247,14 +247,14 @@ 
 			$properties["reminderset"] = "PT_BOOLEAN:PSETID_Common:" . PidLidReminderSet;
 			$properties["flag_request"] = "PT_STRING8:PSETID_Common:" . PidLidFlagRequest;
 			$properties["flag_due_by"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderSignalTime;
-			$properties["updatecounter"] = "PT_LONG:PSETID_Appointment:" . PidLidAppointmentSequence;                                     // AppointmentSequenceNumber
-			$properties["last_updatecounter"] = "PT_LONG:PSETID_Appointment:0x8203";                        // AppointmentLastSequence
+			$properties["updatecounter"] = "PT_LONG:PSETID_Appointment:" . PidLidAppointmentSequence; // AppointmentSequenceNumber
+			$properties["last_updatecounter"] = "PT_LONG:PSETID_Appointment:0x8203"; // AppointmentLastSequence
 			$properties["busystatus"] = "PT_LONG:PSETID_Appointment:" . PidLidBusyStatus;
 			$properties["intendedbusystatus"] = "PT_LONG:PSETID_Appointment:" . PidLidIntendedBusyStatus;
 			$properties["start"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentStartWhole;
 			$properties["responselocation"] = "PT_STRING8:PSETID_Meeting:0x2";
 			$properties["location"] = "PT_STRING8:PSETID_Appointment:" . PidLidLocation;
-			$properties["requestsent"] = "PT_BOOLEAN:PSETID_Appointment:0x8229";            // PidLidFInvited, MeetingRequestWasSent
+			$properties["requestsent"] = "PT_BOOLEAN:PSETID_Appointment:0x8229"; // PidLidFInvited, MeetingRequestWasSent
 			$properties["startdate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentStartWhole;
 			$properties["duedate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentEndWhole;
 			$properties["commonstart"] = "PT_SYSTIME:PSETID_Common:0x8516";
@@ -262,11 +262,11 @@ 
 			$properties["recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;
 			$properties["clipstart"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart;
 			$properties["clipend"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipEnd;
-			$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:" . PidLidAppointmentProposedStartWhole;
 			$properties["proposed_end_whole"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentProposedEndWhole;
@@ -646,7 +646,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;
@@ -960,9 +960,9 @@ 
 			$properties["appointment_location"] = "PT_STRING8:PSETID_Appointment:" . PidLidLocation;
 			$properties["appointment_recurring_pattern"] = "PT_STRING8:PSETID_Appointment:" . PidLidRecurrencePattern;
 			$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;
-			$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart;	// ClipStart
-			$properties["appointment_enddate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipEnd;		// ClipEnd
-			$properties["appointment_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA";						// LID_IS_EXCEPTION
+			$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart; // ClipStart
+			$properties["appointment_enddate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipEnd; // ClipEnd
+			$properties["appointment_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA"; // LID_IS_EXCEPTION
 			$properties["appointment_location"] = "PT_STRING8:PSETID_Appointment:" . PidLidLocation;
 			$properties["alldayevent"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidAppointmentSubType;
 			$properties["tzdefstart"] = "PT_BINARY:PSETID_Appointment:" . PidLidAppointmentTimeZoneDefinitionStartDisplay;
@@ -1268,18 +1268,18 @@ 
 			$properties["object_type"] = PR_OBJECT_TYPE;
 
 			$properties["recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;
-			$properties["reminder"] = "PT_BOOLEAN:PSETID_Common:" . PidLidReminderSet;				// PidLidReminderSet
-			$properties["reminder_minutes"] = "PT_LONG:PSETID_Common:" . PidLidReminderDelta;			// PidLidReminderDelta
-			$properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderTime;			// PidLidReminderTime
-			$properties["flagdueby"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderSignalTime;				// PidLidReminderSignalTime
-
-			$properties["task_duedate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskDueDate;				// PidLidTaskDueDate
-			$properties["task_startdate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskStartDate;			// PidLidTaskStartDate
-			$properties["task_resetreminder"] = "PT_BOOLEAN:PSETID_Task:0x8107";		// PidLidTaskResetReminder
-			$properties["task_recurring"] = "PT_BOOLEAN:PSETID_Task:0x8126";			// PidLidTaskFRecurring
+			$properties["reminder"] = "PT_BOOLEAN:PSETID_Common:" . PidLidReminderSet; // PidLidReminderSet
+			$properties["reminder_minutes"] = "PT_LONG:PSETID_Common:" . PidLidReminderDelta; // PidLidReminderDelta
+			$properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderTime; // PidLidReminderTime
+			$properties["flagdueby"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderSignalTime; // PidLidReminderSignalTime
+
+			$properties["task_duedate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskDueDate; // PidLidTaskDueDate
+			$properties["task_startdate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskStartDate; // 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:" . PidLidRecurring;			// PidLidRecurring
+			$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring; // PidLidRecurring
 			$properties["appointment_startdate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentStartWhole;
 			$properties["appointment_enddate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentEndWhole;
 			$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart;

server/includes/templates/login.php

Braces +2 added lines, -1 removed lines

@@ -96,7 +96,8 @@
 		<div class="disclaimer">
 			<?php include '/etc/grommunio-web/disclaimer.html'; ?>
 		</div>
-		<?php } elseif (file_exists('disclaimer.html')) { ?>
+		<?php }
+elseif (file_exists('disclaimer.html')) { ?>
 		<div class="disclaimer">
 			<?php include 'disclaimer.html'; ?>
 		</div>

server/includes/modules/class.appointmentitemmodule.php

Spacing +1 added lines, -2 removed lines

@@ -374,8 +374,7 @@
 		// created on a mobile device (mobile devices do not send a timezone for
 		// all-day events).
 		$tzdefstart = isset($calendaritem['props']['tzdefstart']) ?
-			hex2bin($calendaritem['props']['tzdefstart']) :
-			mapi_ianatz_to_tzdef("Etc/UTC");
+			hex2bin($calendaritem['props']['tzdefstart']) : mapi_ianatz_to_tzdef("Etc/UTC");
 
 		// Compare the timezone definitions of the client and the appointment.
 		// Further processing is only required if they don't match.

server/includes/modules/class.appointmentlistmodule.php

Spacing +1 added lines, -2 removed lines

@@ -542,8 +542,7 @@
 		// created on a mobile device (mobile devices do not send a timezone for
 		// all-day events).
 		$tzdefstart = isset($calendaritem['props']['tzdefstart']) ?
-			hex2bin($calendaritem['props']['tzdefstart']) :
-			mapi_ianatz_to_tzdef("Etc/UTC");
+			hex2bin($calendaritem['props']['tzdefstart']) : mapi_ianatz_to_tzdef("Etc/UTC");
 
 		// queryrows only returns 510 chars max, so if tzdef is longer than that
 		// it was probably silently truncated. In such case we need to open

server/includes/core/constants.php

Spacing +7 added lines, -7 removed lines

@@ -26,17 +26,17 @@
 
 	// used by distribution lists
 	define("WAB_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