grommunio / grommunio-sync

mapi/class.taskrequest.php

Spacing +39 added lines, -39 removed lines

@@ -23,12 +23,12 @@ 
 	 * carried in the IPM.TaskRequest item (although this information seems
 	 * redundant due to that information already being available in PR_MESSAGE_CLASS).
 	 */
-	define('tdmtNothing', 0);            // Value in IPM.Task items
-	define('tdmtTaskReq', 1);            // Assigner -> Assignee
-	define('tdmtTaskAcc', 2);            // Assignee -> Assigner
-	define('tdmtTaskDec', 3);            // Assignee -> Assigner
-	define('tdmtTaskUpd', 4);            // Assignee -> Assigner
-	define('tdmtTaskSELF', 5);            // Assigner -> Assigner (?)
+	define('tdmtNothing', 0); // Value in IPM.Task items
+	define('tdmtTaskReq', 1); // Assigner -> Assignee
+	define('tdmtTaskAcc', 2); // Assignee -> Assigner
+	define('tdmtTaskDec', 3); // Assignee -> Assigner
+	define('tdmtTaskUpd', 4); // Assignee -> Assigner
+	define('tdmtTaskSELF', 5); // Assigner -> Assigner (?)
 
 	/* The TaskHistory is used to show the last action on the task
 	 * on both the assigner and the assignee's side.
@@ -38,22 +38,22 @@ 
 	 * the format 'Accepted by <user> on 01-01-2010 11:00'.
 	 */
 	define('thNone', 0);
-	define('thAccepted', 1);            // Set by assignee
-	define('thDeclined', 2);            // Set by assignee
-	define('thUpdated', 3);                // Set by assignee
+	define('thAccepted', 1); // Set by assignee
+	define('thDeclined', 2); // Set by assignee
+	define('thUpdated', 3); // Set by assignee
 	define('thDueDateChanged', 4);
-	define('thAssigned', 5);            // Set by assigner
+	define('thAssigned', 5); // Set by assigner
 
 	/* The TaskState value is used to differentiate the version of a task
 	 * in the assigner's folder and the version in the
 	 * assignee's folder. The buttons shown depend on this and
 	 * the 'taskaccepted' boolean (for the assignee)
 	 */
-	define('tdsNOM', 0);        // Got a response to a deleted task, and re-created the task for the assigner
-	define('tdsOWNNEW', 1);        // Not assigned
-	define('tdsOWN', 2);        // Assignee version
-	define('tdsACC', 3);        // Assigner version
-	define('tdsDEC', 4);        // Assigner version, but assignee declined
+	define('tdsNOM', 0); // Got a response to a deleted task, and re-created the task for the assigner
+	define('tdsOWNNEW', 1); // Not assigned
+	define('tdsOWN', 2); // Assignee version
+	define('tdsACC', 3); // Assigner version
+	define('tdsDEC', 4); // Assigner version, but assignee declined
 
 	/* The TaskAcceptanceState is used for the assigner to indicate state */
 	define('olTaskNotDelegated', 0);
@@ -63,13 +63,13 @@ 
 
 	/* The task ownership indicates the role of the current user relative to the task. */
 	define('olNewTask', 0);
-	define('olDelegatedTask', 1);    // Task has been assigned
-	define('olOwnTask', 2);            // Task owned
+	define('olDelegatedTask', 1); // Task has been assigned
+	define('olOwnTask', 2); // Task owned
 
 	/* taskmultrecips indicates whether the task request sent or received has multiple assignees or not. */
 	define('tmrNone', 0);
-	define('tmrSent', 1);        // Task has been sent to multiple assignee
-	define('tmrReceived', 2);    // Task Request received has multiple assignee
+	define('tmrSent', 1); // Task has been sent to multiple assignee
+	define('tmrReceived', 2); // Task Request received has multiple assignee
 
 	// Task icon index.
 	define('ICON_TASK_ASSIGNEE', 0x00000502);
@@ -307,7 +307,7 @@ 
 					VALUE => $goid, ],
 				];
 
-				$table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS | SHOW_SOFT_DELETES);
+				$table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS|SHOW_SOFT_DELETES);
 				$softDeletedItems = mapi_table_queryallrows($table, [PR_ENTRYID], $restriction);
 				if (!empty($softDeletedItems)) {
 					return true;
@@ -515,14 +515,14 @@ 
 			// Set properties on Task Request
 			mapi_setprops($this->message, [
 				$this->props['task_goid'] => $taskid, /* our new task_goid */
-				$this->props['taskstate'] => tdsACC,         /* state for our outgoing request */
-				$this->props['taskmode'] => tdmtNothing,     /* we're not sending a change */
-				$this->props['updatecount'] => 2,            /* version 2 (no idea) */
+				$this->props['taskstate'] => tdsACC, /* state for our outgoing request */
+				$this->props['taskmode'] => tdmtNothing, /* we're not sending a change */
+				$this->props['updatecount'] => 2, /* version 2 (no idea) */
 				$this->props['task_acceptance_state'] => olTaskDelegationUnknown, /* no reply yet */
 				$this->props['ownership'] => olDelegatedTask, /* Task has been assigned */
-				$this->props['taskhistory'] => thAssigned,    /* Task has been assigned */
+				$this->props['taskhistory'] => thAssigned, /* Task has been assigned */
 				PR_CONVERSATION_TOPIC => $messageprops[PR_SUBJECT],
-				PR_ICON_INDEX => ICON_TASK_ASSIGNER,         /* Task request icon */
+				PR_ICON_INDEX => ICON_TASK_ASSIGNER, /* Task request icon */
 			]);
 			$this->setLastUser();
 			$this->setOwnerForAssignor();
@@ -537,12 +537,12 @@ 
 
 			// Make it a task request, and put it in sent items after it is sent
 			mapi_setprops($outgoing, [
-				PR_MESSAGE_CLASS => "IPM.TaskRequest",         /* class is task request */
-				$this->props['taskstate'] => tdsOWN,         /* for the recipient he is the task owner */
-				$this->props['taskmode'] => tdmtTaskReq,    /* for the recipient it's a request */
-				$this->props['updatecount'] => 1,            /* version 2 is in the attachment */
+				PR_MESSAGE_CLASS => "IPM.TaskRequest", /* class is task request */
+				$this->props['taskstate'] => tdsOWN, /* for the recipient he is the task owner */
+				$this->props['taskmode'] => tdmtTaskReq, /* for the recipient it's a request */
+				$this->props['updatecount'] => 1, /* version 2 is in the attachment */
 				PR_SUBJECT_PREFIX => $prefix,
-				PR_SUBJECT => $prefix . $messageprops[PR_SUBJECT],
+				PR_SUBJECT => $prefix.$messageprops[PR_SUBJECT],
 			]);
 
 			$attach = mapi_message_createattach($outgoing);
@@ -551,7 +551,7 @@ 
 				PR_ATTACHMENT_HIDDEN => true,
 				PR_DISPLAY_NAME => $messageprops[PR_SUBJECT], ]);
 
