From 2d7ec771e525468eb7513355f0a25c334fd514ea Mon Sep 17 00:00:00 2001 From: Joe Prochazka Date: Fri, 22 Jun 2018 11:00:29 -0400 Subject: [PATCH 1/5] Upgrade to v2.3.6 --- CHANGELOG.md | 1 + build/portal/html/classes/template.class.php | 2 +- build/portal/html/install/index.php | 2 +- build/portal/html/install/upgrade.php | 9 +++++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cd55e12..405e5819 100644 --- a/CHANGELOG.md +++ b/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 maxes out at 150KB/MB per second. ## v2.6.2 *(April 6th, 2018)* diff --git a/build/portal/html/classes/template.class.php b/build/portal/html/classes/template.class.php index 401d4ae1..b7c9e626 100644 --- a/build/portal/html/classes/template.class.php +++ b/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"); diff --git a/build/portal/html/install/index.php b/build/portal/html/install/index.php index 58a1d419..3f22ad9b 100644 --- a/build/portal/html/install/index.php +++ b/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")) { diff --git a/build/portal/html/install/upgrade.php b/build/portal/html/install/upgrade.php index d4a25098..4d2b822d 100644 --- a/build/portal/html/install/upgrade.php +++ b/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. From 54a8a98fffb9f96bffee6511aee3e9317ee9f459 Mon Sep 17 00:00:00 2001 From: Joe Prochazka Date: Fri, 22 Jun 2018 11:20:47 -0400 Subject: [PATCH 2/5] Default to mbps instead of kbps. --- CHANGELOG.md | 1 + build/portal/html/install/index.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 405e5819..60f95cbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The following is a history of the changes made to this project. * Updated current Planefinder client versions to 4.1.1. * Updated current dump1090-fa version to 3.2.3. * The system page bandwidth meter now maxes out at 150KB/MB per second. +* The system page bandwidth meter now defaults to MB/sec on fresh installations. ## v2.6.2 *(April 6th, 2018)* diff --git a/build/portal/html/install/index.php b/build/portal/html/install/index.php index 3f22ad9b..30fa5239 100644 --- a/build/portal/html/install/index.php +++ b/build/portal/html/install/index.php @@ -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', 'noreply@adsbreceiver.net'); $common->addSetting('emailReplyTo', 'noreply@adsbreceiver.net'); From d189f31e80126b16f3c1a07b471ecba384e50033 Mon Sep 17 00:00:00 2001 From: Joe Prochazka Date: Fri, 22 Jun 2018 11:23:30 -0400 Subject: [PATCH 3/5] Reverted unneeded change. --- CHANGELOG.md | 1 - build/portal/html/templates/default/assets/js/system.js | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60f95cbb..9e1ff022 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,6 @@ 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 maxes out at 150KB/MB per second. * The system page bandwidth meter now defaults to MB/sec on fresh installations. ## v2.6.2 *(April 6th, 2018)* diff --git a/build/portal/html/templates/default/assets/js/system.js b/build/portal/html/templates/default/assets/js/system.js index 4870b1e4..4b0fb9ca 100644 --- a/build/portal/html/templates/default/assets/js/system.js +++ b/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] ]); From f1b18d0f3082b408187b111796b50ba4d6b0896e Mon Sep 17 00:00:00 2001 From: Joe Prochazka Date: Fri, 22 Jun 2018 12:41:49 -0400 Subject: [PATCH 4/5] Moved chmod command to proper place. --- build/portal/html/install/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/portal/html/install/index.php b/build/portal/html/install/index.php index 30fa5239..7ee2b23d 100644 --- a/build/portal/html/install/index.php +++ b/build/portal/html/install/index.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(); From f3d760e6217aaa72f4dc661d127323eb4f9ba3e5 Mon Sep 17 00:00:00 2001 From: Joe Prochazka Date: Fri, 22 Jun 2018 14:41:12 -0400 Subject: [PATCH 5/5] Updated version number. --- bash/variables.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash/variables.sh b/bash/variables.sh index 9a0a2b61..448255ad 100644 --- a/bash/variables.sh +++ b/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"