X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=204b136f9bb93a5c4f92601bab5ad5e90e8ee29c;hb=fd1da749808cdfccf05a4fa9ba8ba6aeafd35a9b;hp=438f96030b529808bbbf4889a281c539b8f6ef2c;hpb=fc0312451d3b8f8d10fc01701216fdd3a5139102;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index 438f96030b..204b136f9b 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -68,7 +68,7 @@ function message_init(App $a)
 function message_post(App $a)
 {
 	if (!local_user()) {
-		notice(DI::l10n()->t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.'));
 		return;
 	}
 
@@ -82,20 +82,18 @@ function message_post(App $a)
 
 	switch ($ret) {
 		case -1:
-			notice(DI::l10n()->t('No recipient selected.') . EOL);
+			notice(DI::l10n()->t('No recipient selected.'));
 			$norecip = true;
 			break;
 		case -2:
-			notice(DI::l10n()->t('Unable to locate contact information.') . EOL);
+			notice(DI::l10n()->t('Unable to locate contact information.'));
 			break;
 		case -3:
-			notice(DI::l10n()->t('Message could not be sent.') . EOL);
+			notice(DI::l10n()->t('Message could not be sent.'));
 			break;
 		case -4:
-			notice(DI::l10n()->t('Message collection failure.') . EOL);
+			notice(DI::l10n()->t('Message collection failure.'));
 			break;
-		default:
-			info(DI::l10n()->t('Message sent.') . EOL);
 	}
 
 	// fake it to go back to the input form if no recipient listed
@@ -113,7 +111,7 @@ function message_content(App $a)
 	Nav::setSelected('messages');
 
 	if (!local_user()) {
-		notice(DI::l10n()->t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.'));
 		return Login::form();
 	}
 
@@ -178,17 +176,16 @@ function message_content(App $a)
 		if ($cmd === 'drop') {
 			$message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
 			if(!DBA::isResult($message)){
-				info(DI::l10n()->t('Conversation not found.') . EOL);
+				notice(DI::l10n()->t('Conversation not found.'));
 				DI::baseUrl()->redirect('message');
 			}
 
-			if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
-				info(DI::l10n()->t('Message deleted.') . EOL);
+			if (!DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
+				notice(DI::l10n()->t('Message was not deleted.'));
 			}
 
 			$conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => local_user()]);
 			if(!DBA::isResult($conversation)){
-				info(DI::l10n()->t('Conversation removed.') . EOL);
 				DI::baseUrl()->redirect('message');
 			}
 
@@ -201,8 +198,8 @@ function message_content(App $a)
 			if (DBA::isResult($r)) {
 				$parent = $r[0]['parent-uri'];
 
-				if (DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
-					info(DI::l10n()->t('Conversation removed.') . EOL);
+				if (!DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
+					notice(DI::l10n()->t('Conversation was not removed.'));
 				}
 			}
 			DI::baseUrl()->redirect('message');
@@ -301,7 +298,7 @@ function message_content(App $a)
 		$r = get_messages(local_user(), $pager->getStart(), $pager->getItemsPerPage());
 
 		if (!DBA::isResult($r)) {
-			info(DI::l10n()->t('No messages.') . EOL);
+			notice(DI::l10n()->t('No messages.'));
 			return $o;
 		}
 
@@ -358,7 +355,7 @@ function message_content(App $a)
 		}
 
 		if (!DBA::isResult($messages)) {
-			notice(DI::l10n()->t('Message not available.') . EOL);
+			notice(DI::l10n()->t('Message not available.'));
 			return $o;
 		}