-			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_MODIFY | MAPI_CREATE);
+			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_MODIFY|MAPI_CREATE);
 
 			mapi_copyto($this->message, [], [], $sub);
 			mapi_savechanges($sub);
@@ -649,7 +649,7 @@ 
 		 * @return entryid EntryID of the accepted task
 		 */
 		public function doAccept() {
-			$prefix = _("Task Accepted:") . " ";
+			$prefix = _("Task Accepted:")." ";
 			$messageProps = mapi_getprops($this->message, [PR_MESSAGE_CLASS, $this->props['taskstate']]);
 
 			if (!isset($messageProps[$this->props['taskstate']]) || $messageProps[$this->props['taskstate']] != tdsOWN) {
@@ -698,7 +698,7 @@ 
 		 * @return boolean TRUE on success, FALSE on failure
 		 */
 		public function doDecline() {
-			$prefix = _("Task Declined:") . " ";
+			$prefix = _("Task Declined:")." ";
 			$messageProps = mapi_getprops($this->message, [$this->props['taskstate']]);
 
 			if (!isset($messageProps[$this->props['taskstate']]) || $messageProps[$this->props['taskstate']] != tdsOWN) {
@@ -753,10 +753,10 @@ 
 
 			$props = mapi_getprops($this->message, [$this->props['taskupdates'], $this->props['tasksoc'], $this->props['recurring'], $this->props['complete']]);
 			if (!$props[$this->props['complete']] && $props[$this->props['taskupdates']] && !(isset($props[$this->props['recurring']]) && $props[$this->props['recurring']])) {
-				$this->sendResponse(tdmtTaskUpd, _("Task Updated:") . " ");
+				$this->sendResponse(tdmtTaskUpd, _("Task Updated:")." ");
 			}
 			elseif ($props[$this->props['complete']]) {
-				$this->sendResponse(tdmtTaskUpd, _("Task Completed:") . " ");
+				$this->sendResponse(tdmtTaskUpd, _("Task Completed:")." ");
 			}
 
 			return true;
@@ -890,7 +890,7 @@ 
 
 			$attach = mapi_message_createattach($outgoing);
 			mapi_setprops($attach, [PR_ATTACH_METHOD => ATTACH_EMBEDDED_MSG, PR_DISPLAY_NAME => $messageprops[PR_CONVERSATION_TOPIC], PR_ATTACHMENT_HIDDEN => true]);
-			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_CREATE | MAPI_MODIFY);
+			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_CREATE|MAPI_MODIFY);
 
 			$message = !$this->isTaskRequest() ? $this->message : $this->getAssociatedTask(false);
 
@@ -933,7 +933,7 @@ 
 			mapi_savechanges($sub);
 			mapi_savechanges($attach);
 
-			$props[PR_SUBJECT] = $prefix . $messageprops[PR_CONVERSATION_TOPIC];
+			$props[PR_SUBJECT] = $prefix.$messageprops[PR_CONVERSATION_TOPIC];
 			$props[$this->props['taskmode']] = $type;
 			$props[$this->props['task_assigned_time']] = time();
 
@@ -943,7 +943,7 @@ 
 			// edit response before sending task response.
 			if ($this->taskCommentsInfo) {
 				$comments = $this->getTaskCommentsInfo();
-				$stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, STGM_TRANSACTED, MAPI_CREATE | MAPI_MODIFY);
+				$stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, STGM_TRANSACTED, MAPI_CREATE|MAPI_MODIFY);
 				mapi_stream_setsize($stream, strlen($comments));
 				mapi_stream_write($stream, $comments);
 				mapi_stream_commit($stream);
@@ -1206,7 +1206,7 @@ 
 				}
 
 				foreach ($recips as $recip) {
-					$recip[PR_RECIPIENT_TYPE] = MAPI_TO;    // Change recipient type to MAPI_TO
+					$recip[PR_RECIPIENT_TYPE] = MAPI_TO; // Change recipient type to MAPI_TO
 					mapi_message_modifyrecipients($outgoing, MODRECIP_ADD, [$recip]);
 				}
 

grommunio-sync-top.php

Spacing +48 added lines, -48 removed lines

@@ -20,11 +20,11 @@ 
  * MAIN
  */
 	declare(ticks=1);
