From d0ff9efc08c39687783b4aa7f40560ebcd329783 Mon Sep 17 00:00:00 2001 From: Aaron Goulet Date: Sun, 2 Apr 2017 09:07:44 -0700 Subject: [PATCH 1/2] Issue #1371: Grant logout permissions by default --- TShockAPI/DB/GroupManager.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TShockAPI/DB/GroupManager.cs b/TShockAPI/DB/GroupManager.cs index e85328bf..d9d74afe 100644 --- a/TShockAPI/DB/GroupManager.cs +++ b/TShockAPI/DB/GroupManager.cs @@ -52,7 +52,7 @@ namespace TShockAPI.DB // Add default groups if they don't exist AddDefaultGroup("guest", "", string.Join(",", Permissions.canbuild, Permissions.canregister, Permissions.canlogin, Permissions.canpartychat, - Permissions.cantalkinthird, Permissions.canchat)); + Permissions.cantalkinthird, Permissions.canchat, Permissions.canlogout)); AddDefaultGroup("default", "guest", string.Join(",", Permissions.warp, Permissions.canchangepassword)); @@ -228,7 +228,7 @@ namespace TShockAPI.DB var group = TShock.Utils.GetGroup(name); var oldperms = group.Permissions; // Store old permissions in case of error permissions.ForEach(p => group.AddPermission(p)); - + if (database.Query("UPDATE GroupList SET Commands=@0 WHERE GroupName=@1", group.Permissions, name) == 1) return "Group " + name + " has been modified successfully."; @@ -248,7 +248,7 @@ namespace TShockAPI.DB if (database.Query("UPDATE GroupList SET Commands=@0 WHERE GroupName=@1", group.Permissions, name) == 1) return "Group " + name + " has been modified successfully."; - + // Restore old permissions so DB and internal object are in a consistent state group.Permissions = oldperms; return ""; @@ -319,7 +319,7 @@ namespace TShockAPI.DB if (group.Parent == null) { TShock.Log.ConsoleError( - "ERROR: Group \"{0}\" is referencing non existent parent group \"{1}\", parent reference was removed.", + "ERROR: Group \"{0}\" is referencing non existent parent group \"{1}\", parent reference was removed.", group.Name, parentGroupName); } else @@ -391,4 +391,4 @@ namespace TShockAPI.DB { } } -} +} From ffe4849747831ea42dc5b561604f94ba72b5617c Mon Sep 17 00:00:00 2001 From: Aaron Goulet Date: Thu, 13 Apr 2017 20:22:59 -0700 Subject: [PATCH 2/2] Default Logout Permissions Moved Permissions.canlogout to the default permissions group. --- TShockAPI/DB/GroupManager.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TShockAPI/DB/GroupManager.cs b/TShockAPI/DB/GroupManager.cs index d9d74afe..62bad891 100644 --- a/TShockAPI/DB/GroupManager.cs +++ b/TShockAPI/DB/GroupManager.cs @@ -52,10 +52,10 @@ namespace TShockAPI.DB // Add default groups if they don't exist AddDefaultGroup("guest", "", string.Join(",", Permissions.canbuild, Permissions.canregister, Permissions.canlogin, Permissions.canpartychat, - Permissions.cantalkinthird, Permissions.canchat, Permissions.canlogout)); + Permissions.cantalkinthird, Permissions.canchat)); AddDefaultGroup("default", "guest", - string.Join(",", Permissions.warp, Permissions.canchangepassword)); + string.Join(",", Permissions.warp, Permissions.canchangepassword, Permissions.canlogout)); AddDefaultGroup("newadmin", "default", string.Join(",", Permissions.kick, Permissions.editspawn, Permissions.reservedslot));