mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2522 from nextcloud/show-old-php-info 

[stable10] Show info in updater if running PHP < 5.6
This commit is contained in:
Roeland Jago Douma 2016-12-06 08:40:10 +01:00 committed by GitHub
parent 5850424c0c 035be23f72
commit fcb7a1e458
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/updatenotification/lib/Controller/AdminController.php
View File

@ -114,7 +114,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'],
'outdatedPHP' => version_compare(PHP_VERSION, '5.6') === -1,
'notify_groups' => implode('|', $notifyGroups),
];

7
apps/updatenotification/templates/admin.php
View File

@ -14,6 +14,13 @@
$currentChannel = $_['currentChannel'];
?>
<form id="oca_updatenotification_section" class="followupsection">
<?php if($_['outdatedPHP'] === true) { ?>
<p class="warning" style="margin-bottom: 15px;">
<?php p($l->t('You are running PHP %s. To allow you to upgrade to Nextcloud 11 and higher you need to run at least PHP 5.6. Once you upgraded your PHP version you will be able to receive update notifications for these newer versions.', [PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION])); ?>
</p>
<?php } ?>
<?php if($isNewVersionAvailable === true) { ?>
<strong><?php p($l->t('A new version is available: %s', [$newVersionString])); ?></strong>
<?php if ($_['updaterEnabled']) { ?>

2
apps/updatenotification/tests/Controller/AdminControllerTest.php
View File

@ -125,6 +125,7 @@ class AdminControllerTest extends TestCase {
'newVersionString' => '8.1.2',
'downloadLink' => 'https://downloads.nextcloud.org/server',
'updaterEnabled' => true,
'outdatedPHP' => version_compare(PHP_VERSION, '5.6') === -1,
'notify_groups' => 'admin',
];
@ -171,6 +172,7 @@ class AdminControllerTest extends TestCase {
'newVersionString' => '',
'downloadLink' => '',
'updaterEnabled' => 0,
'outdatedPHP' => version_compare(PHP_VERSION, '5.6') === -1,
'notify_groups' => 'admin',
];