Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Corrected all commands of PermCommands 

onCommand now supports the change of the permissions prefix
This commit is contained in:
snowleo 2011-06-26 15:47:28 +02:00
parent 3b9a07e560
commit 88ded926f4
24 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Essentials/src/com/earth2me/essentials/Essentials.java
View File

@ -352,22 +352,13 @@ public class Essentials extends JavaPlugin implements IEssentials
return retval;
}
@SuppressWarnings("LoggerStringConcat")
public static void previewCommand(CommandSender sender, Command command, String commandLabel, String[] args)
{
if (sender instanceof Player)
{
logger.info(ChatColor.BLUE + "[PLAYER_COMMAND] " + ((Player)sender).getName() + ": /" + commandLabel + " " + EssentialsCommand.getFinalArg(args, 0));
}
}
@Override
public boolean onCommand(CommandSender sender, Command command, String commandLabel, String[] args)
{
return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command");
return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.");
}
public boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath)
public boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix)
{
if (("msg".equals(commandLabel.toLowerCase()) || "r".equals(commandLabel.toLowerCase()) || "mail".equals(commandLabel.toLowerCase())) && sender instanceof Player)
{
@ -416,8 +407,12 @@ public class Essentials extends JavaPlugin implements IEssentials
try
{
previewCommand(sender, command, commandLabel, args);
User user = sender instanceof Player ? getUser(sender) : null;
User user = null;
if (sender instanceof Player)
{
user = getUser(sender);
logger.log(Level.INFO, String.format("[PLAYER_COMMAND] %s: /%s %s ", ((Player)sender).getName(), commandLabel , EssentialsCommand.getFinalArg(args, 0)));
}
// New mail notification
if (user != null && !getSettings().isCommandDisabled("mail") && !commandLabel.equals("mail") && user.isAuthorized("essentials.mail"))
@ -449,7 +444,7 @@ public class Essentials extends JavaPlugin implements IEssentials
}
// Check authorization
if (user != null && !user.isAuthorized(cmd))
if (user != null && !user.isAuthorized(cmd, permissionPrefix))
{
logger.log(Level.WARNING, Util.format("deniedAccessCommand", user.getName()));
user.sendMessage(Util.i18n("noAccessCommand"));

2
Essentials/src/com/earth2me/essentials/IEssentials.java
View File

@ -16,7 +16,7 @@ public interface IEssentials
void reload();
boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath);
boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix);
User getUser(Object base);

2
Essentials/src/com/earth2me/essentials/IUser.java
View File

@ -22,6 +22,8 @@ public interface IUser
boolean isAuthorized(String node);
boolean isAuthorized(IEssentialsCommand cmd);
boolean isAuthorized(IEssentialsCommand cmd, String permissionPrefix);
void setLastTeleportTimestamp(long time);

9
Essentials/src/com/earth2me/essentials/User.java
View File

@ -31,10 +31,15 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
setBase(base);
return this;
}
public boolean isAuthorized(IEssentialsCommand cmd)
{
return isAuthorized("essentials." + (cmd.getName().equals("r") ? "msg" : cmd.getName()));
return isAuthorized(cmd, "essentials.");
}
public boolean isAuthorized(IEssentialsCommand cmd, String permissionPrefix)
{
return isAuthorized(permissionPrefix + (cmd.getName().equals("r") ? "msg" : cmd.getName()));
}
public boolean isAuthorized(String node)

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangadd.java
View File

@ -21,7 +21,7 @@ public class Commandmangadd extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
final String group = args[0];
String command = "/permissions g:" + group + " create";
String command = "permissions g:" + group + " create";
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddi.java
View File

@ -22,7 +22,7 @@ public class Commandmangaddi extends EssentialsCommand
}
final String target = args[0];
final String group = args[1];
String command = "/permissions g:"+target+" parents add "+group;
String command = "permissions g:"+target+" parents add "+group;
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddp.java
View File

@ -22,7 +22,7 @@ public class Commandmangaddp extends EssentialsCommand
}
final String target = args[0];
final String perm = args[1];
String command = "/permissions g:"+target+" perms add "+perm;
String command = "permissions g:"+target+" perms add "+perm;
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangcheckp.java
View File

@ -22,7 +22,7 @@ public class Commandmangcheckp extends EssentialsCommand
}
final String target = args[0];
final String perm = args[1];
String command = "/permissions g:"+target+" has "+perm;
String command = "permissions g:"+target+" has "+perm;
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdel.java
View File

@ -21,7 +21,7 @@ public class Commandmangdel extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
final String group = args[0];
String command = "/permissions g:"+group+" delete";
String command = "permissions g:"+group+" delete";
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdeli.java
View File

