Made some changes to versioning

Author: Groruk

Diff for: CONTRIBUTING.md

@@ -1,3 +1,3 @@
 You want to contribute to SourceBans++, eh?
 - If you're contributing to the SourceMod plugin, then just fork the repo, and make a Pull Request.
-- If you're contributing to the WebPanel, fork the repo, and make a pull request. We also need you to update the **init.php** file around line 84. You need to add up your commits in the PR, then add one more commit for the Merge. Then add the counted up commits to the **SB_GITRev** value.
+- If you're contributing to the WebPanel, fork the repo, and make a pull request. We also need you to update the **version.json** file. You need to add up your commits in the PR, then add one more commit for the Merge. Then add the counted up commits to the **git** value.

Diff for: web/includes/sb-callback.php

@@ -2314,36 +2314,33 @@ function SendMail($subject, $message, $type, $id)
 function CheckVersion()
 {
 	$objResponse = new xajaxResponse();
-	$relver = @file_get_contents("https://sbpp.sarabveer.me/rel/");
-
-	if(defined('SB_GIT'))
-		$relgit = @file_get_contents("https://sbpp.sarabveer.me/dev/");
+	$version = json_decode(file_get_contents("https://sbpp.github.io/version.json"), true);
 
 	if(version_compare($relver, SB_VERSION) > 0)
 		$versmsg = "<span style='color:#aa0000;'><strong>A new release is available.</strong></span>";
 	else
 		$versmsg = "<span style='color:#00aa00;'><strong>You have the latest release.</strong></span>";
 
 	$msg = $versmsg;
-	if(strlen($relver)>8 || $relver=="") {
-		$relver = "<span style='color:#aa0000;'>Error</span>";
+	if(strlen($version['version'])>8 || $version['version']=="") {
+		$version['version'] = "<span style='color:#aa0000;'>Error</span>";
 		$msg = "<span style='color:#aa0000;'><strong>Error retrieving latest release.</strong></span>";
 	}
-	$objResponse->addAssign("relver", "innerHTML",  $relver);
+	$objResponse->addAssign("relver", "innerHTML",  $version['version']);
 
 	if(defined('SB_GIT'))
 	{
-		if(intval($relgit) > GetGITRev())
+		if(intval($version['git']) > SB_GITREV)
 			$svnmsg = "<span style='color:#aa0000;'><strong>A new Dev release is available.</strong></span>";
 		else
 			$svnmsg = "<span style='color:#00aa00;'><strong>You have the latest Dev release.</strong></span>";
 
-		if(strlen($relgit)>8 || $relgit=="") {
-			$relgit = "<span style='color:#aa0000;'>Error</span>";
+		if(strlen($version['git'])>8 || $version['git']=="") {
+			$version['git'] = "<span style='color:#aa0000;'>Error</span>";
 			$svnmsg = "<span style='color:#aa0000;'><strong>Error retrieving latest Git Commit.</strong></span>";
 		}
 		$msg .= "<br />" . $svnmsg;
-		$objResponse->addAssign("svnrev", "innerHTML",  $relgit);
+		$objResponse->addAssign("svnrev", "innerHTML",  $version['git']);
 	}
 
 	$objResponse->addAssign("versionmsg", "innerHTML", $msg);

Diff for: web/init.php

@@ -106,8 +106,14 @@
 // ---------------------------------------------------
 define('SB_GIT', true);
 if (!defined('SB_VERSION')) {
-    define('SB_VERSION', '1.6.0');
-    define('SB_GITREV', '474');
+    if (file_exists('version.json')) {
+        $json = json_decode(file_get_contents('version.json'), true);
+        define('SB_VERSION', $json['version']);
+        define('SB_GITREV', $json['git']);
+    } else {
+        define('SB_VERSION', 'N/A');
+        define('SB_GITREV', '0');
+    }
 }
 define('LOGIN_COOKIE_LIFETIME', (60*60*24*7)*2);
 define('COOKIE_PATH', '/');

Diff for: web/version.json

@@ -0,0 +1,4 @@
+{
+    "version": "1.6.0",
+    "git": "476"
+}