diff --git a/apps/updatenotification/controller/admincontroller.php b/apps/updatenotification/controller/admincontroller.php index 8635b3f3e3d..eddedb6c1b1 100644 --- a/apps/updatenotification/controller/admincontroller.php +++ b/apps/updatenotification/controller/admincontroller.php @@ -80,33 +80,6 @@ class AdminController extends Controller { $this->dateTimeFormatter = $dateTimeFormatter; } - /** - * Whether the instance is compatible with the updater - * - * @return bool - */ - protected function isCompatibleWithUpdater() { - $updaterCompatible = true; - if(!function_exists('proc_open') || !function_exists('shell_exec')) { - $updaterCompatible = false; - } else { - $whichUnzip = shell_exec('command -v unzip'); - if(!class_exists('ZipArchive') && empty($whichUnzip)) { - $updaterCompatible = false; - } - - $whichPhp = shell_exec('command -v php'); - if(empty($whichPhp)) { - $updaterCompatible = false; - } - } - if(!function_exists('curl_exec')) { - $updaterCompatible = false; - } - - return $updaterCompatible; - } - /** * @return TemplateResponse */ @@ -122,6 +95,7 @@ class AdminController extends Controller { 'production', ]; $currentChannel = \OCP\Util::getChannel(); + // Remove the currently used channel from the channels list if(($key = array_search($currentChannel, $channels)) !== false) { unset($channels[$key]); @@ -133,7 +107,6 @@ class AdminController extends Controller { 'currentChannel' => $currentChannel, 'channels' => $channels, 'newVersionString' => ($updateState === []) ? '' : $updateState['updateVersion'], - 'updaterRequirementsFulfilled' => $this->isCompatibleWithUpdater(), ]; return new TemplateResponse($this->appName, 'admin', $params, ''); diff --git a/apps/updatenotification/templates/admin.php b/apps/updatenotification/templates/admin.php index 67f693ce7ea..534a3032d99 100644 --- a/apps/updatenotification/templates/admin.php +++ b/apps/updatenotification/templates/admin.php @@ -12,19 +12,13 @@ $channels = $_['channels']; /** @var string $currentChannel */ $currentChannel = $_['currentChannel']; - /** @var bool $updaterRequirementsFulfilled */ - $updaterRequirementsFulfilled = $_['updaterRequirementsFulfilled']; ?>