One-line results for other commands for clean logs

Author: tin-cat

common.inc.php

@@ -183,14 +183,14 @@ function deliver_email(&$mail, $email, $isOutputVerbose = false) {
 
 		if ($isOutputVerbose) {
 			flush();
-			echo " [✉️ ".$email["id"]." / ".$email["to"];
+			echo " [#".$email["id"]." / ".$email["to"];
 		}
 
 		setsendingnow($email["id"]);
 
 		if ($email["is_sendingnow"]) {
 			if ($isOutputVerbose)
-				echo " / Already being sent.";
+				echo " / Already being sent";
 			add_incidence($email["id"], "Try to send an email that is already being sent");
 			$logger->add_log_incidence(
 				array
@@ -204,7 +204,7 @@ function deliver_email(&$mail, $email, $isOutputVerbose = false) {
 		}
 
 		if (!checkemail($email["to"])) {
-			echo " / Bad recipient.";
+			echo " / Bad recipient";
 			add_incidence($email["id"], "Incorrect recipient email address: ".$email["to"]);
 			cancel($email["id"]);
 			$logger->add_log_incidence(
@@ -219,7 +219,7 @@ function deliver_email(&$mail, $email, $isOutputVerbose = false) {
 
 		if (!checkemail($email["from"])) {
 			if ($isOutputVerbose)
-				echo " / Bad sender.";
+				echo " / Bad sender";
 			add_incidence($email["id"], "Incorrect sender email address: ".$email["from"]);
 			cancel($email["id"]);
 			$logger->add_log_incidence
@@ -238,7 +238,7 @@ function deliver_email(&$mail, $email, $isOutputVerbose = false) {
 		if (isset($blacklisted_emails))
 			if (is_array($blacklisted_emails) and in_array(strtolower(trim($email["to"])), $blacklisted_emails)) {
 				if ($isOutputVerbose)
-					echo " / Black listed.";
+					echo " / Black listed";
 				add_incidence($email["id"], "Recipient is on the black list: ".$email["to"]);
 				cancel($email["id"]);
 				$logger->add_log_incidence(
@@ -386,7 +386,7 @@ function deliver_email(&$mail, $email, $isOutputVerbose = false) {
 						)
 					);
 					if ($isOutputVerbose)
-						echo " / No more attempts.";
+						echo " / No more attempts";
 				}
 				else {
 					update_error_count($email["id"], $email["error_count"]+1);
@@ -399,7 +399,7 @@ function deliver_email(&$mail, $email, $isOutputVerbose = false) {
 						$incidence_text
 					));
 					if ($isOutputVerbose)
-						echo " / Scheduled for one more try.";
+						echo " / Scheduled for one more try";
 				}
 
 			} else {