Merge pull request #444 from jprochazka/2.6.3

2.6.3

CHANGELOG.md

@@ -11,6 +11,7 @@ The following is a history of the changes made to this project.
 * Added switch to force apt update when executing install.sh.
 * Updated current Planefinder client versions to 4.1.1.
 * Updated current dump1090-fa version to 3.2.3.
+* The system page bandwidth meter now defaults to MB/sec on fresh installations.
 
 ## v2.6.2 *(April 6th, 2018)*
 

bash/variables.sh

@@ -34,7 +34,7 @@
 ## SOFTWARE VERSIONS
 
 # The ADS-B Receiver Project
-PROJECT_VERSION="2.6.1"
+PROJECT_VERSION="2.6.3"
 
 # RTL-SDR OGN
 RTLSDROGN_VERSION="0.2.5"

build/portal/html/classes/template.class.php

@@ -37,7 +37,7 @@ function display(&$pageData) {
 
             // Check if the portal is installed or needs upgraded.
 
-            $thisVersion = "2.6.2";
+            $thisVersion = "2.6.3";
 
             if (!file_exists($_SERVER['DOCUMENT_ROOT']."/classes/settings.class.php")) {
                 header ("Location: /install/install.php");

build/portal/html/install/index.php

@@ -29,7 +29,7 @@
     /////////////////////////////////////////////////////////////////////////////////////
 
     // The most current stable release.
-    $thisVersion = "2.6.2";
+    $thisVersion = "2.6.3";
 
     // Begin the upgrade process if this release is newer than what is installed.
     if (file_exists($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."classes".DIRECTORY_SEPARATOR."settings.class.php")) {
@@ -354,12 +354,12 @@ class settings {
                     break;
                 }
 
+                $dbh = $common->pdoOpen();
+
                 // Set permissions on SQLite file.
                 if ($_POST['driver'] == "sqlite") {
                     chmod($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."data".DIRECTORY_SEPARATOR."portal.sqlite", 0666);
                 }
-
-                $dbh = $common->pdoOpen();
 
                 $sth = $dbh->prepare($administratorsSql);
                 $sth->execute();
@@ -421,7 +421,7 @@ class settings {
             $common->addSetting('enableAdsbExchangeLink', FALSE);
             $common->addSetting('measurementRange', 'imperialNautical');
             $common->addSetting('measurementTemperature', 'imperial');
-            $common->addSetting('measurementBandwidth', 'kbps');
+            $common->addSetting('measurementBandwidth', 'mbps');
             $common->addSetting('networkInterface', 'eth0');
             $common->addSetting('emailFrom', '[email protected]');
             $common->addSetting('emailReplyTo', '[email protected]');

build/portal/html/install/upgrade.php

@@ -141,6 +141,15 @@
         $version = "2.6.2";
     }
 
+    // UPGRADE TO V2.6.3
+    if ($common->getSetting("version") == "2.6.2" && $success) {
+        $json = file_get_contents("http://localhost/install/upgrade-v2.6.3.php");
+        $results = json_decode($json, TRUE);
+        $success = $results['success'];
+        $message = $results['message'];
+        $version = "2.6.3";
+    }
+
     require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."admin".DIRECTORY_SEPARATOR."includes".DIRECTORY_SEPARATOR."header.inc.php");
 
     // Display the instalation wizard.

build/portal/html/templates/default/assets/js/system.js

@@ -9,8 +9,8 @@ $(document).ready(function () {
             ['Label', 'Value'],
             ['Memory', 100],
             ['CPU', 100],
-            ['In ' + ((bandwidthScale == 'kbps') ? '(KB/s)' : '(MB/s)'), 150],
-            ['Out ' + ((bandwidthScale == 'kbps') ? '(KB/s)' : '(MB/s)'), 150],
+            ['In ' + ((bandwidthScale == 'kbps') ? '(KB/s)' : '(MB/s)'), 100],
+            ['Out ' + ((bandwidthScale == 'kbps') ? '(KB/s)' : '(MB/s)'), 100],
             ['CPU Temp', 100]
         ]);