Show EOL warning in the update section

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2018-03-26 13:56:14 +02:00
parent fa65aaf1fc
commit 6b97429ebe
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
8 changed files with 28 additions and 1 deletions

View File

@ -1,3 +1,6 @@
#oca_updatenotification_section p { #oca_updatenotification_section p {
margin: 25px 0; margin: 25px 0;
} }
#updatenotification .warning {
color: #ce3702;
}

View File

@ -119,6 +119,7 @@ class AdminController extends Controller implements ISettings {
'newVersionString' => (empty($updateState['updateVersion'])) ? '' : $updateState['updateVersion'], 'newVersionString' => (empty($updateState['updateVersion'])) ? '' : $updateState['updateVersion'],
'downloadLink' => (empty($updateState['downloadLink'])) ? '' : $updateState['downloadLink'], 'downloadLink' => (empty($updateState['downloadLink'])) ? '' : $updateState['downloadLink'],
'updaterEnabled' => (empty($updateState['updaterEnabled'])) ? false : $updateState['updaterEnabled'], 'updaterEnabled' => (empty($updateState['updaterEnabled'])) ? false : $updateState['updaterEnabled'],
'versionIsEol' => empty($updateState['versionIsEol']) ? false : $updateState['versionIsEol'],
'isDefaultUpdateServerURL' => $updateServerURL === $defaultUpdateServerURL, 'isDefaultUpdateServerURL' => $updateServerURL === $defaultUpdateServerURL,
'updateServerURL' => $updateServerURL, 'updateServerURL' => $updateServerURL,
'notify_groups' => implode('|', $notifyGroups), 'notify_groups' => implode('|', $notifyGroups),

View File

@ -48,6 +48,7 @@ class UpdateChecker {
$result['updateAvailable'] = true; $result['updateAvailable'] = true;
$result['updateVersion'] = $data['versionstring']; $result['updateVersion'] = $data['versionstring'];
$result['updaterEnabled'] = $data['autoupdater'] === '1'; $result['updaterEnabled'] = $data['autoupdater'] === '1';
$result['versionIsEol'] = $data['eol'] === '1';
if(substr($data['web'], 0, 8) === 'https://') { if(substr($data['web'], 0, 8) === 'https://') {
$result['updateLink'] = $data['web']; $result['updateLink'] = $data['web'];
} }

View File

@ -30,6 +30,16 @@
<?php if (!empty($_['downloadLink'])) { ?> <?php if (!empty($_['downloadLink'])) { ?>
<a href="<?php p($_['downloadLink']); ?>" class="button<?php if ($_['updaterEnabled']) { p(' hidden'); } ?>"><?php p($l->t('Download now')) ?></a> <a href="<?php p($_['downloadLink']); ?>" class="button<?php if ($_['updaterEnabled']) { p(' hidden'); } ?>"><?php p($l->t('Download now')) ?></a>
<?php } ?> <?php } ?>
<?php if (!empty($_['versionIsEol'])) { ?>
<p>
<span class="warning">
<span class="icon icon-error"></span>
<?php p($l->t('The version you are running is not maintained anymore. Please make sure to update to a supported version as soon as possible.')); ?>
</span>
</p>
<?php } ?>
<?php } elseif (!$isUpdateChecked) { ?> <?php } elseif (!$isUpdateChecked) { ?>
<?php p($l->t('The update check is not yet finished. Please refresh the page.')); ?> <?php p($l->t('The update check is not yet finished. Please refresh the page.')); ?>
<?php } else { ?> <?php } else { ?>

View File

@ -122,6 +122,7 @@ class AdminControllerTest extends TestCase {
'updateVersion' => '8.1.2', 'updateVersion' => '8.1.2',
'downloadLink' => 'https://downloads.nextcloud.org/server', 'downloadLink' => 'https://downloads.nextcloud.org/server',
'updaterEnabled' => true, 'updaterEnabled' => true,
'versionIsEol' => false,
]); ]);
$params = [ $params = [
@ -133,6 +134,7 @@ class AdminControllerTest extends TestCase {
'newVersionString' => '8.1.2', 'newVersionString' => '8.1.2',
'downloadLink' => 'https://downloads.nextcloud.org/server', 'downloadLink' => 'https://downloads.nextcloud.org/server',
'updaterEnabled' => true, 'updaterEnabled' => true,
'versionIsEol' => false,
'isDefaultUpdateServerURL' => true, 'isDefaultUpdateServerURL' => true,
'updateServerURL' => 'https://updates.nextcloud.com/updater_server/', 'updateServerURL' => 'https://updates.nextcloud.com/updater_server/',
'notify_groups' => 'admin', 'notify_groups' => 'admin',
@ -186,7 +188,8 @@ class AdminControllerTest extends TestCase {
'channels' => $channels, 'channels' => $channels,
'newVersionString' => '', 'newVersionString' => '',
'downloadLink' => '', 'downloadLink' => '',
'updaterEnabled' => 0, 'updaterEnabled' => false,
'versionIsEol' => false,
'isDefaultUpdateServerURL' => true, 'isDefaultUpdateServerURL' => true,
'updateServerURL' => 'https://updates.nextcloud.com/updater_server/', 'updateServerURL' => 'https://updates.nextcloud.com/updater_server/',
'notify_groups' => 'admin', 'notify_groups' => 'admin',

View File

@ -52,12 +52,14 @@ class UpdateCheckerTest extends TestCase {
'web'=> 'javascript:alert(1)', 'web'=> 'javascript:alert(1)',
'url'=> 'javascript:alert(2)', 'url'=> 'javascript:alert(2)',
'autoupdater'=> '0', 'autoupdater'=> '0',
'eol'=> '1',
]); ]);
$expected = [ $expected = [
'updateAvailable' => true, 'updateAvailable' => true,
'updateVersion' => 'Nextcloud 123', 'updateVersion' => 'Nextcloud 123',
'updaterEnabled' => false, 'updaterEnabled' => false,
'versionIsEol' => true,
]; ];
$this->assertSame($expected, $this->updateChecker->getUpdateState()); $this->assertSame($expected, $this->updateChecker->getUpdateState());
} }
@ -72,12 +74,14 @@ class UpdateCheckerTest extends TestCase {
'web'=> 'https://docs.nextcloud.com/myUrl', 'web'=> 'https://docs.nextcloud.com/myUrl',
'url'=> 'https://downloads.nextcloud.org/server', 'url'=> 'https://downloads.nextcloud.org/server',
'autoupdater'=> '1', 'autoupdater'=> '1',
'eol'=> '0',
]); ]);
$expected = [ $expected = [
'updateAvailable' => true, 'updateAvailable' => true,
'updateVersion' => 'Nextcloud 123', 'updateVersion' => 'Nextcloud 123',
'updaterEnabled' => true, 'updaterEnabled' => true,
'versionIsEol' => false,
'updateLink' => 'https://docs.nextcloud.com/myUrl', 'updateLink' => 'https://docs.nextcloud.com/myUrl',
'downloadLink' => 'https://downloads.nextcloud.org/server', 'downloadLink' => 'https://downloads.nextcloud.org/server',
]; ];

