grommunio / grommunio-web

server/includes/upload_attachment.php

Indentation +6 added lines, -6 removed lines

@@ -648,17 +648,17 @@
 			// Manually set PR_MESSAGE_DELIVERY_TIME to sent time, since mapi_inetmapi_imtomapi does not set delivery-time
 			// Either use PR_CLIENT_SUBMIT_TIME or extract date from EML and set PR_MESSAGE_DELIVERY_TIME
 	 		$props = mapi_getprops($newMessage, [PR_CLIENT_SUBMIT_TIME, PR_MESSAGE_DELIVERY_TIME]);
-                        if (empty($props[PR_MESSAGE_DELIVERY_TIME])) {
+						if (empty($props[PR_MESSAGE_DELIVERY_TIME])) {
 				if (!empty($props[PR_CLIENT_SUBMIT_TIME]))
-                                	mapi_setprops($newMessage, [PR_MESSAGE_DELIVERY_TIME => $props[PR_CLIENT_SUBMIT_TIME]]);
+									mapi_setprops($newMessage, [PR_MESSAGE_DELIVERY_TIME => $props[PR_CLIENT_SUBMIT_TIME]]);
 				else {
 					if( preg_match('/^Date:\s*(.+)$/mi', $attachmentStream, $matches)) {
-        	        			$dateStr = trim($matches[1]);
-                				$deliverytime = strtotime($dateStr);
-                				if ($deliverytime) 
+								$dateStr = trim($matches[1]);
+								$deliverytime = strtotime($dateStr);
+								if ($deliverytime) 
 							mapi_setprops($newMessage, [PR_MESSAGE_DELIVERY_TIME => $deliverytime]);
         
-        				}
+						}
 				}
 				mapi_message_savechanges($newMessage);
 			}

Spacing +1 added lines, -1 removed lines

@@ -652,7 +652,7 @@
 				if (!empty($props[PR_CLIENT_SUBMIT_TIME]))
                                 	mapi_setprops($newMessage, [PR_MESSAGE_DELIVERY_TIME => $props[PR_CLIENT_SUBMIT_TIME]]);
 				else {
-					if( preg_match('/^Date:\s*(.+)$/mi', $attachmentStream, $matches)) {
+					if (preg_match('/^Date:\s*(.+)$/mi', $attachmentStream, $matches)) {
         	        			$dateStr = trim($matches[1]);
                 				$deliverytime = strtotime($dateStr);
                 				if ($deliverytime) 

Braces +6 added lines, -4 removed lines

@@ -649,14 +649,16 @@
 			// Either use PR_CLIENT_SUBMIT_TIME or extract date from EML and set PR_MESSAGE_DELIVERY_TIME
 	 		$props = mapi_getprops($newMessage, [PR_CLIENT_SUBMIT_TIME, PR_MESSAGE_DELIVERY_TIME]);
                         if (empty($props[PR_MESSAGE_DELIVERY_TIME])) {
-				if (!empty($props[PR_CLIENT_SUBMIT_TIME]))
-                                	mapi_setprops($newMessage, [PR_MESSAGE_DELIVERY_TIME => $props[PR_CLIENT_SUBMIT_TIME]]);
+				if (!empty($props[PR_CLIENT_SUBMIT_TIME])) {
+				                                	mapi_setprops($newMessage, [PR_MESSAGE_DELIVERY_TIME => $props[PR_CLIENT_SUBMIT_TIME]]);
+				}
 				else {
 					if( preg_match('/^Date:\s*(.+)$/mi', $attachmentStream, $matches)) {
         	        			$dateStr = trim($matches[1]);
                 				$deliverytime = strtotime($dateStr);
-                				if ($deliverytime) 
-							mapi_setprops($newMessage, [PR_MESSAGE_DELIVERY_TIME => $deliverytime]);
+                				if ($deliverytime) {
+                											mapi_setprops($newMessage, [PR_MESSAGE_DELIVERY_TIME => $deliverytime]);
+                				}
         
         				}
 				}