Fix /mail sendall, fixes #1209

8 files changed, 14 insertions, 12 deletions

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
index 8a2787d82..884238393 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
@@ -39,7 +39,7 @@ public class Commandmail extends EssentialsCommand
 		{
 			if (!user.isAuthorized("essentials.mail.send"))
 			{
-				throw new Exception(_("noMailSendPerm"));
+				throw new Exception(_("noPerm","essentials.mail.send"));
 			}
 
 			Player player = server.getPlayer(args[1]);
@@ -63,13 +63,15 @@ public class Commandmail extends EssentialsCommand
 			user.sendMessage(_("mailSent"));
 			return;
 		}
-		if (args.length >= 1 && "sendall".equalsIgnoreCase(args[0]))
+		if (args.length > 1 && "sendall".equalsIgnoreCase(args[0]))
 		{
 			if (!user.isAuthorized("essentials.mail.sendall"))
 			{
-				throw new Exception(_("noMailSendPerm"));
+				throw new Exception(_("noPerm","essentials.mail.sendall"));
 			}
-			ess.scheduleAsyncDelayedTask(new SendAll(ChatColor.stripColor(user.getDisplayName()) + ": " + getFinalArg(args, 2)));
+			ess.scheduleAsyncDelayedTask(new SendAll(ChatColor.stripColor(user.getDisplayName()) + ": " + getFinalArg(args, 1)));
+			user.sendMessage(_("mailSent"));
+			return;
 		}
 		if (args.length >= 1 && "clear".equalsIgnoreCase(args[0]))
 		{
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 37b05f5e7..b9e27b959 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -15,7 +15,7 @@ backUsageMsg=\u00a77Returning to previous location.
 backupFinished=Backup finished
 backupStarted=Backup started
 balance=\u00a77Balance: {0}
-balanceTop=\u00a77Top {0} balances ({1})
+balanceTop=\u00a77Top balances ({0})
 banExempt=\u00a7cYou can not ban that player.
 banIpAddress=\u00a77Banned IP address
 bannedIpsFileError=Error reading banned-ips.txt
@@ -219,10 +219,10 @@ noHomeSetPlayer=Player has not set a home.
 noKitPermission=\u00a7cYou need the \u00a7c{0}\u00a7c permission to use that kit.
 noKits=\u00a77There are no kits available yet
 noMail=You do not have any mail
-noMailSendPerm=\u00a7cYou do not have the \u00a7fessentials.mail.send\u00a7c permission.
 noMotd=\u00a7cThere is no message of the day.
 noNewMail=\u00a77You have no new mail.
 noPendingRequest=You do not have a pending request.
+noPerm=\u00a7cYou do not have the \u00a7f{0}\u00a7c permission.
 noPermToSpawnMob=\u00a7cYou don''t have permission to spawn this mob.
 noPlacePermission=\u00a7cYou do not have permission to place a block near that sign.
 noPowerTools=You have no power tools assigned.
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index 48c149bb2..d44f66c72 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -219,10 +219,10 @@ noHomeSetPlayer=Spilleren har ikke sat et hjem.
 noKitPermission=\u00a7cDu har brug for \u00a7c{0}\u00a7c permission for at bruge dette kit.
 noKits=\u00a77Der er ikke nogen kits tilg\u00e6ngelige endnu
 noMail=Du har ikke noget flaskepost.
-noMailSendPerm=\u00a7cDu har ikke \u00a7fessentials.mail.send\u00a7c permission.
 noMotd=\u00a7cDer er ingen Message of the day.
 noNewMail=\u00a77Du har ingen ny flaskepost.
 noPendingRequest=Du har ikke en ventende anmodning.
+noPerm=\u00a7cDu har ikke \u00a7f{0}\u00a7c permission.
 noPermToSpawnMob=\u00a7cDu har ikke tilladelse til at spawne denne mob.
 noPlacePermission=\u00a7cDu har ikke tiladelse til at placere en block n\u00c3\u00a6r det skilt.
 noPowerTools= Du har ingen power tools tilf\u00c3\u00b8jet.
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index 980cbdeb9..5de616099 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -219,10 +219,10 @@ noHomeSetPlayer=Spieler hat kein Zuhause gesetzt.
 noKitPermission=\u00a7cDu brauchst die Berechtigung \u00a7c{0}\u00a7c um diese Ausr\u00fcstung anzufordern.
 noKits=\u00a77Es sind keine Ausr\u00fcstungen verf\u00fcgbar.
 noMail=Du hast keine Nachrichten
-noMailSendPerm=\u00a7cDu hast die Rechte \u00a7fessentials.mail.send\u00a7c nicht.
 noMotd=\u00a7cEs existiert keine Willkommensnachricht.
 noNewMail=\u00a77Du hast keine Nachrichten.
 noPendingRequest=Du hast keine Teleportierungsanfragen.
+noPerm=\u00a7cDu hast die Rechte \u00a7f{0}\u00a7c nicht.
 noPermToSpawnMob=\u00a7cYou don''t have permission to spawn this mob.
 noPlacePermission=\u00a7cDu hast keine Rechte, einen Block in der N\u00e4he des Schildes zu platzieren.
 noPowerTools=Du hast keine Powertools zugewiesen.
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 5800b1488..72d095524 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -219,10 +219,10 @@ noHomeSetPlayer=Player has not set a home.
 noKitPermission=\u00a7cYou need the \u00a7c{0}\u00a7c permission to use that kit.
 noKits=\u00a77There are no kits available yet
 noMail=You do not have any mail
-noMailSendPerm=\u00a7cYou do not have the \u00a7fessentials.mail.send\u00a7c permission.
 noMotd=\u00a7cThere is no message of the day.
 noNewMail=\u00a77You have no new mail.
 noPendingRequest=You do not have a pending request.
+noPerm=\u00a7cYou do not have the \u00a7f{0}\u00a7c permission.
 noPermToSpawnMob=\u00a7cYou don''t have permission to spawn this mob.
 noPlacePermission=\u00a7cYou do not have permission to place a block near that sign.
 noPowerTools=You have no power tools assigned.
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index 60a3a2db3..fc6b13eb1 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -219,10 +219,10 @@ noHomeSetPlayer=El jugador no ha establecido un hogar.
 noKitPermission=\u00a7cNecesitas los \u00a7c{0}\u00a7c permisos para usar ese kit.
 noKits=\u00a77No hay kits disponibles todavia
 noMail=No tienes ningun email recivido
-noMailSendPerm=\u00a7cNo tienes el permiso de \u00a7fessentials.mail.send\u00a7c.
 noMotd=\u00a7cNo hay ningun mensaje del dia.
 noNewMail=\u00a77No tienes ningun correo nuevo.
 noPendingRequest=No tienes ninguna peticion pendiente.
+noPerm=\u00a7cNo tienes el permiso de \u00a7f{0}\u00a7c.
 noPermToSpawnMob=\u00a7cYou don''t have permission to spawn this mob.
 noPlacePermission=\u00a7cNo tienes permiso para situar ese bloque en ese lugar.
 noPowerTools=You have no power tools assigned.
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 6dbd93746..97e87b14b 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -219,10 +219,10 @@ noHomeSetPlayer=Le joueur n''a pas d\u00e9fini sa r\u00e9sidence.
 noKitPermission=\u00a7cVous avez besoin de la permission \u00a7c{0}\u00a7c pour utiliser ce kit.
 noKits=\u00a77Il n''y a pas encore de kits disponibles.
 noMail=Vous n''avez pas de courrier
-noMailSendPerm=\u00a7cVous n''avez pas la permission \u00a7fessentials.mail.send\u00a7c.
 noMotd=\u00a7cIl n''y a pas de message su jour.
 noNewMail=\u00a77Vous n''avez pas de courrier.
 noPendingRequest=Vous n''avez pas de requ\u00eate non lue.
+noPerm=\u00a7cVous n''avez pas la permission \u00a7f{0}\u00a7c.
 noPermToSpawnMob=\u00a7cYou don''t have permission to spawn this mob.
 noPlacePermission=\u00a7cVous n''avez pas la permission de placer un bloc pr\u00c3\u00a8 de cette pancarte.
 noPowerTools=Vous n''avez pas d''outil automatique associ\u00e9.
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index 4d26e0a0c..c92952adb 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -219,10 +219,10 @@ noHomeSetPlayer=Speler heeft geen home.
 noKitPermission=\u00a7cJe hebt de \u00a7c{0}\u00a7c toestemming nodig om die kit te gebruiken.
 noKits=\u00a77Er zijn nog geen kits beschikbaar
 noMail=Je hebt geen berichten
-noMailSendPerm=\u00a7cJe hebt de \u00a7fessentials.mail.send\u00a7c toestemming niet.
 noMotd=\u00a7cEr is geen bericht van de dag.
 noNewMail=\u00a77Je hebt geen nieuwe berichten.
 noPendingRequest=Je hebt geen aanvragen.
+noPerm=\u00a7cJe hebt de \u00a7f{0}\u00a7c toestemming niet.
 noPermToSpawnMob=\u00a7cYou don''t have permission to spawn this mob.
 noPlacePermission=\u00a7cJe hebt geen toestemming om een blok naast die sign te plaatsen.
 noPowerTools=You have no power tools assigned.