View File

@ -98,6 +98,7 @@ class VersionCheck {
$tmp['url'] = (string)$data->url; $tmp['url'] = (string)$data->url;
$tmp['web'] = (string)$data->web; $tmp['web'] = (string)$data->web;
$tmp['autoupdater'] = (string)$data->autoupdater; $tmp['autoupdater'] = (string)$data->autoupdater;
$tmp['eol'] = isset($data->eol) ? (string)$data->eol : '0';
} else { } else {
libxml_clear_errors(); libxml_clear_errors();
} }

View File

@ -85,6 +85,7 @@ class VersionCheckTest extends \Test\TestCase {
'url' => 'https://download.example.org/community/owncloud-8.0.4.zip', 'url' => 'https://download.example.org/community/owncloud-8.0.4.zip',
'web' => 'http://doc.example.org/server/8.0/admin_manual/maintenance/upgrade.html', 'web' => 'http://doc.example.org/server/8.0/admin_manual/maintenance/upgrade.html',
'autoupdater' => '0', 'autoupdater' => '0',
'eol' => '1',
]; ];
$this->config $this->config
@ -123,6 +124,7 @@ class VersionCheckTest extends \Test\TestCase {
<url>https://download.example.org/community/owncloud-8.0.4.zip</url> <url>https://download.example.org/community/owncloud-8.0.4.zip</url>
<web>http://doc.example.org/server/8.0/admin_manual/maintenance/upgrade.html</web> <web>http://doc.example.org/server/8.0/admin_manual/maintenance/upgrade.html</web>
<autoupdater>0</autoupdater> <autoupdater>0</autoupdater>
<eol>1</eol>
</owncloud>'; </owncloud>';
$this->updater $this->updater
->expects($this->once()) ->expects($this->once())
@ -180,6 +182,7 @@ class VersionCheckTest extends \Test\TestCase {
'url' => '', 'url' => '',
'web' => '', 'web' => '',
'autoupdater' => '', 'autoupdater' => '',
'eol' => '0',
]; ];
$this->config $this->config
@ -273,6 +276,7 @@ class VersionCheckTest extends \Test\TestCase {
'url' => '', 'url' => '',
'web' => '', 'web' => '',
'autoupdater' => '', 'autoupdater' => '',
'eol' => '0',
]; ];
$this->config $this->config