grommunio / grommunio-web

plugins/files/php/plugin.files.php

Switch Indentation +24 added lines, -24 removed lines

@@ -52,31 +52,31 @@
 				break;
 			case 'server.index.load.custom':
 				switch($data['name']) {
-				case 'files_get_recipients':
-					RecipientHandler::doGetRecipients();
-					break;
-				case 'download_file':
-					DownloadHandler::doDownload();
-					break;
-				case 'upload_file':
-					UploadHandler::doUpload();
-					break;
-				case 'form':
-					if (isset($_GET['backend'])) {
-						$backend = urldecode($_GET["backend"]);
-					} else {
-						$backend = '';
-					}
-					$backendstore = Files\Backend\BackendStore::getInstance();
+				    case 'files_get_recipients':
+					    RecipientHandler::doGetRecipients();
+					    break;
+				    case 'download_file':
+					    DownloadHandler::doDownload();
+					    break;
+				    case 'upload_file':
+					    UploadHandler::doUpload();
+					    break;
+				    case 'form':
+					    if (isset($_GET['backend'])) {
+						    $backend = urldecode($_GET["backend"]);
+					    } else {
+						    $backend = '';
+					    }
+					    $backendstore = Files\Backend\BackendStore::getInstance();
 
-					if ($backendstore->backendExists($backend)) {
-						$backendInstance = $backendstore->getInstanceOfBackend($backend);
-						$formdata = $backendInstance->getFormConfig();
-						die($formdata);
-					} else {
-						die("Specified backend does not exist!");
-					}
-					break;
+					    if ($backendstore->backendExists($backend)) {
+						    $backendInstance = $backendstore->getInstanceOfBackend($backend);
+						    $formdata = $backendInstance->getFormConfig();
+						    die($formdata);
+					    } else {
+						    die("Specified backend does not exist!");
+					    }
+					    break;
 			}
 			break;
 		}

plugins/smime/php/class.certificate.php

Switch Indentation +6 added lines, -6 removed lines

@@ -33,12 +33,12 @@
 		}
 
 		switch ($this->status) {
-		case 'good':
-			return OCSP_CERT_STATUS_GOOD;
-		case 'revoked':
-			return OCSP_CERT_STATUS_REVOKED;
-		default:
-			return OCSP_CERT_STATUS_UNKOWN;
+		    case 'good':
+			    return OCSP_CERT_STATUS_GOOD;
+		    case 'revoked':
+			    return OCSP_CERT_STATUS_REVOKED;
+		    default:
+			    return OCSP_CERT_STATUS_UNKOWN;
 		}
 	}
 }

server/includes/mapi/mapicode.php

Switch Indentation +77 added lines, -77 removed lines