@ -22,7 +22,7 @@ public class Commandmangdeli extends EssentialsCommand
}
final String target = args[0];
final String group = args[1];
String command = "/permissions g:"+target+" parents remove "+group;
String command = "permissions g:"+target+" parents remove "+group;
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdelp.java
View File

@ -22,7 +22,7 @@ public class Commandmangdelp extends EssentialsCommand
}
final String target = args[0];
final String perm = args[1];
String command = "/permissions g:"+target+" perms remove "+perm;
String command = "permissions g:"+target+" perms remove "+perm;
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanglistp.java
View File

@ -21,7 +21,7 @@ public class Commandmanglistp extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
final String target = args[0];
String command = "/permissions g:"+target+" perms list";
String command = "permissions g:"+target+" perms list";
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanload.java
View File

@ -21,7 +21,7 @@ public class Commandmanload extends EssentialsCommand
{
world = args[0];
}
String command = "/permissions -reload "+world;
String command = "permissions -reload "+world;
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuadd.java
View File

@ -23,7 +23,7 @@ public class Commandmanuadd extends EssentialsCommand
final String player = args[0];
final String group = args[1];
//TODO: Make this command add a player if it doesnt exist /permissions +player+ create
String command = "/permissions "+player+" parents add "+group;
String command = "permissions "+player+" parents add "+group;
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddp.java
View File

@ -22,7 +22,7 @@ public class Commandmanuaddp extends EssentialsCommand
}
final String player = args[0];
final String perm = args[1];
String command = "/permissions "+player+" perms add "+perm;
String command = "permissions "+player+" perms add "+perm;
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddsub.java
View File

@ -22,7 +22,7 @@ public class Commandmanuaddsub extends EssentialsCommand
}
final String player = args[0];
final String group = args[1];
String command = "/permissions "+player+" parents add "+group;
String command = "permissions "+player+" parents add "+group;
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanucheckp.java
View File

@ -22,7 +22,7 @@ public class Commandmanucheckp extends EssentialsCommand
}
final String player = args[0];
final String perm = args[1];
String command = "/permissions "+player+" has "+perm;
String command = "permissions "+player+" has "+perm;
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudel.java
View File

@ -21,7 +21,7 @@ public class Commandmanudel extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
final String player = args[0];
String command = "/permissions "+player+" delete";
String command = "permissions "+player+" delete";
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelp.java
View File

@ -22,7 +22,7 @@ public class Commandmanudelp extends EssentialsCommand
}
final String player = args[0];
final String perm = args[1];
String command = "/permissions "+player+" perms remove "+perm;
String command = "permissions "+player+" perms remove "+perm;
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelsub.java
View File

@ -22,7 +22,7 @@ public class Commandmanudelsub extends EssentialsCommand
}
final String player = args[0];
final String group = args[1];
String command = "/permissions "+player+" parents remove "+group;
String command = "permissions "+player+" parents remove "+group;
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanulistp.java
View File

@ -21,7 +21,7 @@ public class Commandmanulistp extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
final String player = args[0];
String command = "/permissions "+player+" perms list";
String command = "permissions "+player+" perms list";
sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
ess.getServer().dispatchCommand(sender, command);
}

2
EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/EssentialsPermissionsCommands.java
View File

@ -35,7 +35,7 @@ public class EssentialsPermissionsCommands extends JavaPlugin
@Override
public boolean onCommand(final CommandSender sender, final Command command, final String label, final String[] args)
{
return Essentials.getStatic().onCommandEssentials(sender, command, label, args, EssentialsPermissionsCommands.class.getClassLoader(), "com.earth2me.essentials.permissions.Command");
return Essentials.getStatic().onCommandEssentials(sender, command, label, args, EssentialsPermissionsCommands.class.getClassLoader(), "com.earth2me.essentials.permissions.Command", "groupmanager.");
}
@Override

2
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
View File

@ -38,6 +38,6 @@ public class EssentialsSpawn extends JavaPlugin
@Override
public boolean onCommand(CommandSender sender, Command command, String commandLabel, String[] args)
{
return Essentials.getStatic().onCommandEssentials(sender, command, commandLabel, args, EssentialsSpawn.class.getClassLoader(), "com.earth2me.essentials.spawn.Command");
return Essentials.getStatic().onCommandEssentials(sender, command, commandLabel, args, EssentialsSpawn.class.getClassLoader(), "com.earth2me.essentials.spawn.Command", "essentials.");
}
}

2
EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
View File

@ -65,7 +65,7 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP
@Override
public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args)
{
return Essentials.getStatic().onCommandEssentials(sender, command, commandLabel, args, EssentialsXMPP.class.getClassLoader(), "com.earth2me.essentials.xmpp.Command");
return Essentials.getStatic().onCommandEssentials(sender, command, commandLabel, args, EssentialsXMPP.class.getClassLoader(), "com.earth2me.essentials.xmpp.Command", "essentials.");
}
@Override