Quick Hotfix 1.5.4

FUCK LICENCES Fix #121
sbpp · Mar 2, 2016 · ebd899f · ebd899f
1 parent 61dac71
commit ebd899f
Show file tree

Hide file tree

Showing 15 changed files with 390 additions and 646 deletions.
diff --git a/AGPLv3.txt b/AGPLv3.txt
diff --git a/CC-BY-NC-SA-3.0.txt b/CC-BY-NC-SA-3.0.txt
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 SourceBans++ 
 ============
-### [![GitHub release](https://img.shields.io/github/release/Sarabveer/SourceBans-Fork.svg?style=flat-square)](https://github.com/Sarabveer/SourceBans-Fork/releases/tag/1.5.4) [![GitHub license](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat-square)](https://raw.githubusercontent.com/Sarabveer/SourceBans-Fork/master/SOURCEMOD-LICENSE.txt) [![GitHub license](https://img.shields.io/badge/license-AGPLv3-blue.svg?style=flat-square)](https://raw.githubusercontent.com/Sarabveer/SourceBans-Fork/master/AGPLv3.txt) [![GitHub forks](https://img.shields.io/github/forks/Sarabveer/SourceBans-Fork.svg?style=flat-square)](https://github.com/Sarabveer/SourceBans-Fork/network) [![GitHub stars](https://img.shields.io/github/stars/Sarabveer/SourceBans-Fork.svg?style=flat-square)](https://github.com/Sarabveer/SourceBans-Fork/stargazers) [![GitHub issues](https://img.shields.io/github/issues/Sarabveer/SourceBans-Fork.svg?style=flat-square)](https://github.com/Sarabveer/SourceBans-Fork/issues) [![GitHub commits](https://img.shields.io/github/commits-since/Sarabveer/SourceBans-Fork/1.5.3.svg?style=flat-square)](https://github.com/Sarabveer/SourceBans-Fork/compare/1.5.3...master) [![Travis](https://img.shields.io/travis/Sarabveer/SourceBans-Fork.svg?style=flat-square)](https://travis-ci.org/Sarabveer/SourceBans-Fork) [![Gitter](https://img.shields.io/gitter/room/Sarabveer/SourceBans-Fork.svg?style=flat-square)](https://gitter.im/Sarabveer/SourceBans-Fork) [![Codacy](https://img.shields.io/codacy/a167e0b3727447cea49d441fc6dac5a9.svg?style=flat-square)](https://www.codacy.com/app/sarabveer/SourceBans-Fork)
+### [![GitHub release](https://img.shields.io/github/release/Sarabveer/SourceBans-Fork.svg?style=flat-square)](https://github.com/Sarabveer/SourceBans-Fork/releases/tag/1.5.4) [![GitHub license](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat-square)](https://raw.githubusercontent.com/Sarabveer/SourceBans-Fork/v1.x/SOURCEMOD-LICENSE.txt) [![GitHub license](https://img.shields.io/badge/license-CC_BY--NC--SA_3.0-blue.svg?style=flat-square)](https://creativecommons.org/licenses/by-nc-sa/3.0/) [![GitHub forks](https://img.shields.io/github/forks/Sarabveer/SourceBans-Fork.svg?style=flat-square)](https://github.com/Sarabveer/SourceBans-Fork/network) [![GitHub stars](https://img.shields.io/github/stars/Sarabveer/SourceBans-Fork.svg?style=flat-square)](https://github.com/Sarabveer/SourceBans-Fork/stargazers) [![GitHub issues](https://img.shields.io/github/issues/Sarabveer/SourceBans-Fork.svg?style=flat-square)](https://github.com/Sarabveer/SourceBans-Fork/issues) [![Travis](https://img.shields.io/travis/Sarabveer/SourceBans-Fork.svg?style=flat-square)](https://travis-ci.org/Sarabveer/SourceBans-Fork) [![Gitter](https://img.shields.io/gitter/room/Sarabveer/SourceBans-Fork.svg?style=flat-square)](https://gitter.im/Sarabveer/SourceBans-Fork) [![Codacy](https://img.shields.io/codacy/a167e0b3727447cea49d441fc6dac5a9.svg?style=flat-square)](https://www.codacy.com/app/sarabveer/SourceBans-Fork)
 
 Global admin, ban, and communication management system for the Source engine
 
@@ -17,7 +17,7 @@ Requirements:
  * Webserver
    o PHP 5.5 or higher
      * ini setting: memory_limit greater than or equal to 64M
-   o MySQL 5.0
+   o MySQL 5.0 or MariaDB 10 and higher
  * Source Dedicated Server
    o MetaMod: Source
    o SourceMod: Greater Than or Equal To 1.7

diff --git a/game_upload/addons/sourcemod/plugins/SourceSleuth.smx b/game_upload/addons/sourcemod/plugins/SourceSleuth.smx
diff --git a/game_upload/addons/sourcemod/plugins/sb_admcfg.smx b/game_upload/addons/sourcemod/plugins/sb_admcfg.smx
diff --git a/game_upload/addons/sourcemod/plugins/sbchecker.smx b/game_upload/addons/sourcemod/plugins/sbchecker.smx
diff --git a/game_upload/addons/sourcemod/plugins/sourcebans.smx b/game_upload/addons/sourcemod/plugins/sourcebans.smx
diff --git a/game_upload/addons/sourcemod/plugins/sourcecomms.smx b/game_upload/addons/sourcemod/plugins/sourcecomms.smx
diff --git a/game_upload/addons/sourcemod/scripting/SourceSleuth.sp b/game_upload/addons/sourcemod/scripting/SourceSleuth.sp
@@ -29,7 +29,7 @@
 #undef REQUIRE_PLUGIN
 #include <sourcebans>
 