@@ -207,83 +207,83 @@
 function mapi_strerror($e)
 {
 	switch ($e) {
-	case S_OK: return "success";
-	case MAPI_E_CALL_FAILED: return "An error of unexpected or unknown origin occurred";
-	case MAPI_E_NOT_ENOUGH_MEMORY: return "Not enough memory was available to complete the operation";
-	case MAPI_E_INVALID_PARAMETER: return "An invalid parameter was passed to a function or remote procedure call";
-	case MAPI_E_INTERFACE_NOT_SUPPORTED: return "MAPI interface not supported";
-	case MAPI_E_NO_ACCESS: return "An attempt was made to access a message store or object for which the user has insufficient permissions";
-	case MAPI_E_NO_SUPPORT: return "Function is not implemented";
-	case MAPI_E_BAD_CHARWIDTH: return "An incompatibility exists in the character sets supported by the caller and the implementation";
-	case MAPI_E_STRING_TOO_LONG: return "In the context of this method call, a string exceeds the maximum permitted length";
-	case MAPI_E_UNKNOWN_FLAGS: return "One or more values for a flags parameter were not valid";
-	case MAPI_E_INVALID_ENTRYID: return "invalid entryid";
-	case MAPI_E_INVALID_OBJECT: return "A method call was made using a reference to an object that has been destroyed or is not in a viable state";
-	case MAPI_E_OBJECT_CHANGED: return "An attempt to commit changes failed because the object was changed separately";
-	case MAPI_E_OBJECT_DELETED: return "An operation failed because the object was deleted separately";
-	case MAPI_E_BUSY: return "A table operation failed because a separate operation was in progress at the same time";
-	case MAPI_E_NOT_ENOUGH_DISK: return "Not enough disk space was available to complete the operation";
-	case MAPI_E_NOT_ENOUGH_RESOURCES: return "Not enough system resources were available to complete the operation";
-	case MAPI_E_NOT_FOUND: return "The requested object could not be found at the server";
-	case MAPI_E_VERSION: return "Client and server versions are not compatible";
-	case MAPI_E_LOGON_FAILED: return "A client was unable to log on to the server";
-	case MAPI_E_SESSION_LIMIT: return "A server or service is unable to create any more sessions";
-	case MAPI_E_USER_CANCEL: return "An operation failed because a user cancelled it";
-	case MAPI_E_UNABLE_TO_ABORT: return "A ropAbort or ropAbortSubmit ROP request was unsuccessful";
-	case MAPI_E_NETWORK_ERROR: return "An operation was unsuccessful because of a problem with network operations or services";
-	case MAPI_E_DISK_ERROR: return "There was a problem writing to or reading from disk";
-	case MAPI_E_TOO_COMPLEX: return "The operation requested is too complex for the server to handle (often w.r.t. restrictions)";
-	case MAPI_E_BAD_COLUMN: return "The column requested is not allowed in this type of table";
-	case MAPI_E_EXTENDED_ERROR: return "extended error";
-	case MAPI_E_COMPUTED: return "A property cannot be updated because it is read-only, computed by the server";
-	case MAPI_E_CORRUPT_DATA: return "There is an internal inconsistency in a database, or in a complex property value";
-	case MAPI_E_UNCONFIGURED: return "unconfigured";
-	case MAPI_E_FAILONEPROVIDER: return "failoneprovider";
-	case MAPI_E_UNKNOWN_CPID: return "The server is not configured to support the code page requested by the client";
-	case MAPI_E_UNKNOWN_LCID: return "The server is not configured to support the locale requested by the client";
-	case MAPI_E_PASSWORD_CHANGE_REQUIRED: return "password change required";
-	case MAPI_E_PASSWORD_EXPIRED: return "password expired";
-	case MAPI_E_INVALID_WORKSTATION_ACCOUNT: return "invalid workstation account";
-	case MAPI_E_INVALID_ACCESS_TIME: return "The operation failed due to clock skew between servers";
-	case MAPI_E_ACCOUNT_DISABLED: return "account disabled";
-	case MAPI_E_END_OF_SESSION: return "The server session has been destroyed, possibly by a server restart";
-	case MAPI_E_UNKNOWN_ENTRYID: return "The EntryID passed to OpenEntry was created by a different MAPI provider";
-	case MAPI_E_MISSING_REQUIRED_COLUMN: return "missing required column";
-	case MAPI_W_NO_SERVICE: return "no service";
-	case MAPI_E_BAD_VALUE: return "bad value";
-	case MAPI_E_INVALID_TYPE: return "invalid type";
-	case MAPI_E_TYPE_NO_SUPPORT: return "type no support";
-	case MAPI_E_UNEXPECTED_TYPE: return "unexpected_type";
-	case MAPI_E_TOO_BIG: return "The table is too big for the requested operation to complete";
-	case MAPI_E_DECLINE_COPY: return "The provider implements this method by calling a support object method, and the caller has passed the MAPI_DECLINE_OK flag";
-	case MAPI_E_UNEXPECTED_ID: return "unexpected id";
-	case MAPI_W_ERRORS_RETURNED: return "The call succeeded, but the message store provider has error information available";
-	case MAPI_E_UNABLE_TO_COMPLETE: return "A complex operation such as building a table row set could not be completed";
-	case MAPI_E_TIMEOUT: return "An asynchronous operation did not succeed within the specified time-out";
-	case MAPI_E_TABLE_EMPTY: return "A table essential to the operation is empty";
-	case MAPI_E_TABLE_TOO_BIG: return "The table is too big for the requested operation to complete";
-	case MAPI_E_INVALID_BOOKMARK: return "The bookmark passed to a table operation was not created on the same table";
-	case MAPI_W_POSITION_CHANGED: return "position changed";
-	case MAPI_W_APPROX_COUNT: return "approx count";
-	case MAPI_E_WAIT: return "A wait time-out has expired";
-	case MAPI_E_CANCEL: return "The operation had to be canceled";
-	case MAPI_E_NOT_ME: return "not me";
-	case MAPI_W_CANCEL_MESSAGE: return "cancel message";
-	case MAPI_E_CORRUPT_STORE: return "corrupt store";
-	case MAPI_E_NOT_IN_QUEUE: return "not in queue";
-	case MAPI_E_NO_SUPPRESS: return "The server does not support the suppression of read receipts";
-	case MAPI_E_COLLISION: return "A folder or item cannot be created because one with the same name or other criteria already exists";
-	case MAPI_E_NOT_INITIALIZED: return "The subsystem is not ready";
-	case MAPI_E_NON_STANDARD: return "non standard";
-	case MAPI_E_NO_RECIPIENTS: return "A message cannot be sent because it has no recipients";
-	case MAPI_E_SUBMITTED: return "A message cannot be opened for modification because it has already been sent";
-	case MAPI_E_HAS_FOLDERS: return "A folder cannot be deleted because it still contains subfolders";
-	case MAPI_E_HAS_MESSAGES: return "A folder cannot be deleted because it still contains messages";
-	case MAPI_E_FOLDER_CYCLE: return "A folder move or copy operation would create a cycle";
-	case MAPI_W_PARTIAL_COMPLETION: return "The call succeeded, but not all entries were successfully operated on";
-	case MAPI_E_AMBIGUOUS_RECIP: return "An unresolved recipient matches more than one directory entry";
-	case MAPI_E_STORE_FULL: return "Store full";
-	default: return sprintf("%xh", $e);
+	    case S_OK: return "success";
+	    case MAPI_E_CALL_FAILED: return "An error of unexpected or unknown origin occurred";
+	    case MAPI_E_NOT_ENOUGH_MEMORY: return "Not enough memory was available to complete the operation";
+	    case MAPI_E_INVALID_PARAMETER: return "An invalid parameter was passed to a function or remote procedure call";
+	    case MAPI_E_INTERFACE_NOT_SUPPORTED: return "MAPI interface not supported";
+	    case MAPI_E_NO_ACCESS: return "An attempt was made to access a message store or object for which the user has insufficient permissions";
+	    case MAPI_E_NO_SUPPORT: return "Function is not implemented";
+	    case MAPI_E_BAD_CHARWIDTH: return "An incompatibility exists in the character sets supported by the caller and the implementation";
+	    case MAPI_E_STRING_TOO_LONG: return "In the context of this method call, a string exceeds the maximum permitted length";
+	    case MAPI_E_UNKNOWN_FLAGS: return "One or more values for a flags parameter were not valid";
+	    case MAPI_E_INVALID_ENTRYID: return "invalid entryid";
+	    case MAPI_E_INVALID_OBJECT: return "A method call was made using a reference to an object that has been destroyed or is not in a viable state";
+	    case MAPI_E_OBJECT_CHANGED: return "An attempt to commit changes failed because the object was changed separately";
+	    case MAPI_E_OBJECT_DELETED: return "An operation failed because the object was deleted separately";
+	    case MAPI_E_BUSY: return "A table operation failed because a separate operation was in progress at the same time";
+	    case MAPI_E_NOT_ENOUGH_DISK: return "Not enough disk space was available to complete the operation";
+	    case MAPI_E_NOT_ENOUGH_RESOURCES: return "Not enough system resources were available to complete the operation";
+	    case MAPI_E_NOT_FOUND: return "The requested object could not be found at the server";
+	    case MAPI_E_VERSION: return "Client and server versions are not compatible";
+	    case MAPI_E_LOGON_FAILED: return "A client was unable to log on to the server";
+	    case MAPI_E_SESSION_LIMIT: return "A server or service is unable to create any more sessions";
+	    case MAPI_E_USER_CANCEL: return "An operation failed because a user cancelled it";
+	    case MAPI_E_UNABLE_TO_ABORT: return "A ropAbort or ropAbortSubmit ROP request was unsuccessful";
+	    case MAPI_E_NETWORK_ERROR: return "An operation was unsuccessful because of a problem with network operations or services";
+	    case MAPI_E_DISK_ERROR: return "There was a problem writing to or reading from disk";
+	    case MAPI_E_TOO_COMPLEX: return "The operation requested is too complex for the server to handle (often w.r.t. restrictions)";
+	    case MAPI_E_BAD_COLUMN: return "The column requested is not allowed in this type of table";
+	    case MAPI_E_EXTENDED_ERROR: return "extended error";
+	    case MAPI_E_COMPUTED: return "A property cannot be updated because it is read-only, computed by the server";
+	    case MAPI_E_CORRUPT_DATA: return "There is an internal inconsistency in a database, or in a complex property value";
+	    case MAPI_E_UNCONFIGURED: return "unconfigured";
+	    case MAPI_E_FAILONEPROVIDER: return "failoneprovider";
+	    case MAPI_E_UNKNOWN_CPID: return "The server is not configured to support the code page requested by the client";
+	    case MAPI_E_UNKNOWN_LCID: return "The server is not configured to support the locale requested by the client";
+	    case MAPI_E_PASSWORD_CHANGE_REQUIRED: return "password change required";
+	    case MAPI_E_PASSWORD_EXPIRED: return "password expired";
+	    case MAPI_E_INVALID_WORKSTATION_ACCOUNT: return "invalid workstation account";
+	    case MAPI_E_INVALID_ACCESS_TIME: return "The operation failed due to clock skew between servers";
+	    case MAPI_E_ACCOUNT_DISABLED: return "account disabled";
+	    case MAPI_E_END_OF_SESSION: return "The server session has been destroyed, possibly by a server restart";
+	    case MAPI_E_UNKNOWN_ENTRYID: return "The EntryID passed to OpenEntry was created by a different MAPI provider";
+	    case MAPI_E_MISSING_REQUIRED_COLUMN: return "missing required column";
+	    case MAPI_W_NO_SERVICE: return "no service";
+	    case MAPI_E_BAD_VALUE: return "bad value";
+	    case MAPI_E_INVALID_TYPE: return "invalid type";
+	    case MAPI_E_TYPE_NO_SUPPORT: return "type no support";
+	    case MAPI_E_UNEXPECTED_TYPE: return "unexpected_type";
+	    case MAPI_E_TOO_BIG: return "The table is too big for the requested operation to complete";
+	    case MAPI_E_DECLINE_COPY: return "The provider implements this method by calling a support object method, and the caller has passed the MAPI_DECLINE_OK flag";
+	    case MAPI_E_UNEXPECTED_ID: return "unexpected id";
+	    case MAPI_W_ERRORS_RETURNED: return "The call succeeded, but the message store provider has error information available";
+	    case MAPI_E_UNABLE_TO_COMPLETE: return "A complex operation such as building a table row set could not be completed";
+	    case MAPI_E_TIMEOUT: return "An asynchronous operation did not succeed within the specified time-out";
+	    case MAPI_E_TABLE_EMPTY: return "A table essential to the operation is empty";
+	    case MAPI_E_TABLE_TOO_BIG: return "The table is too big for the requested operation to complete";
+	    case MAPI_E_INVALID_BOOKMARK: return "The bookmark passed to a table operation was not created on the same table";
+	    case MAPI_W_POSITION_CHANGED: return "position changed";
+	    case MAPI_W_APPROX_COUNT: return "approx count";
+	    case MAPI_E_WAIT: return "A wait time-out has expired";
+	    case MAPI_E_CANCEL: return "The operation had to be canceled";
+	    case MAPI_E_NOT_ME: return "not me";
+	    case MAPI_W_CANCEL_MESSAGE: return "cancel message";
+	    case MAPI_E_CORRUPT_STORE: return "corrupt store";
+	    case MAPI_E_NOT_IN_QUEUE: return "not in queue";
+	    case MAPI_E_NO_SUPPRESS: return "The server does not support the suppression of read receipts";
+	    case MAPI_E_COLLISION: return "A folder or item cannot be created because one with the same name or other criteria already exists";
+	    case MAPI_E_NOT_INITIALIZED: return "The subsystem is not ready";
+	    case MAPI_E_NON_STANDARD: return "non standard";
+	    case MAPI_E_NO_RECIPIENTS: return "A message cannot be sent because it has no recipients";
+	    case MAPI_E_SUBMITTED: return "A message cannot be opened for modification because it has already been sent";
+	    case MAPI_E_HAS_FOLDERS: return "A folder cannot be deleted because it still contains subfolders";
+	    case MAPI_E_HAS_MESSAGES: return "A folder cannot be deleted because it still contains messages";
+	    case MAPI_E_FOLDER_CYCLE: return "A folder move or copy operation would create a cycle";
+	    case MAPI_W_PARTIAL_COMPLETION: return "The call succeeded, but not all entries were successfully operated on";
+	    case MAPI_E_AMBIGUOUS_RECIP: return "An unresolved recipient matches more than one directory entry";
+	    case MAPI_E_STORE_FULL: return "Store full";
+	    default: return sprintf("%xh", $e);
 	}
 }
 

