Skip to content

Commit c550cad

Browse files
committed
1.5.4.7
1 parent fd1c185 commit c550cad

File tree

10 files changed

+37
-26
lines changed

10 files changed

+37
-26
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ Legend:
1010
? = Other stuff
1111
```
1212

13+
(28/04/16): Version 1.5.4.7
14+
-----------------------
15+
01. ! Fix Admins and Groups Not Loading from Config
16+
17+
(23/04/16): Version 1.5.4.6
18+
-----------------------
19+
01. ! Fix Perm Ban bug in SourceSleuth
20+
02. ! Fix Updater
21+
1322
(18/04/16): Version 1.5.4.5
1423
-----------------------
1524
01. ! Fix Variuous Bugs in the Plugins EXCEPT SourceSleuth
Binary file not shown.
Binary file not shown.
Binary file not shown.
554 Bytes
Binary file not shown.
Binary file not shown.

game_upload/addons/sourcemod/scripting/sb_admcfg/sb_admin_groups.sp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public SMCResult ReadGroups_NewSection(SMCParser smc, const char[] name, bool op
4848

4949
if (g_GroupState == GROUP_STATE_NONE)
5050
{
51-
if (StrEqual(name, "Groups"))
51+
if (StrEqual(name, "Groups", false))
5252
{
5353
g_GroupState = GROUP_STATE_GROUPS;
5454
} else {
@@ -61,7 +61,7 @@ public SMCResult ReadGroups_NewSection(SMCParser smc, const char[] name, bool op
6161
}
6262
g_GroupState = GROUP_STATE_INGROUP;
6363
} else if (g_GroupState == GROUP_STATE_INGROUP) {
64-
if (StrEqual(name, "Overrides"))
64+
if (StrEqual(name, "Overrides", false))
6565
{
6666
g_GroupState = GROUP_STATE_OVERRIDES;
6767
} else {
@@ -91,7 +91,7 @@ public SMCResult ReadGroups_KeyValue(SMCParser smc,
9191
{
9292
if (g_GroupState == GROUP_STATE_INGROUP)
9393
{
94-
if (StrEqual(key, "flags"))
94+
if (StrEqual(key, "flags", false))
9595
{
9696
new len = strlen(value);
9797
for (new i = 0; i < len; i++)
@@ -102,7 +102,7 @@ public SMCResult ReadGroups_KeyValue(SMCParser smc,
102102
}
103103
SetAdmGroupAddFlag(g_CurGrp, flag, true);
104104
}
105-
} else if (StrEqual(key, "immunity")) {
105+
} else if (StrEqual(key, "immunity", false)) {
106106
g_NeedReparse = true;
107107
}
108108
} else if (g_GroupState == GROUP_STATE_OVERRIDES) {
@@ -123,7 +123,7 @@ public SMCResult ReadGroups_KeyValue(SMCParser smc,
123123
} else if (g_GroupPass == GROUP_PASS_SECOND
124124
&& g_GroupState == GROUP_STATE_INGROUP) {
125125
/* Check for immunity again, core should handle double inserts */
126-
if (StrEqual(key, "immunity"))
126+
if (StrEqual(key, "immunity", false))
127127
{
128128
/* If it's a value we know about, use it */
129129
if (StrEqual(value, "*"))
@@ -233,6 +233,7 @@ ReadGroups()
233233
InternalReadGroups(g_Filename, GROUP_PASS_SECOND);
234234
}
235235
}
236+
/* SOURCEMOD 1.7 PLUGIN STOPS HERE */
236237
#else
237238
enum GroupState
238239
{
@@ -265,7 +266,7 @@ public SMCResult ReadGroups_NewSection(SMCParser smc, const char[] name, bool op
265266

266267
if (g_GroupState == GroupState_None)
267268
{
268-
if (StrEqual(name, "Groups"))
269+
if (StrEqual(name, "Groups", false))
269270
{
270271
g_GroupState = GroupState_Groups;
271272
} else {
@@ -278,7 +279,7 @@ public SMCResult ReadGroups_NewSection(SMCParser smc, const char[] name, bool op
278279
}
279280
g_GroupState = GroupState_InGroup;
280281
} else if (g_GroupState == GroupState_InGroup) {
281-
if (StrEqual(name, "Overrides"))
282+
if (StrEqual(name, "Overrides", false))
282283
{
283284
g_GroupState = GroupState_Overrides;
284285
} else {
@@ -308,7 +309,7 @@ public SMCResult ReadGroups_KeyValue(SMCParser smc,
308309
{
309310
if (g_GroupState == GroupState_InGroup)
310311
{
311-
if (StrEqual(key, "flags"))
312+
if (StrEqual(key, "flags", false))
312313
{
313314
int len = strlen(value);
314315
for (int i = 0; i < len; i++)
@@ -319,7 +320,7 @@ public SMCResult ReadGroups_KeyValue(SMCParser smc,
319320
}
320321
g_CurGrp.SetFlag(flag, true);
321322
}
322-
} else if (StrEqual(key, "immunity")) {
323+
} else if (StrEqual(key, "immunity", false)) {
323324
g_NeedReparse = true;
324325
}
325326
} else if (g_GroupState == GroupState_Overrides) {
@@ -340,7 +341,7 @@ public SMCResult ReadGroups_KeyValue(SMCParser smc,
340341
} else if (g_GroupPass == GroupPass_Second
341342
&& g_GroupState == GroupState_InGroup) {
342343
/* Check for immunity again, core should handle double inserts */
343-
if (StrEqual(key, "immunity"))
344+
if (StrEqual(key, "immunity", false))
344345
{
345346
/* If it's a value we know about, use it */
346347
if (StrEqual(value, "*"))

game_upload/addons/sourcemod/scripting/sb_admcfg/sb_admin_users.sp

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public SMCResult:ReadUsers_NewSection(Handle:smc, const String:name[], bool:opt_
4949

5050
if (g_UserState == USER_STATE_NONE)
5151
{
52-
if (StrEqual(name, "Admins"))
52+
if (StrEqual(name, "Admins", false))
5353
{
5454
g_UserState = USER_STATE_ADMINS;
5555
}
@@ -88,19 +88,19 @@ public SMCResult:ReadUsers_KeyValue(Handle:smc,
8888
return SMCParse_Continue;
8989
}
9090

91-
if (StrEqual(key, "auth"))
91+
if (StrEqual(key, "auth", false))
9292
{
9393
strcopy(g_CurAuth, sizeof(g_CurAuth), value);
9494
}
95-
else if (StrEqual(key, "identity"))
95+
else if (StrEqual(key, "identity", false))
9696
{
9797
strcopy(g_CurIdent, sizeof(g_CurIdent), value);
9898
}
99-
else if (StrEqual(key, "password"))
99+
else if (StrEqual(key, "password", false))
100100
{
101101
strcopy(g_CurPass, sizeof(g_CurPass), value);
102102
}
103-
else if (StrEqual(key, "group"))
103+
else if (StrEqual(key, "group", false))
104104
{
105105
new GroupId:id = FindAdmGroup(value);
106106
if (id == INVALID_GROUP_ID)
@@ -110,7 +110,7 @@ public SMCResult:ReadUsers_KeyValue(Handle:smc,
110110

111111
PushArrayCell(g_GroupArray, id);
112112
}
113-
else if (StrEqual(key, "flags"))
113+
else if (StrEqual(key, "flags", false))
114114
{
115115
new len = strlen(value);
116116
new AdminFlag:flag;
@@ -127,7 +127,7 @@ public SMCResult:ReadUsers_KeyValue(Handle:smc,
127127
}
128128
}
129129
}
130-
else if (StrEqual(key, "immunity"))
130+
else if (StrEqual(key, "immunity", false))
131131
{
132132
g_CurImmunity = StringToInt(value);
133133
}
@@ -240,6 +240,7 @@ ReadUsers()
240240
}
241241
}
242242
}
243+
/* SOURCEMOD 1.7 PLUGIN STOPS HERE */
243244
#else
244245
enum UserState
245246
{
@@ -268,7 +269,7 @@ public SMCResult ReadUsers_NewSection(SMCParser smc, const char[] name, bool opt
268269

269270
if (g_UserState == UserState_None)
270271
{
271-
if (StrEqual(name, "Admins"))
272+
if (StrEqual(name, "Admins", false))
272273
{
273274
g_UserState = UserState_Admins;
274275
}
@@ -307,19 +308,19 @@ public SMCResult ReadUsers_KeyValue(SMCParser smc,
307308
return SMCParse_Continue;
308309
}
309310

310-
if (StrEqual(key, "auth"))
311+
if (StrEqual(key, "auth", false))
311312
{
312313
strcopy(g_CurAuth, sizeof(g_CurAuth), value);
313314
}
314-
else if (StrEqual(key, "identity"))
315+
else if (StrEqual(key, "identity", false))
315316
{
316317
strcopy(g_CurIdent, sizeof(g_CurIdent), value);
317318
}
318-
else if (StrEqual(key, "password"))
319+
else if (StrEqual(key, "password", false))
319320
{
320321
strcopy(g_CurPass, sizeof(g_CurPass), value);
321322
}
322-
else if (StrEqual(key, "group"))
323+
else if (StrEqual(key, "group", false))
323324
{
324325
GroupId id = FindAdmGroup(value);
325326
if (id == INVALID_GROUP_ID)
@@ -329,7 +330,7 @@ public SMCResult ReadUsers_KeyValue(SMCParser smc,
329330

330331
g_GroupArray.Push(id);
331332
}
332-
else if (StrEqual(key, "flags"))
333+
else if (StrEqual(key, "flags", false))
333334
{
334335
int len = strlen(value);
335336
AdminFlag flag;
@@ -346,7 +347,7 @@ public SMCResult ReadUsers_KeyValue(SMCParser smc,
346347
}
347348
}
348349
}
349-
else if (StrEqual(key, "immunity"))
350+
else if (StrEqual(key, "immunity", false))
350351
{
351352
g_CurImmunity = StringToInt(value);
352353
}

web_upload/init.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
// ---------------------------------------------------
9696
#define('SB_GIT', true);
9797
if(!defined('SB_VERSION')){
98-
define('SB_VERSION', '1.5.4.6');
98+
define('SB_VERSION', '1.5.4.7');
9999
define('SB_GITRev', '$Git: 350 $');
100100
}
101101
define('LOGIN_COOKIE_LIFETIME', (60*60*24*7)*2);

web_upload/install/init.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
// Initial setup
5454
// ---------------------------------------------------
5555
if(!defined('SB_VERSION')){
56-
define('SB_VERSION', '1.5.4.5 Installer');
56+
define('SB_VERSION', '1.5.4.7 Installer');
5757
}
5858
define('LOGIN_COOKIE_LIFETIME', (60*60*24*7)*2);
5959
define('COOKIE_PATH', '/');

0 commit comments

Comments
 (0)