feat: modify the update system

TGRHavoc · TGRHavoc · commit 0cb72c5ab457 · 2019-05-17T17:25:53.000+01:00
Update system now uses the new alert system. I think it looks nicer.
diff --git a/index.php b/index.php
@@ -27,7 +27,7 @@
 	require_once("utils/params.php");
 	require_once("utils/update_checker.php");
 
-    Update::getCurrentVersion();
+	Update::getCurrentVersion();
 
 	$config = Config::getConfig();
 	$parser = ParamParser::getParser();
@@ -70,6 +70,7 @@
 	?>
 
 	<script src="js/jquery-3.2.1.min.js"></script>
+	<script src="js/bootstrap.min.js"></script>
 
 	<!-- Change the key below -->
 	<script type="text/javascript" src="https://maps.google.com/maps/api/js"></script>
@@ -141,7 +142,6 @@
 
 </head>
 <body>
-
 	<nav class="navbar navbar-default-invert navbar-static-top" style="margin: 0;">
 		<!-- At some point, I'll add more stuff here. For the time being, it'll just be the site logo -->
 		<div class="container-fluid">
@@ -207,21 +207,19 @@
 
 			<p style="color: black; text-align: center;">This was originaly created by <a href="https://github.com/TGRHavoc">Havoc</a></p>
 
-			<?php
-				if (!Update::latestVersion()){
-					// If not the latest version, tell them
-			?>
-				<p style="color: red; text-align: center; font-weight: 700;">An update is available, please download it <a href="https://github.com/TGRHavoc/live_map-interface">HERE</a></p>
-			<?php
-				}
-			?>
+			<div id="alert-holder" class="position: absolute; width: 80%; z-index: 1">
+			</div>
 
 		</div>
 	</div>
 
 <?php
 	Minifier::printLastJs($config->debug);
 	$parser->printJsForParams();
+
+	if(!Update::latestVersion()){
+		echo Update::alertJs();
+	}
 ?>
 
 </body>
diff --git a/utils/update_checker.php b/utils/update_checker.php
@@ -4,11 +4,15 @@ class Update{
 
     private static $version = "2.1.3";
     private static $url = "https://raw.githubusercontent.com/TGRHavoc/live_map-interface/master/version.json";
+    private static $downloadUrl = "http://github.com/TGRHavoc/live_map-interface";
+    private static $latestVer = "";
 
     public static function latestVersion(){
         $data = file_get_contents(self::$url);
         $data = json_decode($data);
 
+        self::$latestVer = $data->interface;
+
         return $data->interface == self::$version;
     }
 
@@ -19,6 +23,24 @@ public static function getCurrentVersion(){
         self::$version = $ver->interface;
     }
 
+    public static function alertJs(){
+        $arr = array(
+            sprintf("An update is available (%s -> %s)", self::$version, self::$latestVer),
+            sprintf("Please download it <a href=\'%s\'>HERE</a>", self::$downloadUrl),
+        );
+
+        // Dynamically create a array string for the above array
+        $jsArrayString = "[";
+        foreach ($arr as $key => $value) {
+            $jsArrayString .= "'%s'" . ($key == count($arr)-1 ? "" : ",");
+        }
+        $jsArrayString .= "]";
+
+        $jsArrayString = vsprintf($jsArrayString, $arr);
+
+        return "<script> createAlert('danger', 'Update available', " . $jsArrayString . "); </script>";
+
+    }
 }
 
 ?>