server/includes/mapi/class.baserecurrence.php

Switch Indentation +172 added lines, -172 removed lines

@@ -1675,180 +1675,180 @@
 
 				switch($this->recur["type"])
 				{
-				case 10:
-					// Daily
-					if($this->recur["everyn"] <= 0)
-						$this->recur["everyn"] = 1440;
-
-					if($this->recur["subtype"] == 0) {
-						// Every Nth day
-						for($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * $this->recur["everyn"]) {
-							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-					} else {
-						// Every workday
-						for($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * 1440)
-						{
-							$nowtime = $this->gmtime($now);
-							if ($nowtime["tm_wday"] > 0 && $nowtime["tm_wday"] < 6) { // only add items in the given timespace
-								$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
-						}
-					}
-					break;
-				case 11:
-					// Weekly
-					if($this->recur["everyn"] <= 0)
-						$this->recur["everyn"] = 1;
-
-					// If sliding flag is set then move to 'n' weeks
-					if ($this->recur['regen']) $daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
-
-					for($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"]))
-					{
-						if ($this->recur['regen']) {
-							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						} else {
-							// Loop through the whole following week to the first occurrence of the week, add each day that is specified
-							for($wday = 0; $wday < 7; $wday++)
-							{
-								$daynow = $now + $wday * 60 * 60 * 24;
-								//checks weather the next coming day in recurring pattern is less than or equal to end day of the recurring item
-								if ($daynow <= $dayend){
-									$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
-									if(($this->recur["weekdays"] &(1 << $nowtime["tm_wday"]))) { // Selected ?
-										$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-									}
-								}
-							}
-						}
-					}
-					break;
-				case 12:
-					// Monthly
-					if($this->recur["everyn"] <= 0)
-						$this->recur["everyn"] = 1;
-
-					// Loop through all months from start to end of occurrence, starting at beginning of first month
-					for($now = $this->monthStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60 )
-					{
-						if(isset($this->recur["monthday"]) &&($this->recur['monthday'] != "undefined") && !$this->recur['regen']) { // Day M of every N months
-							$difference = 1;
-							if ($this->daysInMonth($now, $this->recur["everyn"]) < $this->recur["monthday"]) {
-								$difference = $this->recur["monthday"] - $this->daysInMonth($now, $this->recur["everyn"]) + 1;
-							}
-							$daynow = $now + (($this->recur["monthday"] - $difference) * 24 * 60 * 60);
-							//checks weather the next coming day in recurrence pattern is less than or equal to end day of the recurring item
-							if ($daynow <= $dayend){
-								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
-						}
-						else if(isset($this->recur["nday"]) && isset($this->recur["weekdays"])) { // Nth [weekday] of every N months
-						    // Sanitize input
-						    if($this->recur["weekdays"] == 0)
-						        $this->recur["weekdays"] = 1;
-
-							// If nday is not set to the last day in the month
-							if ($this->recur["nday"] < 5) {
-								// keep the track of no. of time correct selection pattern(like 2nd weekday, 4th fiday, etc.)is matched
-								$ndaycounter = 0;
-								// Find matching weekday in this month
-								for($day = 0, $total = $this->daysInMonth($now, 1); $day < $total; $day++)
-								{
-									$daynow = $now + $day * 60 * 60 * 24;
-									$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
-
-									if($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
-										$ndaycounter ++;
-									}
-									// check the selected pattern is same as asked Nth weekday,If so set the firstday
-									if($this->recur["nday"] == $ndaycounter){
-										$firstday = $day;
-										break;
-									}
-								}
-								// $firstday is the day of the month on which the asked pattern of nth weekday matches
-								$daynow = $now + $firstday * 60 * 60 * 24;
-							} else {
-								// Find last day in the month ($now is the firstday of the month)
-								$NumDaysInMonth =  $this->daysInMonth($now, 1);
-								$daynow = $now + (($NumDaysInMonth-1) * 24*60*60);
-
-								$nowtime = $this->gmtime($daynow);
-								while (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"]))==0){
-									$daynow -= 86400;
-									$nowtime = $this->gmtime($daynow);
-								}
-							}
-
-							/**
+				    case 10:
+					    // Daily
+					    if($this->recur["everyn"] <= 0)
+						    $this->recur["everyn"] = 1440;
+
+					    if($this->recur["subtype"] == 0) {
+						    // Every Nth day
+						    for($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * $this->recur["everyn"]) {
+							    $this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+						    }
+					    } else {
+						    // Every workday
+						    for($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * 1440)
+						    {
+							    $nowtime = $this->gmtime($now);
+							    if ($nowtime["tm_wday"] > 0 && $nowtime["tm_wday"] < 6) { // only add items in the given timespace
+								    $this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							    }
+						    }
+					    }
+					    break;
+				    case 11:
+					    // Weekly
+					    if($this->recur["everyn"] <= 0)
+						    $this->recur["everyn"] = 1;
+
+					    // If sliding flag is set then move to 'n' weeks
+					    if ($this->recur['regen']) $daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
+
+					    for($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"]))
+					    {
+						    if ($this->recur['regen']) {
+							    $this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+						    } else {
+							    // Loop through the whole following week to the first occurrence of the week, add each day that is specified
+							    for($wday = 0; $wday < 7; $wday++)
+							    {
+								    $daynow = $now + $wday * 60 * 60 * 24;
+								    //checks weather the next coming day in recurring pattern is less than or equal to end day of the recurring item
+								    if ($daynow <= $dayend){
+									    $nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+									    if(($this->recur["weekdays"] &(1 << $nowtime["tm_wday"]))) { // Selected ?
+										    $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+									    }
+								    }
+							    }
+						    }
+					    }
+					    break;
+				    case 12:
+					    // Monthly
+					    if($this->recur["everyn"] <= 0)
+						    $this->recur["everyn"] = 1;
+
+					    // Loop through all months from start to end of occurrence, starting at beginning of first month
+					    for($now = $this->monthStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60 )
+					    {
+						    if(isset($this->recur["monthday"]) &&($this->recur['monthday'] != "undefined") && !$this->recur['regen']) { // Day M of every N months
+							    $difference = 1;
+							    if ($this->daysInMonth($now, $this->recur["everyn"]) < $this->recur["monthday"]) {
+								    $difference = $this->recur["monthday"] - $this->daysInMonth($now, $this->recur["everyn"]) + 1;
+							    }
+							    $daynow = $now + (($this->recur["monthday"] - $difference) * 24 * 60 * 60);
+							    //checks weather the next coming day in recurrence pattern is less than or equal to end day of the recurring item
+							    if ($daynow <= $dayend){
+								    $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							    }
+						    }
+						    else if(isset($this->recur["nday"]) && isset($this->recur["weekdays"])) { // Nth [weekday] of every N months
+						        // Sanitize input
+						        if($this->recur["weekdays"] == 0)
+						            $this->recur["weekdays"] = 1;
+
+							    // If nday is not set to the last day in the month
+							    if ($this->recur["nday"] < 5) {
+								    // keep the track of no. of time correct selection pattern(like 2nd weekday, 4th fiday, etc.)is matched
+								    $ndaycounter = 0;
+								    // Find matching weekday in this month
+								    for($day = 0, $total = $this->daysInMonth($now, 1); $day < $total; $day++)
+								    {
+									    $daynow = $now + $day * 60 * 60 * 24;
+									    $nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+
+									    if($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
+										    $ndaycounter ++;
+									    }
+									    // check the selected pattern is same as asked Nth weekday,If so set the firstday
+									    if($this->recur["nday"] == $ndaycounter){
+										    $firstday = $day;
+										    break;
+									    }
+								    }
+								    // $firstday is the day of the month on which the asked pattern of nth weekday matches
+								    $daynow = $now + $firstday * 60 * 60 * 24;
+							    } else {
+								    // Find last day in the month ($now is the firstday of the month)
+								    $NumDaysInMonth =  $this->daysInMonth($now, 1);
+								    $daynow = $now + (($NumDaysInMonth-1) * 24*60*60);
+
+								    $nowtime = $this->gmtime($daynow);
+								    while (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"]))==0){
+									    $daynow -= 86400;
+									    $nowtime = $this->gmtime($daynow);
+								    }
+							    }
+
+							    /**
 							 * checks weather the next coming day in recurrence pattern is less than or equal to end day of the			* recurring item.Also check weather the coming day in recurrence pattern is greater than or equal to start * of recurring pattern, so that appointment that fall under the recurrence range are only displayed.
 							 */
-							if ($daynow <= $dayend && $daynow >= $daystart){
-								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz , $remindersonly);
-							}
-						} else if ($this->recur['regen']) {
-							$next_month_start = $now + ($this->daysInMonth($now, 1) * 24 * 60 * 60);
-							$now = $daystart +($this->daysInMonth($next_month_start, $this->recur['everyn']) * 24 * 60 * 60);
-
-							if ($now <= $dayend) {
-								$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
-						}
-					}
-					break;
-				case 13:
-					// Yearly
-					if($this->recur["everyn"] <= 0)
-						$this->recur["everyn"] = 12;
-
-					for($now = $this->yearStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60 )
-					{
-						if(isset($this->recur["monthday"]) && !$this->recur['regen']) { // same as monthly, but in a specific month
-							// recur["month"] is in minutes since the beginning of the year
-							$month = $this->monthOfYear($this->recur["month"]); // $month is now month of year [0..11]
-							$monthday = $this->recur["monthday"]; // $monthday is day of the month [1..31]
-							$monthstart = $now + $this->daysInMonth($now, $month) * 24 * 60 * 60; // $monthstart is the timestamp of the beginning of the month
-							if($monthday > $this->daysInMonth($monthstart, 1))
-								$monthday = $this->daysInMonth($monthstart, 1);	// Cap $monthday on month length (eg 28 feb instead of 29 feb)
-							$daynow = $monthstart + ($monthday-1) * 24 * 60 * 60;
-							$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-						else if(isset($this->recur["nday"]) && isset($this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
-
-							// Go the correct month
-							$monthnow = $now + $this->daysInMonth($now, $this->monthOfYear($this->recur["month"])) * 24 * 60 * 60;
-
-							// Find first matching weekday in this month
-							for($wday = 0; $wday < 7; $wday++)
-							{
-								$daynow = $monthnow + $wday * 60 * 60 * 24;
-								$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
-
-								if($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
-									$firstday = $wday;
-									break;
-								}
-							}
-
-							// Same as above (monthly)
-							$daynow = $monthnow + ($firstday + ($this->recur["nday"]-1)*7) * 60 * 60 * 24;
-
-							while($this->monthStartOf($daynow) != $this->monthStartOf($monthnow)) {
-								$daynow -= 7 * 60 * 60 * 24;
-							}
-
-							$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						} else if ($this->recur['regen']) {
-							$year_starttime = $this->gmtime($now);
-							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);	// +1 next year
-							$now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /*year in seconds*/);
-
-							if ($now <= $dayend) {
-								$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
-						}
-					}
+							    if ($daynow <= $dayend && $daynow >= $daystart){
+								    $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz , $remindersonly);
+							    }
+						    } else if ($this->recur['regen']) {
+							    $next_month_start = $now + ($this->daysInMonth($now, 1) * 24 * 60 * 60);
+							    $now = $daystart +($this->daysInMonth($next_month_start, $this->recur['everyn']) * 24 * 60 * 60);
+
+							    if ($now <= $dayend) {
+								    $this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							    }
+						    }
+					    }
+					    break;
+				    case 13:
+					    // Yearly
+					    if($this->recur["everyn"] <= 0)
+						    $this->recur["everyn"] = 12;
+
+					    for($now = $this->yearStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60 )
+					    {
+						    if(isset($this->recur["monthday"]) && !$this->recur['regen']) { // same as monthly, but in a specific month
+							    // recur["month"] is in minutes since the beginning of the year
+							    $month = $this->monthOfYear($this->recur["month"]); // $month is now month of year [0..11]
+							    $monthday = $this->recur["monthday"]; // $monthday is day of the month [1..31]
+							    $monthstart = $now + $this->daysInMonth($now, $month) * 24 * 60 * 60; // $monthstart is the timestamp of the beginning of the month
+							    if($monthday > $this->daysInMonth($monthstart, 1))
+								    $monthday = $this->daysInMonth($monthstart, 1);	// Cap $monthday on month length (eg 28 feb instead of 29 feb)
+							    $daynow = $monthstart + ($monthday-1) * 24 * 60 * 60;
+							    $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+						    }
+						    else if(isset($this->recur["nday"]) && isset($this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
+
+							    // Go the correct month
+							    $monthnow = $now + $this->daysInMonth($now, $this->monthOfYear($this->recur["month"])) * 24 * 60 * 60;
+
+							    // Find first matching weekday in this month
+							    for($wday = 0; $wday < 7; $wday++)
+							    {
+								    $daynow = $monthnow + $wday * 60 * 60 * 24;
+								    $nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+
+								    if($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
+									    $firstday = $wday;
+									    break;
+								    }
+							    }
+
+							    // Same as above (monthly)
+							    $daynow = $monthnow + ($firstday + ($this->recur["nday"]-1)*7) * 60 * 60 * 24;
+
+							    while($this->monthStartOf($daynow) != $this->monthStartOf($monthnow)) {
+								    $daynow -= 7 * 60 * 60 * 24;
+							    }
+
+							    $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+						    } else if ($this->recur['regen']) {
+							    $year_starttime = $this->gmtime($now);
+							    $is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);	// +1 next year
+							    $now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /*year in seconds*/);
+
+							    if ($now <= $dayend) {
+								    $this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							    }
+						    }
+					    }
 				}
 				//to get all exception items
 				if (!empty($this->recur['changed_occurrences']))

server/includes/core/class.operations.php

Switch Indentation +12 added lines, -12 removed lines

@@ -657,18 +657,18 @@
 					$e->setHandled();
 					$props = mapi_getprops($store, array(PR_DISPLAY_NAME));
 					switch($e->getCode()) {
-					case MAPI_E_NO_ACCESS:
-						$msg = "Unable to open FINDER_ROOT for store: %s.";
-						error_log(sprintf($msg, $props[PR_DISPLAY_NAME]));
-						break;
-					case MAPI_E_NOT_FOUND:
-						$msg = "Unable to open FINDER_ROOT for store: %s. Folder not found.";
-						error_log(sprintf($msg, $props[PR_DISPLAY_NAME]));
-						break;
-					default:
-						$msg = "Unable to open FINDER_ROOT for store: %s. Unknown MAPI Error %s.";
-						error_log(sprintf($msg, $props[PR_DISPLAY_NAME], get_mapi_error_name($e->getCode())));
-						break;
+					    case MAPI_E_NO_ACCESS:
+						    $msg = "Unable to open FINDER_ROOT for store: %s.";
+						    error_log(sprintf($msg, $props[PR_DISPLAY_NAME]));
+						    break;
+					    case MAPI_E_NOT_FOUND:
+						    $msg = "Unable to open FINDER_ROOT for store: %s. Folder not found.";
+						    error_log(sprintf($msg, $props[PR_DISPLAY_NAME]));
+						    break;
+					    default:
+						    $msg = "Unable to open FINDER_ROOT for store: %s. Unknown MAPI Error %s.";
+						    error_log(sprintf($msg, $props[PR_DISPLAY_NAME], get_mapi_error_name($e->getCode())));
+						    break;
 					}
 				}
 			}

