From 6b97429ebe3d4e58137cfd0117f9cd4ecca7ebd3 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 26 Mar 2018 13:56:14 +0200 Subject: [PATCH] Show EOL warning in the update section Signed-off-by: Joas Schilling --- apps/updatenotification/css/admin.css | 3 +++ .../lib/Controller/AdminController.php | 1 + apps/updatenotification/lib/UpdateChecker.php | 1 + apps/updatenotification/templates/admin.php | 10 ++++++++++ .../tests/Controller/AdminControllerTest.php | 5 ++++- apps/updatenotification/tests/UpdateCheckerTest.php | 4 ++++ lib/private/Updater/VersionCheck.php | 1 + tests/lib/Updater/VersionCheckTest.php | 4 ++++ 8 files changed, 28 insertions(+), 1 deletion(-) diff --git a/apps/updatenotification/css/admin.css b/apps/updatenotification/css/admin.css index 59c8f056fb..d3f7ef6aa2 100644 --- a/apps/updatenotification/css/admin.css +++ b/apps/updatenotification/css/admin.css @@ -1,3 +1,6 @@ #oca_updatenotification_section p { margin: 25px 0; } +#updatenotification .warning { + color: #ce3702; +} diff --git a/apps/updatenotification/lib/Controller/AdminController.php b/apps/updatenotification/lib/Controller/AdminController.php index c96326c862..ac1d807aa2 100644 --- a/apps/updatenotification/lib/Controller/AdminController.php +++ b/apps/updatenotification/lib/Controller/AdminController.php @@ -119,6 +119,7 @@ class AdminController extends Controller implements ISettings { 'newVersionString' => (empty($updateState['updateVersion'])) ? '' : $updateState['updateVersion'], 'downloadLink' => (empty($updateState['downloadLink'])) ? '' : $updateState['downloadLink'], 'updaterEnabled' => (empty($updateState['updaterEnabled'])) ? false : $updateState['updaterEnabled'], + 'versionIsEol' => empty($updateState['versionIsEol']) ? false : $updateState['versionIsEol'], 'isDefaultUpdateServerURL' => $updateServerURL === $defaultUpdateServerURL, 'updateServerURL' => $updateServerURL, 'notify_groups' => implode('|', $notifyGroups), diff --git a/apps/updatenotification/lib/UpdateChecker.php b/apps/updatenotification/lib/UpdateChecker.php index ad76de5695..bb5264a6c2 100644 --- a/apps/updatenotification/lib/UpdateChecker.php +++ b/apps/updatenotification/lib/UpdateChecker.php @@ -48,6 +48,7 @@ class UpdateChecker { $result['updateAvailable'] = true; $result['updateVersion'] = $data['versionstring']; $result['updaterEnabled'] = $data['autoupdater'] === '1'; + $result['versionIsEol'] = $data['eol'] === '1'; if(substr($data['web'], 0, 8) === 'https://') { $result['updateLink'] = $data['web']; } diff --git a/apps/updatenotification/templates/admin.php b/apps/updatenotification/templates/admin.php index e09d19848e..81201069fe 100644 --- a/apps/updatenotification/templates/admin.php +++ b/apps/updatenotification/templates/admin.php @@ -30,6 +30,16 @@ t('Download now')) ?> + + +

+ + + t('The version you are running is not maintained anymore. Please make sure to update to a supported version as soon as possible.')); ?> + +

