From 6b2a0b59b70d6368603ac65f9b555bd96eb85a2e Mon Sep 17 00:00:00 2001 From: Lubricant Jam Date: Fri, 18 May 2018 12:12:18 +0100 Subject: [PATCH 1/5] Update Language --- web/includes/system-functions.php | 112 +++++++++++++++--------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/web/includes/system-functions.php b/web/includes/system-functions.php index 3a297de96..4ac9b025e 100644 --- a/web/includes/system-functions.php +++ b/web/includes/system-functions.php @@ -80,8 +80,8 @@ function AddTab($title, $url, $desc, $active=false) $tab_arr[1] = "Servers"; $tab_arr[2] = " Bans "; $tab_arr[3] = "Comms"; - $tab_arr[4] = "Report Player"; - $tab_arr[5] = "Appeal Ban"; + $tab_arr[4] = "Report a Player"; + $tab_arr[5] = "Appeal a Ban"; $tabs = array(); $tabs['title'] = $title; $tabs['url'] = $url; @@ -115,10 +115,10 @@ function BuildPageTabs() AddTab("Comms", "index.php?p=commslist", "All of the communication bans (such as chat gags and voice mutes) in the database can be viewed from here."); } if ($GLOBALS['config']['config.enablesubmit']=="1") { - AddTab("Report Player", "index.php?p=submit", "You can submit a demo or screenshot of a suspected cheater here. It will then be up for review by one of the admins"); + AddTab("Report a Player", "index.php?p=submit", "You can submit a demo or screenshot of a suspected cheater here. It will then be up for review by one of the admins"); } if ($GLOBALS['config']['config.enableprotest']=="1") { - AddTab("Appeal Ban", "index.php?p=protest", "Here you can appeal your ban. And prove your case as to why you should be unbanned."); + AddTab("Appeal a Ban", "index.php?p=protest", "Here you can appeal your ban. And prove your case as to why you should be unbanned."); } if ($userbank->is_admin()) { AddTab(" Admin Panel ", "index.php?p=admin", "This is the control panel for SourceBans where you can setup new admins, add new server, etc."); @@ -163,25 +163,25 @@ function BuildBreadcrumbs() if (isset($_GET['c'])) { switch ($_GET['c']) { case "admins": - $cat = "Admin management"; + $cat = "Admin Management"; break; case "servers": - $cat = "Server management"; + $cat = "Server Management"; break; case "bans": - $cat = "Ban management"; + $cat = "Ban Management"; break; case "comms": - $cat = "Communication blocks management"; + $cat = "Communication Blocks Management"; break; case "groups": - $cat = "Group management"; + $cat = "Group Management"; break; case "settings": - $cat = "SourceBans settings"; + $cat = "SourceBans Settings"; break; case "mods": - $cat = "Mod management"; + $cat = "Mod Management"; break; default: unset($_GET['c']); @@ -310,101 +310,101 @@ function BitToString($mask, $masktype=0, $head=true) return $string; } if (($mask & ADMIN_LIST_ADMINS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• View admins
"; + $string .= "• View Admins
"; } if (($mask & ADMIN_ADD_ADMINS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Add admins
"; + $string .= "• Add Admins
"; } if (($mask & ADMIN_EDIT_ADMINS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Edit admins
"; + $string .= "• Edit Admins
"; } if (($mask & ADMIN_DELETE_ADMINS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Delete admins
"; + $string .= "• Delete Admins
"; } if (($mask & ADMIN_LIST_SERVERS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• View servers
"; + $string .= "• View Servers
"; } if (($mask & ADMIN_ADD_SERVER) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Add servers
"; + $string .= "• Add Servers
"; } if (($mask & ADMIN_EDIT_SERVERS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Edit servers
"; + $string .= "• Edit Servers
"; } if (($mask & ADMIN_DELETE_SERVERS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Delete servers
"; + $string .= "• Delete Servers
"; } if (($mask & ADMIN_ADD_BAN) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Add bans
"; + $string .= "• Add Bans
"; } if (($mask & ADMIN_EDIT_OWN_BANS) !=0 && ($mask & ADMIN_EDIT_ALL_BANS) ==0) { - $string .="• Edit own bans
"; + $string .="• Edit Own Bans
"; } if (($mask & ADMIN_EDIT_GROUP_BANS) !=0 && ($mask & ADMIN_EDIT_ALL_BANS) ==0) { - $string .= "• Edit groups bans
"; + $string .= "• Edit Group Bans
"; } if (($mask & ADMIN_EDIT_ALL_BANS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Edit all bans
"; + $string .= "• Edit All Bans
"; } if (($mask & ADMIN_BAN_PROTESTS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Ban protests
"; + $string .= "• Ban Appeals
"; } if (($mask & ADMIN_BAN_SUBMISSIONS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Ban submissions
"; + $string .= "• Ban Reports
"; } if (($mask & ADMIN_UNBAN_OWN_BANS) !=0 && ($mask & ADMIN_UNBAN) ==0) { - $string .= "• Unban own bans
"; + $string .= "• Unban Own Bans
"; } if (($mask & ADMIN_UNBAN_GROUP_BANS) !=0 && ($mask & ADMIN_UNBAN) ==0) { - $string .= "• Unban group bans
"; + $string .= "• Unban Group Bans
"; } if (($mask & ADMIN_UNBAN) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Unban all bans
"; + $string .= "• Unban All Bans
"; } if (($mask & ADMIN_DELETE_BAN) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Delete All bans
"; + $string .= "• Delete All Bans
"; } if (($mask & ADMIN_BAN_IMPORT) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Import bans
"; + $string .= "• Import Bans
"; } if (($mask & ADMIN_LIST_GROUPS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• View groups
"; + $string .= "• View Groups
"; } if (($mask & ADMIN_ADD_GROUP) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Add groups
"; + $string .= "• Add Groups
"; } if (($mask & ADMIN_EDIT_GROUPS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Edit groups
"; + $string .= "• Edit Groups
"; } if (($mask & ADMIN_DELETE_GROUPS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Delete groups
"; + $string .= "• Delete Groups
"; } if (($mask & ADMIN_NOTIFY_SUB) !=0 || ($mask & ADMIN_NOTIFY_SUB) !=0) { - $string .= "• Submission email notifying
"; + $string .= "• Ban Report Email Notifications
"; } if (($mask & ADMIN_NOTIFY_PROTEST) !=0 || ($mask & ADMIN_NOTIFY_PROTEST) !=0) { - $string .= "• Protest email notifying
"; + $string .= "• Ban Appeal Email Notifications
"; } if (($mask & ADMIN_WEB_SETTINGS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Web settings
"; + $string .= "• Web Settings
"; } if (($mask & ADMIN_LIST_MODS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• View mods
"; + $string .= "• View Mods
"; } if (($mask & ADMIN_ADD_MODS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Add mods
"; + $string .= "• Add Mods
"; } if (($mask & ADMIN_EDIT_MODS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Edit mods
"; + $string .= "• Edit Mods
"; } if (($mask & ADMIN_DELETE_MODS) !=0 || ($mask & ADMIN_OWNER) !=0) { - $string .= "• Delete mods
"; + $string .= "• Delete Mods
"; } if (($mask & ADMIN_OWNER) !=0) { @@ -426,10 +426,10 @@ function SmFlagsToSb($flagstring, $head=true) return $string; } if ((strstr($flagstring, "a") || strstr($flagstring, "z"))) { - $string .= "• Reserved slot
"; + $string .= "• Reserved Slot
"; } if ((strstr($flagstring, "b") || strstr($flagstring, "z"))) { - $string .= "• Generic admin
"; + $string .= "• Generic Admin
"; } if ((strstr($flagstring, "c") || strstr($flagstring, "z"))) { $string .= "• Kick
"; @@ -444,22 +444,22 @@ function SmFlagsToSb($flagstring, $head=true) $string .= "• Slay
"; } if ((strstr($flagstring, "g") || strstr($flagstring, "z"))) { - $string .= "• Map change
"; + $string .= "• Map Change
"; } if ((strstr($flagstring, "h") || strstr($flagstring, "z"))) { - $string .= "• Change cvars
"; + $string .= "• Change CVars
"; } if ((strstr($flagstring, "i") || strstr($flagstring, "z"))) { - $string .= "• Run configs
"; + $string .= "• Run Configs
"; } if ((strstr($flagstring, "j") || strstr($flagstring, "z"))) { - $string .= "• Admin chat
"; + $string .= "• Admin Chat
"; } if ((strstr($flagstring, "k") || strstr($flagstring, "z"))) { - $string .="• Start votes
"; + $string .="• Start Votes
"; } if ((strstr($flagstring, "l") || strstr($flagstring, "z"))) { - $string .="• Password server
"; + $string .="• Password Server
"; } if ((strstr($flagstring, "m") || strstr($flagstring, "z"))) { $string .="• RCON
"; @@ -472,32 +472,32 @@ function SmFlagsToSb($flagstring, $head=true) } if ((strstr($flagstring, "o") || strstr($flagstring, "z"))) { - $string .="• Custom flag 1
"; + $string .="• Custom Flag 1
"; } if ((strstr($flagstring, "p") || strstr($flagstring, "z"))) { - $string .="• Custom flag 2
"; + $string .="• Custom Flag 2
"; } if ((strstr($flagstring, "q") || strstr($flagstring, "z"))) { - $string .="• Custom flag 3
"; + $string .="• Custom Flag 3
"; } if ((strstr($flagstring, "r") || strstr($flagstring, "z"))) { $string .="• Custom flag 4
"; } if ((strstr($flagstring, "s") || strstr($flagstring, "z"))) { - $string .="• Custom flag 5
"; + $string .="• Custom Flag 5
"; } if ((strstr($flagstring, "t") || strstr($flagstring, "z"))) { - $string .="• Custom flag 6
"; + $string .="• Custom Flag 6
"; } //if(($mask & SM_DEF_IMMUNITY) != 0) //{ - // $flagstring .="• Default immunity
"; + // $flagstring .="• Default Immunity
"; //} //if(($mask & SM_GLOBAL_IMMUNITY) != 0) //{ - // $flagstring .="• Global immunity
"; + // $flagstring .="• Global Immunity
"; //} return $string; } From bad82273e26cc09cc37bc7f6e8c434f76ccd2afa Mon Sep 17 00:00:00 2001 From: Lubricant Jam Date: Fri, 18 May 2018 12:15:48 +0100 Subject: [PATCH 2/5] Update Language --- web/themes/default/page_submitban.tpl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/web/themes/default/page_submitban.tpl b/web/themes/default/page_submitban.tpl index 7f96b2a3e..5c5dfaf67 100644 --- a/web/themes/default/page_submitban.tpl +++ b/web/themes/default/page_submitban.tpl @@ -1,11 +1,13 @@ - +
Submit a playerSubmit a Report
- Here you will be able to submit a ban for a player who is breaking the rules of the gameserver. When submitting a ban we request you to fill out all the fields to be as descriptive as possible in your comments. This will ensure that your ban submission is processed much faster.

- For a short explination on how to create a demo, click here

+ In order to keep our servers running smoothly, offenders of our rules should be punished and we can't always be on call to help.
+ When submitting a player report, we ask you to fill out the report as detailed as possible to help ban the offender as this will help us process your report quickly.
+ If you are unsure on how to record evidence within in-game, please click + here for an explanation.

@@ -29,7 +31,7 @@ + Players Nickname*: @@ -67,7 +69,7 @@ + Upload video evidence: @@ -82,5 +84,5 @@
- Players Nick Name*:
- Upload demo:
Note: Only DEM, ZIP, RAR, 7Z, BZ2 or GZ allowed.
What happens if someone gets banned?
-If someone gets banned, the specific STEAMID or IP will be included in this SourceBans database and everytime this player tries to connect to one of our servers he/she will be blocked and will receive a message that they are blocked by SourceBans. +If someone you reported gets banned, the SteamID or IP will be included onto the ban on the main bans list and everytime they try to connect to any server they will be blocked from joining and it will be logged into our database.
From 3ab79b81bcaaa240d78694672d3c6cc396631064 Mon Sep 17 00:00:00 2001 From: Lubricant Jam Date: Fri, 18 May 2018 12:17:50 +0100 Subject: [PATCH 3/5] Update Language --- web/themes/default/page_protestban.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/themes/default/page_protestban.tpl b/web/themes/default/page_protestban.tpl index 380cb3d24..7bac5cdfe 100644 --- a/web/themes/default/page_protestban.tpl +++ b/web/themes/default/page_protestban.tpl @@ -1,11 +1,11 @@ - +
Protest a banAppeal a Ban
-Before you proceed make sure you first check our banlist and search it by clicking here if you are listed and for what reason.
-If you do find yourself listed on the banlist and find the reason for this to be untrue you can write a protest.

+In order to appeal a ban, you must make sure you are banned via clicking here to see if you are banned and for what reason.
+If you are indeed on our ban list and you feel it is unjust or feel you have the right to be forgiven, please fill out the appeal format below.

@@ -62,7 +62,7 @@ If you do find yourself listed on the banlist and find the reason for this to be
-What happens after you posted your protest?
- The admins will get notified of your protest. They will then review if the ban is conclusive. After reviewing you will get a reply, which usally means within 24 hours.

- Note: Sending emails with threats to our admins, scolding or shouting will not get you unbanned and in fact we will delete your protest right away! +
What happens after I post my appeal?
+ The staff team will be notified of your appeal. They will then review if the ban is conclusive. After reviewing you will get a reply, which usally means within 24 hours.
+ Note: Sending emails with threats to our admins, scolding or shouting will not get you unbanned and you will be permanently denied from using any of our services.
From 151c68838011fd63f9a3b15243c3480705c4dbf4 Mon Sep 17 00:00:00 2001 From: RumbleFrog Date: Fri, 18 May 2018 14:42:17 -0400 Subject: [PATCH 4/5] Suit general --- web/themes/default/page_protestban.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/default/page_protestban.tpl b/web/themes/default/page_protestban.tpl index 7bac5cdfe..7a04e708b 100644 --- a/web/themes/default/page_protestban.tpl +++ b/web/themes/default/page_protestban.tpl @@ -5,7 +5,7 @@
In order to appeal a ban, you must make sure you are banned via clicking here to see if you are banned and for what reason.
-If you are indeed on our ban list and you feel it is unjust or feel you have the right to be forgiven, please fill out the appeal format below.

+If you are indeed on our ban list and you feel it is unjust or any other circumstances, please fill out the appeal format below.

From 89739d0fc94fd6de78ce558a6f625f1ba9963a3f Mon Sep 17 00:00:00 2001 From: RumbleFrog Date: Fri, 18 May 2018 14:45:12 -0400 Subject: [PATCH 5/5] More specific, it only take demo files --- web/themes/default/page_submitban.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/default/page_submitban.tpl b/web/themes/default/page_submitban.tpl index 5c5dfaf67..a66e24890 100644 --- a/web/themes/default/page_submitban.tpl +++ b/web/themes/default/page_submitban.tpl @@ -69,7 +69,7 @@ + Upload demo:
- Upload video evidence:
Note: Only DEM, ZIP, RAR, 7Z, BZ2 or GZ allowed.