server/includes/core/class.configcheck.php

Switch Indentation +31 added lines, -31 removed lines

@@ -307,37 +307,37 @@
 		$result = true;
 
 		switch ($loader) {
-		case LOAD_RELEASE:
-			if (!is_file(BASE_PATH . '/client/grommunio.js')) {
-				$this->error('<strong>LOAD_RELEASE configured, but no release files found</strong>', $help_msg);
-				$result = false;
-			} else if (is_dir(BASE_PATH . '/client/zarafa')) {
-				$this->error('<strong>LOAD_RELEASE configured, but source files were found</strong>', $help_msg);
-				$result = false;
-			}
-			break;
-		case LOAD_DEBUG:
-			if (!is_file(BASE_PATH . '/client/zarafa-debug.js')) {
-				$this->error('<strong>LOAD_DEBUG configured, but no debug files found</strong>', $help_msg);
-				$result = false;
-			} else if (is_dir(BASE_PATH . '/client/zarafa')) {
-				$this->error('<strong>LOAD_DEBUG configured, but source files were found</strong>', $help_msg);
-				$result = false;
-			}
-			break;
-		case LOAD_SOURCE:
-			if (!is_dir(BASE_PATH . '/client/zarafa')) {
-				$this->error('<strong>LOAD_SOURCE configured, but no source files found</strong>', $help_msg);
-				$result = false;
-			} else if (is_file(BASE_PATH . '/client/grommunio.js') || is_file(BASE_PATH . '/client/zarafa-debug.js')) {
-				$this->error('<strong>LOAD_SOURCE configured, but release & debug file were found</strong>', $help_msg);
-				$result = false;
-			}
-			break;
-		default:
-			$this->error('<strong>Unknown \'DEBUG_LOADER\' value: ' . $loader . '</strong>', $help_msg);
-			$result = false;
-			break;
+		    case LOAD_RELEASE:
+			    if (!is_file(BASE_PATH . '/client/grommunio.js')) {
+				    $this->error('<strong>LOAD_RELEASE configured, but no release files found</strong>', $help_msg);
+				    $result = false;
+			    } else if (is_dir(BASE_PATH . '/client/zarafa')) {
+				    $this->error('<strong>LOAD_RELEASE configured, but source files were found</strong>', $help_msg);
+				    $result = false;
+			    }
+			    break;
+		    case LOAD_DEBUG:
+			    if (!is_file(BASE_PATH . '/client/zarafa-debug.js')) {
+				    $this->error('<strong>LOAD_DEBUG configured, but no debug files found</strong>', $help_msg);
+				    $result = false;
+			    } else if (is_dir(BASE_PATH . '/client/zarafa')) {
+				    $this->error('<strong>LOAD_DEBUG configured, but source files were found</strong>', $help_msg);
+				    $result = false;
+			    }
+			    break;
+		    case LOAD_SOURCE:
+			    if (!is_dir(BASE_PATH . '/client/zarafa')) {
+				    $this->error('<strong>LOAD_SOURCE configured, but no source files found</strong>', $help_msg);
+				    $result = false;
+			    } else if (is_file(BASE_PATH . '/client/grommunio.js') || is_file(BASE_PATH . '/client/zarafa-debug.js')) {
+				    $this->error('<strong>LOAD_SOURCE configured, but release & debug file were found</strong>', $help_msg);
+				    $result = false;
+			    }
+			    break;
+		    default:
+			    $this->error('<strong>Unknown \'DEBUG_LOADER\' value: ' . $loader . '</strong>', $help_msg);
+			    $result = false;
+			    break;
 		}
 
 		return $result;

