diff --git a/CHANGELOG.md b/CHANGELOG.md index 91553f0ac..af52dab69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,15 @@ Legend: ? = Other stuff ``` +(28/04/16): Version 1.5.4.7 +----------------------- +01. ! Fix Admins and Groups Not Loading from Config + +(23/04/16): Version 1.5.4.6 +----------------------- +01. ! Fix Perm Ban bug in SourceSleuth +02. ! Fix Updater + (18/04/16): Version 1.5.4.5 ----------------------- 01. ! Fix Variuous Bugs in the Plugins EXCEPT SourceSleuth diff --git a/game_upload/addons/sourcemod/plugins/SourceSleuth.smx b/game_upload/addons/sourcemod/plugins/SourceSleuth.smx index deb6e6067..76c8d7ee2 100644 Binary files a/game_upload/addons/sourcemod/plugins/SourceSleuth.smx and b/game_upload/addons/sourcemod/plugins/SourceSleuth.smx differ diff --git a/game_upload/addons/sourcemod/plugins/sb_admcfg.smx b/game_upload/addons/sourcemod/plugins/sb_admcfg.smx index aba88f8c8..7f79113aa 100644 Binary files a/game_upload/addons/sourcemod/plugins/sb_admcfg.smx and b/game_upload/addons/sourcemod/plugins/sb_admcfg.smx differ diff --git a/game_upload/addons/sourcemod/plugins/sbchecker.smx b/game_upload/addons/sourcemod/plugins/sbchecker.smx index dc4fa09d5..d2bb9e586 100644 Binary files a/game_upload/addons/sourcemod/plugins/sbchecker.smx and b/game_upload/addons/sourcemod/plugins/sbchecker.smx differ diff --git a/game_upload/addons/sourcemod/plugins/sourcebans.smx b/game_upload/addons/sourcemod/plugins/sourcebans.smx index 6da921e99..e064a645f 100644 Binary files a/game_upload/addons/sourcemod/plugins/sourcebans.smx and b/game_upload/addons/sourcemod/plugins/sourcebans.smx differ diff --git a/game_upload/addons/sourcemod/plugins/sourcecomms.smx b/game_upload/addons/sourcemod/plugins/sourcecomms.smx index 71f549867..ae5366052 100644 Binary files a/game_upload/addons/sourcemod/plugins/sourcecomms.smx and b/game_upload/addons/sourcemod/plugins/sourcecomms.smx differ diff --git a/game_upload/addons/sourcemod/scripting/sb_admcfg/sb_admin_groups.sp b/game_upload/addons/sourcemod/scripting/sb_admcfg/sb_admin_groups.sp index b19de4a1c..735cc890f 100644 --- a/game_upload/addons/sourcemod/scripting/sb_admcfg/sb_admin_groups.sp +++ b/game_upload/addons/sourcemod/scripting/sb_admcfg/sb_admin_groups.sp @@ -48,7 +48,7 @@ public SMCResult ReadGroups_NewSection(SMCParser smc, const char[] name, bool op if (g_GroupState == GROUP_STATE_NONE) { - if (StrEqual(name, "Groups")) + if (StrEqual(name, "Groups", false)) { g_GroupState = GROUP_STATE_GROUPS; } else { @@ -61,7 +61,7 @@ public SMCResult ReadGroups_NewSection(SMCParser smc, const char[] name, bool op } g_GroupState = GROUP_STATE_INGROUP; } else if (g_GroupState == GROUP_STATE_INGROUP) { - if (StrEqual(name, "Overrides")) + if (StrEqual(name, "Overrides", false)) { g_GroupState = GROUP_STATE_OVERRIDES; } else { @@ -91,7 +91,7 @@ public SMCResult ReadGroups_KeyValue(SMCParser smc, { if (g_GroupState == GROUP_STATE_INGROUP) { - if (StrEqual(key, "flags")) + if (StrEqual(key, "flags", false)) { new len = strlen(value); for (new i = 0; i < len; i++) @@ -102,7 +102,7 @@ public SMCResult ReadGroups_KeyValue(SMCParser smc, } SetAdmGroupAddFlag(g_CurGrp, flag, true); } - } else if (StrEqual(key, "immunity")) { + } else if (StrEqual(key, "immunity", false)) { g_NeedReparse = true; } } else if (g_GroupState == GROUP_STATE_OVERRIDES) { @@ -123,7 +123,7 @@ public SMCResult ReadGroups_KeyValue(SMCParser smc, } else if (g_GroupPass == GROUP_PASS_SECOND && g_GroupState == GROUP_STATE_INGROUP) { /* Check for immunity again, core should handle double inserts */ - if (StrEqual(key, "immunity")) + if (StrEqual(key, "immunity", false)) { /* If it's a value we know about, use it */ if (StrEqual(value, "*")) @@ -233,6 +233,7 @@ ReadGroups() InternalReadGroups(g_Filename, GROUP_PASS_SECOND); } } +/* SOURCEMOD 1.7 PLUGIN STOPS HERE */ #else enum GroupState { @@ -265,7 +266,7 @@ public SMCResult ReadGroups_NewSection(SMCParser smc, const char[] name, bool op if (g_GroupState == GroupState_None) { - if (StrEqual(name, "Groups")) + if (StrEqual(name, "Groups", false)) { g_GroupState = GroupState_Groups; } else { @@ -278,7 +279,7 @@ public SMCResult ReadGroups_NewSection(SMCParser smc, const char[] name, bool op } g_GroupState = GroupState_InGroup; } else if (g_GroupState == GroupState_InGroup) { - if (StrEqual(name, "Overrides")) + if (StrEqual(name, "Overrides", false)) { g_GroupState = GroupState_Overrides; } else { @@ -308,7 +309,7 @@ public SMCResult ReadGroups_KeyValue(SMCParser smc, { if (g_GroupState == GroupState_InGroup) { - if (StrEqual(key, "flags")) + if (StrEqual(key, "flags", false)) { int len = strlen(value); for (int i = 0; i < len; i++) @@ -319,7 +320,7 @@ public SMCResult ReadGroups_KeyValue(SMCParser smc, } g_CurGrp.SetFlag(flag, true); } - } else if (StrEqual(key, "immunity")) { + } else if (StrEqual(key, "immunity", false)) { g_NeedReparse = true; } } else if (g_GroupState == GroupState_Overrides) { @@ -340,7 +341,7 @@ public SMCResult ReadGroups_KeyValue(SMCParser smc, } else if (g_GroupPass == GroupPass_Second && g_GroupState == GroupState_InGroup) { /* Check for immunity again, core should handle double inserts */ - if (StrEqual(key, "immunity")) + if (StrEqual(key, "immunity", false)) { /* If it's a value we know about, use it */ if (StrEqual(value, "*")) diff --git a/game_upload/addons/sourcemod/scripting/sb_admcfg/sb_admin_users.sp b/game_upload/addons/sourcemod/scripting/sb_admcfg/sb_admin_users.sp index d12a96145..199222f13 100644 --- a/game_upload/addons/sourcemod/scripting/sb_admcfg/sb_admin_users.sp +++ b/game_upload/addons/sourcemod/scripting/sb_admcfg/sb_admin_users.sp @@ -49,7 +49,7 @@ public SMCResult:ReadUsers_NewSection(Handle:smc, const String:name[], bool:opt_ if (g_UserState == USER_STATE_NONE) { - if (StrEqual(name, "Admins")) + if (StrEqual(name, "Admins", false)) { g_UserState = USER_STATE_ADMINS; } @@ -88,19 +88,19 @@ public SMCResult:ReadUsers_KeyValue(Handle:smc, return SMCParse_Continue; } - if (StrEqual(key, "auth")) + if (StrEqual(key, "auth", false)) { strcopy(g_CurAuth, sizeof(g_CurAuth), value); } - else if (StrEqual(key, "identity")) + else if (StrEqual(key, "identity", false)) { strcopy(g_CurIdent, sizeof(g_CurIdent), value); } - else if (StrEqual(key, "password")) + else if (StrEqual(key, "password", false)) { strcopy(g_CurPass, sizeof(g_CurPass), value); } - else if (StrEqual(key, "group")) + else if (StrEqual(key, "group", false)) { new GroupId:id = FindAdmGroup(value); if (id == INVALID_GROUP_ID) @@ -110,7 +110,7 @@ public SMCResult:ReadUsers_KeyValue(Handle:smc, PushArrayCell(g_GroupArray, id); } - else if (StrEqual(key, "flags")) + else if (StrEqual(key, "flags", false)) { new len = strlen(value); new AdminFlag:flag; @@ -127,7 +127,7 @@ public SMCResult:ReadUsers_KeyValue(Handle:smc, } } } - else if (StrEqual(key, "immunity")) + else if (StrEqual(key, "immunity", false)) { g_CurImmunity = StringToInt(value); } @@ -240,6 +240,7 @@ ReadUsers() } } } +/* SOURCEMOD 1.7 PLUGIN STOPS HERE */ #else enum UserState { @@ -268,7 +269,7 @@ public SMCResult ReadUsers_NewSection(SMCParser smc, const char[] name, bool opt if (g_UserState == UserState_None) { - if (StrEqual(name, "Admins")) + if (StrEqual(name, "Admins", false)) { g_UserState = UserState_Admins; } @@ -307,19 +308,19 @@ public SMCResult ReadUsers_KeyValue(SMCParser smc, return SMCParse_Continue; } - if (StrEqual(key, "auth")) + if (StrEqual(key, "auth", false)) { strcopy(g_CurAuth, sizeof(g_CurAuth), value); } - else if (StrEqual(key, "identity")) + else if (StrEqual(key, "identity", false)) { strcopy(g_CurIdent, sizeof(g_CurIdent), value); } - else if (StrEqual(key, "password")) + else if (StrEqual(key, "password", false)) { strcopy(g_CurPass, sizeof(g_CurPass), value); } - else if (StrEqual(key, "group")) + else if (StrEqual(key, "group", false)) { GroupId id = FindAdmGroup(value); if (id == INVALID_GROUP_ID) @@ -329,7 +330,7 @@ public SMCResult ReadUsers_KeyValue(SMCParser smc, g_GroupArray.Push(id); } - else if (StrEqual(key, "flags")) + else if (StrEqual(key, "flags", false)) { int len = strlen(value); AdminFlag flag; @@ -346,7 +347,7 @@ public SMCResult ReadUsers_KeyValue(SMCParser smc, } } } - else if (StrEqual(key, "immunity")) + else if (StrEqual(key, "immunity", false)) { g_CurImmunity = StringToInt(value); } diff --git a/web_upload/init.php b/web_upload/init.php index 30f1428cf..a05fd522b 100644 --- a/web_upload/init.php +++ b/web_upload/init.php @@ -95,7 +95,7 @@ // --------------------------------------------------- #define('SB_GIT', true); if(!defined('SB_VERSION')){ - define('SB_VERSION', '1.5.4.6'); + define('SB_VERSION', '1.5.4.7'); define('SB_GITRev', '$Git: 350 $'); } define('LOGIN_COOKIE_LIFETIME', (60*60*24*7)*2); diff --git a/web_upload/install/init.php b/web_upload/install/init.php index b0fdf6a1a..52ac92589 100644 --- a/web_upload/install/init.php +++ b/web_upload/install/init.php @@ -53,7 +53,7 @@ // Initial setup // --------------------------------------------------- if(!defined('SB_VERSION')){ - define('SB_VERSION', '1.5.4.5 Installer'); + define('SB_VERSION', '1.5.4.7 Installer'); } define('LOGIN_COOKIE_LIFETIME', (60*60*24*7)*2); define('COOKIE_PATH', '/');