-#define PLUGIN_VERSION "(SB++) 1.5.4"
+#define PLUGIN_VERSION "(SB++) 1.5.4.1"
 
 #define LENGTH_ORIGINAL 1
 #define LENGTH_CUSTOM 2

diff --git a/game_upload/addons/sourcemod/scripting/sb_admcfg.sp b/game_upload/addons/sourcemod/scripting/sb_admcfg.sp
@@ -33,7 +33,7 @@ public Plugin:myinfo =
 	name = "SourceBans++: Admin Config Loader", 
 	author = "AlliedModders LLC, Sarabveer(VEER™)", 
 	description = "Reads admin files", 
-	version = "1.5.4", 
+	version = "1.5.4.1", 
 	url = "https://github.com/Sarabveer/SourceBans-Fork"
 };
 

diff --git a/game_upload/addons/sourcemod/scripting/sbchecker.sp b/game_upload/addons/sourcemod/scripting/sbchecker.sp
@@ -25,7 +25,7 @@
 // *************************************************************************
 #include <sourcemod>
 
-#define VERSION "(SB++) 1.5.4"
+#define VERSION "(SB++) 1.5.4.1"
 #define LISTBANS_USAGE "sm_listsbbans <#userid|name> - Lists a user's prior bans from Sourcebans"
 #define INVALID_TARGET -1
 

diff --git a/game_upload/addons/sourcemod/scripting/sourcebans.sp b/game_upload/addons/sourcemod/scripting/sourcebans.sp
@@ -32,8 +32,8 @@
 #include <adminmenu>
 #tryinclude <updater>
 
-#define SB_VERSION "1.5.4F"
-#define SBR_VERSION "1.5.4"
+#define SB_VERSION "1.5.4.1F"
+#define SBR_VERSION "1.5.4.1"
 
 #if defined _updater_included
 #define UPDATE_URL "https://sarabveer.github.io/SourceBans-Fork/updater/updatefile.txt"

diff --git a/game_upload/addons/sourcemod/scripting/sourcecomms.sp b/game_upload/addons/sourcemod/scripting/sourcecomms.sp
@@ -42,7 +42,7 @@
 // Do not edit below this line //
 //-----------------------------//
 
-#define PLUGIN_VERSION "(SB++) 1.5.4"
+#define PLUGIN_VERSION "(SB++) 1.5.4.1"
 #define PREFIX "\x04[SourceComms]\x01 "
 
 #define MAX_TIME_MULTI 30       // maximum mass-target punishment length
@@ -2886,7 +2886,7 @@ stock SavePunishment(admin = 0, target, type, length = -1, const String:reason[]
 		decl String:sAdminAuthIdEscaped[64 * 2 + 1];
 		decl String:sAdminAuthIdYZEscaped[64 * 2 + 1];
 		decl String:sQuery[4096], String:sQueryAdm[512], String:sQueryVal[1024];
-		decl String:sQueryMute[1024], String:sQueryGag[1024];
+		new String:sQueryMute[1024], String:sQueryGag[1024];
 
 		// escaping everything
 		SQL_EscapeString(g_hDatabase, sName, banName, sizeof(banName));

diff --git a/web_upload/init.php b/web_upload/init.php
@@ -81,10 +81,10 @@
 // ---------------------------------------------------
 //  Initial setup
 // ---------------------------------------------------
-define('SB_GIT', true);
+#define('SB_GIT', true);
 if(!defined('SB_VERSION')){
-	define('SB_VERSION', '1.5.4');
-	define('SB_GITRev', '$Git: 331 $');
+	define('SB_VERSION', '1.5.4.1');
+	define('SB_GITRev', '$Git: 336 $');
 }
 define('LOGIN_COOKIE_LIFETIME', (60*60*24*7)*2);
 define('COOKIE_PATH', '/');

diff --git a/web_upload/install/template/page.1.php b/web_upload/install/template/page.1.php
@@ -12,31 +12,33 @@
 <div id="submit-introduction">
 
 To use this webpanel software, you are required to read and accept the following license. If you do not agree with the license, then go and make your own ban/admin system.<br /><br />
-An explanation  of this license is available <a href="https://www.gnu.org/licenses/gpl.html" target="_blank">here</a>.
+An explanation  of this license is available <a href="https://creativecommons.org/licenses/by-nc-sa/3.0/" target="_blank">here</a>.
 </div>
 <form action="index.php?p=submit" method="POST" enctype="multipart/form-data">
-<div id="submit-main"><h3>GNU Affero General Public License - Version 3</h3>
+<div id="submit-main"><h3>Creative Commons - Attribution-NonCommercial-ShareAlike 3.0</h3>
 <textarea id="license" cols="105" rows="15" name="license">
 This program is part of SourceBans++.
 
 Copyright © 2014-2016 Sarabveer Singh <[email protected]>
-
-SourceBans++ is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, per version 3 of the License.
 
-SourceBans++ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with SourceBans++. If not, see <http://www.gnu.org/licenses/>.
+SourceBans++ is licensed under a
+Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
 
-This program incorporates work covered by the following copyright(s): 
+You should have received a copy of the license along with this
+work.  If not, see <http://creativecommons.org/licenses/by-nc-sa/3.0/>.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+This program is based off work covered by the following copyright(s): 
  SourceBans 1.4.11
  Copyright © 2007-2014 SourceBans Team - Part of GameConnect
- Licensed under GNU GPL version 3, or later.
+ Licensed under CC BY-NC-SA 3.0
  Page: <http://www.sourcebans.net/> - <http://www.gameconnect.net/>
 
  SourceBans TF2 Theme v1.0