server/includes/modules/class.listmodule.php

Switch Indentation +8 added lines, -8 removed lines

@@ -267,14 +267,14 @@
 				// if error in creating search folder then send error to client
 				$errorInfo = array();
 				switch(mapi_last_hresult()) {
-				case MAPI_E_NO_ACCESS:
-					$errorInfo["error_message"] = _("Unable to perform search query, no permissions to create search folder.");
-					break;
-				case MAPI_E_NOT_FOUND:
-					$errorInfo["error_message"] = _("Unable to perform search query, search folder not found.");
-					break;
-				default:
-					$errorInfo["error_message"] = _("Unable to perform search query, store might not support searching.");
+				    case MAPI_E_NO_ACCESS:
+					    $errorInfo["error_message"] = _("Unable to perform search query, no permissions to create search folder.");
+					    break;
+				    case MAPI_E_NOT_FOUND:
+					    $errorInfo["error_message"] = _("Unable to perform search query, search folder not found.");
+					    break;
+				    default:
+					    $errorInfo["error_message"] = _("Unable to perform search query, store might not support searching.");
 				}
 
 				$errorInfo["original_error_message"] = _("Error in creating search folder.");

server/includes/modules/class.advancedsearchlistmodule.php

Switch Indentation +34 added lines, -34 removed lines