-	define('BASE_PATH_CLI', dirname(__FILE__) . "/");
-	set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
+	define('BASE_PATH_CLI', dirname(__FILE__)."/");
+	set_include_path(get_include_path().PATH_SEPARATOR.BASE_PATH_CLI);
 
 	if (!defined('GSYNC_CONFIG')) {
-		define('GSYNC_CONFIG', BASE_PATH_CLI . 'config.php');
+		define('GSYNC_CONFIG', BASE_PATH_CLI.'config.php');
 	}
 
 	include_once GSYNC_CONFIG;
@@ -59,7 +59,7 @@ 
 		}
 	}
 	catch (GSyncException $zpe) {
-		fwrite(STDERR, get_class($zpe) . ": " . $zpe->getMessage() . "\n");
+		fwrite(STDERR, get_class($zpe).": ".$zpe->getMessage()."\n");
 
 		exit(1);
 	}
@@ -259,13 +259,13 @@ 
 
 						$lastUpdate = $this->currenttime - $line["update"];
 						if ($this->currenttime - $line["update"] < 2) {
-							$this->linesActive[$line["update"] . $line["pid"]] = $line;
+							$this->linesActive[$line["update"].$line["pid"]] = $line;
 						}
 						elseif (($line['push'] === true && $lastUpdate > ($this->pingInterval + 2)) || ($line['push'] !== true && $lastUpdate > 4)) {
-							$this->linesUnknown[$line["update"] . $line["pid"]] = $line;
+							$this->linesUnknown[$line["update"].$line["pid"]] = $line;
 						}
 						else {
-							$this->linesOpen[$line["update"] . $line["pid"]] = $line;
+							$this->linesOpen[$line["update"].$line["pid"]] = $line;
 						}
 					}
 					else {
@@ -291,7 +291,7 @@ 
 						}
 
 						$line['time'] = $line['ended'] - $line['start'];
-						$this->linesTerm[$line['update'] . $line['pid']] = $line;
+						$this->linesTerm[$line['update'].$line['pid']] = $line;
 					}
 				}
 			}
@@ -312,7 +312,7 @@ 
 	private function scrOverview() {
 		$linesAvail = $this->scrSize['height'] - 8;
 		$lc = 1;
-		$this->scrPrintAt($lc, 0, "\033[1mgrommunio-sync-top live statistics\033[0m\t\t\t\t\t" . @strftime("%d/%m/%Y %T") . "\n");
+		$this->scrPrintAt($lc, 0, "\033[1mgrommunio-sync-top live statistics\033[0m\t\t\t\t\t".@strftime("%d/%m/%Y %T")."\n");
 		++$lc;
 
 		$this->scrPrintAt($lc, 0, sprintf("Open connections: %d\t\t\t\tUsers:\t %d\tgrommunio-sync:   %s ", count($this->activeConn), count($this->activeUsers), $this->getVersion()));
@@ -323,7 +323,7 @@ 
 		++$lc;
 		++$lc;
 
-		$this->scrPrintAt($lc, 0, "\033[4m" . $this->getLine(['pid' => 'PID', 'ip' => 'IP', 'user' => 'USER', 'command' => 'COMMAND', 'time' => 'TIME', 'devagent' => 'AGENT', 'devid' => 'DEVID', 'addinfo' => 'Additional Information']) . str_repeat(" ", 20) . "\033[0m");
+		$this->scrPrintAt($lc, 0, "\033[4m".$this->getLine(['pid' => 'PID', 'ip' => 'IP', 'user' => 'USER', 'command' => 'COMMAND', 'time' => 'TIME', 'devagent' => 'AGENT', 'devid' => 'DEVID', 'addinfo' => 'Additional Information']).str_repeat(" ", 20)."\033[0m");
 		++$lc;
 
 		// print help text if requested
@@ -371,7 +371,7 @@ 
 				break;
 			}
 
-			$this->scrPrintAt($lc, 0, "\033[01m" . $this->getLine($l) . "\033[0m");
+			$this->scrPrintAt($lc, 0, "\033[01m".$this->getLine($l)."\033[0m");
 			++$lc;
 			++$linesprinted;
 		}
@@ -397,7 +397,7 @@ 
 			if ($l['push'] == false && $time - $l["start"] > 30) {
 				$color = "1;31m";
 			}
-			$this->scrPrintAt($lc, 0, "\033[0" . $color . $this->getLine($l) . "\033[0m");
+			$this->scrPrintAt($lc, 0, "\033[0".$color.$this->getLine($l)."\033[0m");
 			++$lc;
 			++$linesprinted;
 		}
@@ -412,7 +412,7 @@ 
 				break;
 			}
 
-			$this->scrPrintAt($lc, 0, "\033[01;30m" . $this->getLine($l) . "\033[0m");
+			$this->scrPrintAt($lc, 0, "\033[01;30m".$this->getLine($l)."\033[0m");
 			++$lc;
 			++$linesprinted;
 		}
@@ -430,7 +430,7 @@ 
 
 		// show request information and help command
 		if ($this->starttime + 6 > $this->currenttime) {
-			$this->status = sprintf("Requesting information (takes up to %dsecs)", $this->pingInterval) . str_repeat(".", ($this->currenttime - $this->starttime)) . "  type \033[01;31mh\033[00;31m or \033[01;31mhelp\033[00;31m for usage instructions";
+			$this->status = sprintf("Requesting information (takes up to %dsecs)", $this->pingInterval).str_repeat(".", ($this->currenttime - $this->starttime))."  type \033[01;31mh\033[00;31m or \033[01;31mhelp\033[00;31m for usage instructions";
 			$this->statusexpire = $this->currenttime + 1;
 		}
 