+ + t('The update check is not yet finished. Please refresh the page.')); ?> diff --git a/apps/updatenotification/tests/Controller/AdminControllerTest.php b/apps/updatenotification/tests/Controller/AdminControllerTest.php index 6eb049f628..7528dcbfaf 100644 --- a/apps/updatenotification/tests/Controller/AdminControllerTest.php +++ b/apps/updatenotification/tests/Controller/AdminControllerTest.php @@ -122,6 +122,7 @@ class AdminControllerTest extends TestCase { 'updateVersion' => '8.1.2', 'downloadLink' => 'https://downloads.nextcloud.org/server', 'updaterEnabled' => true, + 'versionIsEol' => false, ]); $params = [ @@ -133,6 +134,7 @@ class AdminControllerTest extends TestCase { 'newVersionString' => '8.1.2', 'downloadLink' => 'https://downloads.nextcloud.org/server', 'updaterEnabled' => true, + 'versionIsEol' => false, 'isDefaultUpdateServerURL' => true, 'updateServerURL' => 'https://updates.nextcloud.com/updater_server/', 'notify_groups' => 'admin', @@ -186,7 +188,8 @@ class AdminControllerTest extends TestCase { 'channels' => $channels, 'newVersionString' => '', 'downloadLink' => '', - 'updaterEnabled' => 0, + 'updaterEnabled' => false, + 'versionIsEol' => false, 'isDefaultUpdateServerURL' => true, 'updateServerURL' => 'https://updates.nextcloud.com/updater_server/', 'notify_groups' => 'admin', diff --git a/apps/updatenotification/tests/UpdateCheckerTest.php b/apps/updatenotification/tests/UpdateCheckerTest.php index f7ed83047a..9920ed439d 100644 --- a/apps/updatenotification/tests/UpdateCheckerTest.php +++ b/apps/updatenotification/tests/UpdateCheckerTest.php @@ -52,12 +52,14 @@ class UpdateCheckerTest extends TestCase { 'web'=> 'javascript:alert(1)', 'url'=> 'javascript:alert(2)', 'autoupdater'=> '0', + 'eol'=> '1', ]); $expected = [ 'updateAvailable' => true, 'updateVersion' => 'Nextcloud 123', 'updaterEnabled' => false, + 'versionIsEol' => true, ]; $this->assertSame($expected, $this->updateChecker->getUpdateState()); } @@ -72,12 +74,14 @@ class UpdateCheckerTest extends TestCase { 'web'=> 'https://docs.nextcloud.com/myUrl', 'url'=> 'https://downloads.nextcloud.org/server', 'autoupdater'=> '1', + 'eol'=> '0', ]); $expected = [ 'updateAvailable' => true, 'updateVersion' => 'Nextcloud 123', 'updaterEnabled' => true, + 'versionIsEol' => false, 'updateLink' => 'https://docs.nextcloud.com/myUrl', 'downloadLink' => 'https://downloads.nextcloud.org/server', ]; diff --git a/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php index c7b829c9ec..5cfc3c81a1 100644 --- a/lib/private/Updater/VersionCheck.php +++ b/lib/private/Updater/VersionCheck.php @@ -98,6 +98,7 @@ class VersionCheck { $tmp['url'] = (string)$data->url; $tmp['web'] = (string)$data->web; $tmp['autoupdater'] = (string)$data->autoupdater; + $tmp['eol'] = isset($data->eol) ? (string)$data->eol : '0'; } else { libxml_clear_errors(); } diff --git a/tests/lib/Updater/VersionCheckTest.php b/tests/lib/Updater/VersionCheckTest.php index 89a335722d..216510b662 100644 --- a/tests/lib/Updater/VersionCheckTest.php +++ b/tests/lib/Updater/VersionCheckTest.php @@ -85,6 +85,7 @@ class VersionCheckTest extends \Test\TestCase { 'url' => 'https://download.example.org/community/owncloud-8.0.4.zip', 'web' => 'http://doc.example.org/server/8.0/admin_manual/maintenance/upgrade.html', 'autoupdater' => '0', + 'eol' => '1', ]; $this->config @@ -123,6 +124,7 @@ class VersionCheckTest extends \Test\TestCase { https://download.example.org/community/owncloud-8.0.4.zip http://doc.example.org/server/8.0/admin_manual/maintenance/upgrade.html 0 + 1 '; $this->updater ->expects($this->once()) @@ -180,6 +182,7 @@ class VersionCheckTest extends \Test\TestCase { 'url' => '', 'web' => '', 'autoupdater' => '', + 'eol' => '0', ]; $this->config @@ -273,6 +276,7 @@ class VersionCheckTest extends \Test\TestCase { 'url' => '', 'web' => '', 'autoupdater' => '', + 'eol' => '0', ]; $this->config