@@ -157,32 +157,32 @@ 
 			if ($type == RES_CONTENT) {
 				$subres = $restriction[1];
 				switch ($subres[ULPROPTAG]) {
-				case PR_SUBJECT:
-					$patterns['subject'] = $subres[VALUE][$subres[ULPROPTAG]];
-					break;
-				case PR_BODY:
-					$patterns['content'] = $subres[VALUE][$subres[ULPROPTAG]];
-					$patterns['attachments'] = $subres[VALUE][$subres[ULPROPTAG]];
-					break;
-				case PR_SENDER_NAME:
-					$patterns['sender'] = $subres[VALUE][$subres[ULPROPTAG]];
-					break;
-				case PR_SENT_REPRESENTING_NAME:
-					$patterns['from'] = $subres[VALUE][$subres[ULPROPTAG]];
-					break;
-				case PR_DISPLAY_TO:
-				case PR_DISPLAY_CC:
-					$patterns['recipients'] = $subres[VALUE][$subres[ULPROPTAG]];
-					break;
-				case PR_MESSAGE_CLASS:
-					if (empty($patterns['message_classes'])) {
-						$patterns['message_classes'] = array();
-					}
-					$patterns['message_classes'][] = $subres[VALUE][$subres[ULPROPTAG]];
-					break;
-				case PR_DISPLAY_NAME:
-					$patterns['others'] = $subres[VALUE][$subres[ULPROPTAG]];
-					break;
+				    case PR_SUBJECT:
+					    $patterns['subject'] = $subres[VALUE][$subres[ULPROPTAG]];
+					    break;
+				    case PR_BODY:
+					    $patterns['content'] = $subres[VALUE][$subres[ULPROPTAG]];
+					    $patterns['attachments'] = $subres[VALUE][$subres[ULPROPTAG]];
+					    break;
+				    case PR_SENDER_NAME:
+					    $patterns['sender'] = $subres[VALUE][$subres[ULPROPTAG]];
+					    break;
+				    case PR_SENT_REPRESENTING_NAME:
+					    $patterns['from'] = $subres[VALUE][$subres[ULPROPTAG]];
+					    break;
+				    case PR_DISPLAY_TO:
+				    case PR_DISPLAY_CC:
+					    $patterns['recipients'] = $subres[VALUE][$subres[ULPROPTAG]];
+					    break;
+				    case PR_MESSAGE_CLASS:
+					    if (empty($patterns['message_classes'])) {
+						    $patterns['message_classes'] = array();
+					    }
+					    $patterns['message_classes'][] = $subres[VALUE][$subres[ULPROPTAG]];
+					    break;
+				    case PR_DISPLAY_NAME:
+					    $patterns['others'] = $subres[VALUE][$subres[ULPROPTAG]];
+					    break;
 				}
 			} else if ($type == RES_AND || $type == RES_OR) {
 				foreach ($restriction[1] as $subres) {
@@ -276,14 +276,14 @@ 
 				// if error in creating search folder then send error to client
 				$errorInfo = array();
 				switch(mapi_last_hresult()) {
-				case MAPI_E_NO_ACCESS:
-					$errorInfo["error_message"] = _("Unable to perform search query, no permissions to create search folder.");
-					break;
-				case MAPI_E_NOT_FOUND:
-					$errorInfo["error_message"] = _("Unable to perform search query, search folder not found.");
-					break;
-				default:
-					$errorInfo["error_message"] = _("Unable to perform search query, store might not support searching.");
+				    case MAPI_E_NO_ACCESS:
+					    $errorInfo["error_message"] = _("Unable to perform search query, no permissions to create search folder.");
+					    break;
+				    case MAPI_E_NOT_FOUND:
+					    $errorInfo["error_message"] = _("Unable to perform search query, search folder not found.");
+					    break;
+				    default:
+					    $errorInfo["error_message"] = _("Unable to perform search query, store might not support searching.");
 				}
 
 				$errorInfo["original_error_message"] = _("Error in creating search folder.");