@@ -448,7 +448,7 @@ 
 		}
 
 		if ($this->showTermSec != self::SHOW_TERM_DEFAULT_TIME) {
-			$str .= "\033[01;32mTerminated: " . $this->showTermSec . "s\033[0m   ";
+			$str .= "\033[01;32mTerminated: ".$this->showTermSec."s\033[0m   ";
 		}
 
 		if ($this->filter !== false || ($this->status !== false && $this->statusexpire > $this->currenttime)) {
@@ -463,7 +463,7 @@ 
 		}
 		$this->scrPrintAt(5, 0, $str);
 
-		$this->scrPrintAt(4, 0, "Action: \033[01m" . $this->action . "\033[0m");
+		$this->scrPrintAt(4, 0, "Action: \033[01m".$this->action."\033[0m");
 	}
 
 	/**
@@ -553,10 +553,10 @@ 
 				// grep the log file
 				elseif (($cmds[0] == "log" || $cmds[0] == "l") && isset($cmds[1])) {
 					if (!file_exists(LOGFILE)) {
-						$this->status = "Logfile can not be found: " . LOGFILE;
+						$this->status = "Logfile can not be found: ".LOGFILE;
 					}
 					else {
-						system('bash -c "fgrep -a ' . escapeshellarg($cmds[1]) . ' ' . LOGFILE . ' | less +G" > `tty`');
+						system('bash -c "fgrep -a '.escapeshellarg($cmds[1]).' '.LOGFILE.' | less +G" > `tty`');
 						$this->status = "Returning from log, updating data";
 					}
 					$this->statusexpire = time() + 5; // it might be much "later" now
@@ -564,7 +564,7 @@ 
 				// tail the log file
 				elseif (($cmds[0] == "tail" || $cmds[0] == "t")) {
 					if (!file_exists(LOGFILE)) {
-						$this->status = "Logfile can not be found: " . LOGFILE;
+						$this->status = "Logfile can not be found: ".LOGFILE;
 					}
 					else {
 						$this->doingTail = true;
@@ -572,9 +572,9 @@ 
 						$this->scrPrintAt(1, 0, $this->scrAsBold("Press CTRL+C to return to grommunio-sync-top\n\n"));
 						$secondary = "";
 						if (isset($cmds[1])) {
-							$secondary = " -n 200 | grep " . escapeshellarg($cmds[1]);
+							$secondary = " -n 200 | grep ".escapeshellarg($cmds[1]);
 						}
-						system('bash -c "tail -f ' . LOGFILE . $secondary . '" > `tty`');
+						system('bash -c "tail -f '.LOGFILE.$secondary.'" > `tty`');
 						$this->doingTail = false;
 						$this->status = "Returning from tail, updating data";
 					}
@@ -583,7 +583,7 @@ 
 				// tail the error log file
 				elseif (($cmds[0] == "error" || $cmds[0] == "e")) {
 					if (!file_exists(LOGERRORFILE)) {
-						$this->status = "Error logfile can not be found: " . LOGERRORFILE;
+						$this->status = "Error logfile can not be found: ".LOGERRORFILE;
 					}
 					else {
 						$this->doingTail = true;
@@ -591,9 +591,9 @@ 
 						$this->scrPrintAt(1, 0, $this->scrAsBold("Press CTRL+C to return to grommunio-sync-top\n\n"));
 						$secondary = "";
 						if (isset($cmds[1])) {
-							$secondary = " -n 200 | grep " . escapeshellarg($cmds[1]);
+							$secondary = " -n 200 | grep ".escapeshellarg($cmds[1]);
 						}
-						system('bash -c "tail -f ' . LOGERRORFILE . $secondary . '" > `tty`');
+						system('bash -c "tail -f '.LOGERRORFILE.$secondary.'" > `tty`');
 						$this->doingTail = false;
 						$this->status = "Returning from tail, updating data";
 					}
@@ -630,9 +630,9 @@ 
 	 * @return string
 	 */
 	public function UsageInstructions() {
-		$help = "Usage:\n\tgrommunio-sync-top.php\n\n" .
-				"  grommunio-sync-top is a live top-like overview of what grommunio-sync is doing. It does not have specific command line options.\n\n" .
-				"  When grommunio-sync-top is running you can specify certain actions and options which can be executed (listed below).\n" .
+		$help = "Usage:\n\tgrommunio-sync-top.php\n\n".
+				"  grommunio-sync-top is a live top-like overview of what grommunio-sync is doing. It does not have specific command line options.\n\n".
+				"  When grommunio-sync-top is running you can specify certain actions and options which can be executed (listed below).\n".
 				"  This help information can also be shown inside grommunio-sync-top by hitting 'help' or 'h'.\n\n";
 		$scrhelp = $this->scrHelp();
 		unset($scrhelp[0]);
@@ -651,23 +651,23 @@ 
 	private function scrHelp() {
 		$h = [];
 		$secs = $this->helpexpire - $this->currenttime;
-		$h[] = "Actions supported by grommunio-sync-top (help page still displayed for " . $secs . "secs)";
-		$h[] = "  " . $this->scrAsBold("Action") . "\t\t" . $this->scrAsBold("Comment");
-		$h[] = "  " . $this->scrAsBold("h") . " or " . $this->scrAsBold("help") . "\t\tDisplays this information.";
-		$h[] = "  " . $this->scrAsBold("q") . ", " . $this->scrAsBold("quit") . " or " . $this->scrAsBold(":q") . "\t\tExits grommunio-sync-top.";
-		$h[] = "  " . $this->scrAsBold("w") . " or " . $this->scrAsBold("wide") . "\t\tTries not to truncate data. Automatically done if more than 180 columns available.";
-		$h[] = "  " . $this->scrAsBold("f:VAL") . " or " . $this->scrAsBold("filter:VAL") . "\tOnly display connections which contain VAL. This value is case-insensitive.";
-		$h[] = "  " . $this->scrAsBold("f:") . " or " . $this->scrAsBold("filter:") . "\t\tWithout a search word: resets the filter.";
-		$h[] = "  " . $this->scrAsBold("l:STR") . " or " . $this->scrAsBold("log:STR") . "\tIssues 'less +G' on the logfile, after grepping on the optional STR.";
-		$h[] = "  " . $this->scrAsBold("t:STR") . " or " . $this->scrAsBold("tail:STR") . "\tIssues 'tail -f' on the logfile, grepping for optional STR.";
-		$h[] = "  " . $this->scrAsBold("e:STR") . " or " . $this->scrAsBold("error:STR") . "\tIssues 'tail -f' on the error logfile, grepping for optional STR.";
-		$h[] = "  " . $this->scrAsBold("r") . " or " . $this->scrAsBold("reset") . "\t\tResets 'wide' or 'filter'.";
-		$h[] = "  " . $this->scrAsBold("o:") . " or " . $this->scrAsBold("option:") . "\t\tSets display options. Valid options specified below";
-		$h[] = "  " . $this->scrAsBold("  p") . " or " . $this->scrAsBold("push") . "\t\tLists/not lists active and open push connections.";
-		$h[] = "  " . $this->scrAsBold("  a") . " or " . $this->scrAsBold("action") . "\t\tLists only active connections.";
-		$h[] = "  " . $this->scrAsBold("  u") . " or " . $this->scrAsBold("unknown") . "\tLists only unknown connections.";
-		$h[] = "  " . $this->scrAsBold("  10") . " or " . $this->scrAsBold("20") . "\t\tLists terminated connections for 10 or 20 seconds. Any other number can be used.";
-		$h[] = "  " . $this->scrAsBold("  d") . " or " . $this->scrAsBold("default") . "\tUses default options";
+		$h[] = "Actions supported by grommunio-sync-top (help page still displayed for ".$secs."secs)";
+		$h[] = "  ".$this->scrAsBold("Action")."\t\t".$this->scrAsBold("Comment");
+		$h[] = "  ".$this->scrAsBold("h")." or ".$this->scrAsBold("help")."\t\tDisplays this information.";
+		$h[] = "  ".$this->scrAsBold("q").", ".$this->scrAsBold("quit")." or ".$this->scrAsBold(":q")."\t\tExits grommunio-sync-top.";
+		$h[] = "  ".$this->scrAsBold("w")." or ".$this->scrAsBold("wide")."\t\tTries not to truncate data. Automatically done if more than 180 columns available.";
+		$h[] = "  ".$this->scrAsBold("f:VAL")." or ".$this->scrAsBold("filter:VAL")."\tOnly display connections which contain VAL. This value is case-insensitive.";
+		$h[] = "  ".$this->scrAsBold("f:")." or ".$this->scrAsBold("filter:")."\t\tWithout a search word: resets the filter.";
+		$h[] = "  ".$this->scrAsBold("l:STR")." or ".$this->scrAsBold("log:STR")."\tIssues 'less +G' on the logfile, after grepping on the optional STR.";
+		$h[] = "  ".$this->scrAsBold("t:STR")." or ".$this->scrAsBold("tail:STR")."\tIssues 'tail -f' on the logfile, grepping for optional STR.";
+		$h[] = "  ".$this->scrAsBold("e:STR")." or ".$this->scrAsBold("error:STR")."\tIssues 'tail -f' on the error logfile, grepping for optional STR.";
+		$h[] = "  ".$this->scrAsBold("r")." or ".$this->scrAsBold("reset")."\t\tResets 'wide' or 'filter'.";
+		$h[] = "  ".$this->scrAsBold("o:")." or ".$this->scrAsBold("option:")."\t\tSets display options. Valid options specified below";
+		$h[] = "  ".$this->scrAsBold("  p")." or ".$this->scrAsBold("push")."\t\tLists/not lists active and open push connections.";
+		$h[] = "  ".$this->scrAsBold("  a")." or ".$this->scrAsBold("action")."\t\tLists only active connections.";
+		$h[] = "  ".$this->scrAsBold("  u")." or ".$this->scrAsBold("unknown")."\tLists only unknown connections.";
+		$h[] = "  ".$this->scrAsBold("  10")." or ".$this->scrAsBold("20")."\t\tLists terminated connections for 10 or 20 seconds. Any other number can be used.";
+		$h[] = "  ".$this->scrAsBold("  d")." or ".$this->scrAsBold("default")."\tUses default options";
 
 		return $h;
 	}
@@ -680,7 +680,7 @@ 
 	 * @return string same text as bold
 	 */
 	private function scrAsBold($text) {
-		return "\033[01m" . $text . "\033[0m";
+		return "\033[01m".$text."\033[0m";
 	}
 
 	/**
@@ -715,10 +715,10 @@ 
 		if ($cutmiddle == true) {
 			$cut = ($size - 2) / 2;
 
-			return $this->ptStr(substr($str, 0, $cut) . ".." . substr($str, (-1) * ($cut - 1)), $size);
+			return $this->ptStr(substr($str, 0, $cut)."..".substr($str, (-1) * ($cut - 1)), $size);
 		}
 
-		return substr($str, 0, $size - 3) . ".. ";
+		return substr($str, 0, $size - 3).".. ";
 	}
 
 	/**
@@ -790,6 +790,6 @@ 
 	 * @return
 	 */
 	private function scrPrintAt($row, $col, $text = "") {
-		echo "\033[" . $row . ";" . $col . "H" . $text;
+		echo "\033[".$row.";".$col."H".$text;
 	}
 }

lib/request/validatecert.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 		$validateCert = new SyncValidateCert();
 		$validateCert->Decode(self::$decoder);
 		$cert_der = base64_decode($validateCert->certificates[0]);
-		$cert_pem = "-----BEGIN CERTIFICATE-----\n" . chunk_split(base64_encode($cert_der), 64, "\n") . "-----END CERTIFICATE-----\n";
+		$cert_pem = "-----BEGIN CERTIFICATE-----\n".chunk_split(base64_encode($cert_der), 64, "\n")."-----END CERTIFICATE-----\n";
 
 		$checkpurpose = (defined('CAINFO') && CAINFO) ? openssl_x509_checkpurpose($cert_pem, X509_PURPOSE_SMIME_SIGN, [CAINFO]) : openssl_x509_checkpurpose($cert_pem, X509_PURPOSE_SMIME_SIGN);
 		if ($checkpurpose === true) {

lib/request/itemoperations.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 			}
 
 			if (!$fetch && !$efc && !$move) {
-				SLog::Write(LOGLEVEL_DEBUG, "Unknown item operation:" . print_r($el, 1));
+				SLog::Write(LOGLEVEL_DEBUG, "Unknown item operation:".print_r($el, 1));
 				self::$topCollector->AnnounceInformation("Unknown operation", true);
 
 				return false;
@@ -249,7 +249,7 @@ 
 						if (self::$decoder->getElementStartTag(SYNC_ITEMOPERATIONS_DELETESUBFOLDERS)) {
 							$operation['deletesubfolders'] = true;
 							if (($dsf = self::$decoder->getElementContent()) !== false) {
-								$operation['deletesubfolders'] = (bool) $dsf;
+								$operation['deletesubfolders'] = (bool)$dsf;
 								if (!self::$decoder->getElementEndTag()) {
 									return false;
 								}

lib/request/request.php

Spacing +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 class Request {
-	public const MAXMEMORYUSAGE = 0.9;     // use max. 90% of allowed memory when syncing
+	public const MAXMEMORYUSAGE = 0.9; // use max. 90% of allowed memory when syncing
 	public const UNKNOWN = "unknown";
 	public const IMPERSONATE_DELIM = '#';
 
@@ -140,7 +140,7 @@ 
 			}
 
 			if (isset(self::$base64QueryDecoded['PolKey'])) {
-				self::$policykey = (int) self::filterEvilInput(self::$base64QueryDecoded['PolKey'], self::NUMBERS_ONLY);
+				self::$policykey = (int)self::filterEvilInput(self::$base64QueryDecoded['PolKey'], self::NUMBERS_ONLY);
 			}
 
 			if (isset(self::$base64QueryDecoded['ProtVer'])) {
@@ -198,7 +198,7 @@ 
 		else {
 			preg_replace_callback(
 				'/(\-?\d+)(.?)/',
-				function ($m) {
+				function($m) {
 					self::$memoryLimit = $m[1] * pow(1024, strpos('BKMG', $m[2])) * self::MAXMEMORYUSAGE;
 				},
 				strtoupper($memoryLimit)
@@ -222,7 +222,7 @@ 
 		// the policy key might be set in Request::Initialize from the base64 encoded query
 		if (!isset(self::$policykey)) {
 			if (isset(self::$headers["x-ms-policykey"])) {
-				self::$policykey = (int) self::filterEvilInput(self::$headers["x-ms-policykey"], self::NUMBERS_ONLY);
+				self::$policykey = (int)self::filterEvilInput(self::$headers["x-ms-policykey"], self::NUMBERS_ONLY);
 			}
 			else {
 				self::$policykey = 0;
@@ -637,7 +637,7 @@ 
 	 * @return int
 	 */
 	public static function GetContentLength() {
-		return (isset(self::$headers["content-length"])) ? (int) self::$headers["content-length"] : 0;
+		return (isset(self::$headers["content-length"])) ? (int)self::$headers["content-length"] : 0;
 	}
 
 	/**
@@ -750,7 +750,7 @@ 
 	private static function filterIP($input) {
 		$in_addr = @inet_pton($input);
 		if ($in_addr === false) {
-			return 'badip-' . self::filterEvilInput($input, self::HEX_EXTENDED);
+			return 'badip-'.self::filterEvilInput($input, self::HEX_EXTENDED);
 		}
 
 		return inet_ntop($in_addr);
@@ -799,14 +799,14 @@ 
 		$polKeyLength = ord($decoded[5 + $devIdLength]); // policy key length
 		$devTypeLength = ord($decoded[6 + $devIdLength + $polKeyLength]); // device type length
 		// unpack the decoded query string values
-		self::$base64QueryDecoded = unpack("CProtVer/CCommand/vLocale/CDevIDLen/H" . ($devIdLength * 2) . "DevID/CPolKeyLen" . ($polKeyLength == 4 ? "/VPolKey" : "") . "/CDevTypeLen/A" . ($devTypeLength) . "DevType", $decoded);
+		self::$base64QueryDecoded = unpack("CProtVer/CCommand/vLocale/CDevIDLen/H".($devIdLength * 2)."DevID/CPolKeyLen".($polKeyLength == 4 ? "/VPolKey" : "")."/CDevTypeLen/A".($devTypeLength)."DevType", $decoded);
 
 		// get the command parameters
 		$pos = 7 + $devIdLength + $polKeyLength + $devTypeLength;
 		$decoded = substr($decoded, $pos);
 		while (strlen($decoded) > 0) {
 			$paramLength = ord($decoded[1]);
-			$unpackedParam = unpack("CParamTag/CParamLength/A" . $paramLength . "ParamValue", $decoded);
+			$unpackedParam = unpack("CParamTag/CParamLength/A".$paramLength."ParamValue", $decoded);
 			self::$base64QueryDecoded[ord($decoded[0])] = $unpackedParam['ParamValue'];
 			// remove parameter from decoded query string
 			$decoded = substr($decoded, 2 + $paramLength);

lib/request/getitemestimate.php

Spacing +3 added lines, -3 removed lines

@@ -61,7 +61,7 @@ 
 				elseif (self::$decoder->getElementStartTag(SYNC_CONVERSATIONMODE)) {
 					$spa->SetConversationMode(true);
 					if (($conversationmode = self::$decoder->getElementContent()) !== false) {
-						$spa->SetConversationMode((bool) $conversationmode);
+						$spa->SetConversationMode((bool)$conversationmode);
 						if (!self::$decoder->getElementEndTag()) {
 							return false;
 						}
@@ -187,7 +187,7 @@ 
 						$sc->AddParameter($spa, "status", SYNC_GETITEMESTSTATUS_COLLECTIONINVALID);
 					}
 
-					self::$topCollector->AnnounceInformation("StateNotFoundException " . $sc->GetParameter($spa, "status"), true);
+					self::$topCollector->AnnounceInformation("StateNotFoundException ".$sc->GetParameter($spa, "status"), true);
 				}
 				catch (StatusException $stex) {
 					if ($stex->getCode() == SYNC_GETITEMESTSTATUS_COLLECTIONINVALID) {
@@ -196,7 +196,7 @@ 
 					else {
 						$sc->AddParameter($spa, "status", SYNC_GETITEMESTSTATUS_SYNCSTATENOTPRIMED);
 					}
-					self::$topCollector->AnnounceInformation("StatusException " . $sc->GetParameter($spa, "status"), true);
+					self::$topCollector->AnnounceInformation("StatusException ".$sc->GetParameter($spa, "status"), true);
 				}
 			}
 		}

lib/request/requestprocessor.php

Spacing +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
 		}
 		catch (Exception $ex) {
 			// Log 10 KB of the WBXML data
-			SLog::Write(LOGLEVEL_FATAL, "WBXML 10K debug data: " . Request::GetInputAsBase64(10240), false);
+			SLog::Write(LOGLEVEL_FATAL, "WBXML 10K debug data: ".Request::GetInputAsBase64(10240), false);
 
 			throw $ex;
 		}
@@ -109,7 +109,7 @@ 
 		// also log WBXML in happy case
 		if (SLog::IsWbxmlDebugEnabled()) {
 			// Log 4 KB in the happy case
-			SLog::Write(LOGLEVEL_WBXML, "WBXML-IN : " . Request::GetInputAsBase64(4096), false);
+			SLog::Write(LOGLEVEL_WBXML, "WBXML-IN : ".Request::GetInputAsBase64(4096), false);
 		}
 
 		return true;

lib/request/sync.php

Spacing +11 added lines, -11 removed lines

@@ -206,7 +206,7 @@ 
 					if (self::$decoder->getElementStartTag(SYNC_DELETESASMOVES)) {
 						$spa->SetDeletesAsMoves(true);
 						if (($dam = self::$decoder->getElementContent()) !== false) {
-							$spa->SetDeletesAsMoves((bool) $dam);
+							$spa->SetDeletesAsMoves((bool)$dam);
 							if (!self::$decoder->getElementEndTag()) {
 								return false;
 							}
@@ -249,7 +249,7 @@ 
 					if (self::$decoder->getElementStartTag(SYNC_CONVERSATIONMODE)) {
 						$spa->SetConversationMode(true);
 						if (($conversationmode = self::$decoder->getElementContent()) !== false) {
-							$spa->SetConversationMode((bool) $conversationmode);
+							$spa->SetConversationMode((bool)$conversationmode);
 							if (!self::$decoder->getElementEndTag()) {
 								return false;
 							}
@@ -619,7 +619,7 @@ 
 
 			if (self::$decoder->getElementStartTag(SYNC_WINDOWSIZE)) {
 				$sc->SetGlobalWindowSize(self::$decoder->getElementContent());
-				SLog::Write(LOGLEVEL_DEBUG, "Sync(): Global WindowSize requested: " . $sc->GetGlobalWindowSize());
+				SLog::Write(LOGLEVEL_DEBUG, "Sync(): Global WindowSize requested: ".$sc->GetGlobalWindowSize());
 				if (!self::$decoder->getElementEndTag()) { // SYNC_WINDOWSIZE
 					return false;
 				}
@@ -1197,7 +1197,7 @@ 
 		}
 
 		// Stream outgoing changes
-		if ($status == SYNC_STATUS_SUCCESS && $sc->GetParameter($spa, "getchanges") == true && $windowSize > 0 && (bool) $exporter) {
+		if ($status == SYNC_STATUS_SUCCESS && $sc->GetParameter($spa, "getchanges") == true && $windowSize > 0 && (bool)$exporter) {
 			self::$topCollector->AnnounceInformation(sprintf("Streaming data of %d objects", (($changecount > $windowSize) ? $windowSize : $changecount)));
 
 			// Output message changes per folder
@@ -1249,7 +1249,7 @@ 
 
 			// $progress is not an array when exporting the last message
 			// so we get the number to display from the streamimporter if it's available
-			if ((bool) $streamimporter) {
+			if ((bool)$streamimporter) {
 				$n = $streamimporter->GetImportedMessages();
 			}
 
@@ -1266,7 +1266,7 @@ 
 				}
 			}
 
-			self::$topCollector->AnnounceInformation(sprintf("Outgoing %d objects%s", $n, ($n >= $windowSize) ? " of " . $changecount : ""), $this->singleFolder);
+			self::$topCollector->AnnounceInformation(sprintf("Outgoing %d objects%s", $n, ($n >= $windowSize) ? " of ".$changecount : ""), $this->singleFolder);
 			$this->saveMultiFolderInfo("outgoing", $n);
 			$this->saveMultiFolderInfo("queued", $changecount);
 
@@ -1539,7 +1539,7 @@ 
 							SLog::Write(LOGLEVEL_DEBUG, "SMS sync are not supported. Ignoring message.");
 							// TODO we should create the SMS
 							// return a fake serverid which we can identify later
-							$actiondata["clientids"][$clientid] = self::GSYNCIGNORESMS . $clientid;
+							$actiondata["clientids"][$clientid] = self::GSYNCIGNORESMS.$clientid;
 							$actiondata["statusids"][$clientid] = SYNC_STATUS_SUCCESS;
 						}
 						// check incoming message without logging WARN messages about errors
@@ -1630,9 +1630,9 @@ 
 	 * @return string
 	 */
 	private function getMultiFolderInfoLine($amountOfFolders) {
-		$s = $amountOfFolders . " folders";
+		$s = $amountOfFolders." folders";
 		if (isset($this->multiFolderInfo["incoming"])) {
-			$s .= ": " . $this->multiFolderInfo["incoming"] . " saved";
+			$s .= ": ".$this->multiFolderInfo["incoming"]." saved";
 		}
 		if (isset($this->multiFolderInfo["outgoing"], $this->multiFolderInfo["queued"]) && $this->multiFolderInfo["outgoing"] > 0) {
 			$s .= sprintf(": Streamed %d out of %d", $this->multiFolderInfo["outgoing"], $this->multiFolderInfo["queued"]);
@@ -1642,10 +1642,10 @@ 
 		}
 		else {
 			if (isset($this->multiFolderInfo["outgoing"])) {
-				$s .= "/" . $this->multiFolderInfo["outgoing"] . " streamed";
+				$s .= "/".$this->multiFolderInfo["outgoing"]." streamed";
 			}
 			if (isset($this->multiFolderInfo["queued"])) {
-				$s .= "/" . $this->multiFolderInfo["queued"] . " queued";
+				$s .= "/".$this->multiFolderInfo["queued"]." queued";
 			}
 		}
 		if (isset($this->multiFolderInfo["exception"])) {

lib/log/syslog.php

Spacing +10 added lines, -10 removed lines

@@ -52,7 +52,7 @@ 
 	 */
 	public function SetPort($value) {
 		if (is_numeric($value)) {
-			$this->port = (int) $value;
+			$this->port = (int)$value;
 		}
 	}
 
@@ -97,18 +97,18 @@ 
 			if (!isset($trace['file'])) {
 				continue;
 			}
-			if (strpos($trace['file'], REAL_BASE_PATH . 'backend/') !== false) {
+			if (strpos($trace['file'], REAL_BASE_PATH.'backend/') !== false) {
 				preg_match('/\/backend\/([a-zA-Z]*)/', $trace['file'], $match);
 				if (isset($match[1])) {
-					return $this->GetProgramName() . '/' . $match[1];
+					return $this->GetProgramName().'/'.$match[1];
 				}
 			}
 			elseif (basename($trace['file'], '.php') != 'slog') {
-				return $this->GetProgramName() . '/core';
+				return $this->GetProgramName().'/core';
 			}
 		}
 
-		return $this->GetProgramName() . '/core';
+		return $this->GetProgramName().'/core';
 	}
 
 	/**
@@ -161,15 +161,15 @@ 
 		$log = $this->GetLogLevelString($loglevel); // Never pad syslog log because syslog log are usually read with a software.
 		// when the users differ, we need to log both
 		if (strcasecmp($this->GetAuthUser(), $this->GetUser()) == 0) {
-			$log .= ' [' . $this->GetUser() . ']';
+			$log .= ' ['.$this->GetUser().']';
 		}
 		else {
-			$log .= ' [' . $this->GetAuthUser() . Request::IMPERSONATE_DELIM . $this->GetUser() . ']';
+			$log .= ' ['.$this->GetAuthUser().Request::IMPERSONATE_DELIM.$this->GetUser().']';
 		}
 		if ($loglevel >= LOGLEVEL_DEVICEID) {
-			$log .= '[' . $this->GetDevid() . ']';
+			$log .= '['.$this->GetDevid().']';
 		}
-		$log .= ' ' . $message;
+		$log .= ' '.$message;
 
 		return $log;
 	}
@@ -191,7 +191,7 @@ 
 			$pri = ($facility * 8) + $loglevel; // multiplying the Facility number by 8 + adding the level
 			$data = $this->BuildLogString($loglevel, $message);
 			if (strlen(trim($data)) > 0) {
-				$syslog_message = "<{$pri}>" . date('M d H:i:s ') . '[' . $this->GetProgramName() . ']: ' . $data;
+				$syslog_message = "<{$pri}>".date('M d H:i:s ').'['.$this->GetProgramName().']: '.$data;
 				socket_sendto($sock, $syslog_message, strlen($syslog_message), 0, $this->GetHost(), $this->GetPort());
 			}
 			socket_close($sock);