From 7a135d8d81896d2e2a26b19d941cdcc8237ba393 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 23 Sep 2016 13:59:46 +0200
Subject: [PATCH] Revert "Show an update button instead of the updater"

This reverts commit b42ee95383cbedb6a0fadf315fcdccba226286a9.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 .../controller/admincontroller.php            |  1 -
 apps/updatenotification/js/admin.js           | 25 +++++++++++++++++++
 apps/updatenotification/lib/updatechecker.php |  3 ---
 apps/updatenotification/templates/admin.php   |  6 +++--
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/apps/updatenotification/controller/admincontroller.php b/apps/updatenotification/controller/admincontroller.php
index 55ef26c59a7..8635b3f3e3d 100644
--- a/apps/updatenotification/controller/admincontroller.php
+++ b/apps/updatenotification/controller/admincontroller.php
@@ -134,7 +134,6 @@ class AdminController extends Controller {
 			'channels' => $channels,
 			'newVersionString' => ($updateState === []) ? '' : $updateState['updateVersion'],
 			'updaterRequirementsFulfilled' => $this->isCompatibleWithUpdater(),
-			'downloadLink' => (empty($updateState['downloadLink'])) ? '' : $updateState['downloadLink'],
 		];
 
 		return new TemplateResponse($this->appName, 'admin', $params, '');
diff --git a/apps/updatenotification/js/admin.js b/apps/updatenotification/js/admin.js
index 4332df78909..3bc5dd21527 100644
--- a/apps/updatenotification/js/admin.js
+++ b/apps/updatenotification/js/admin.js
@@ -13,7 +13,32 @@
 /**
  * Creates a new authentication token and loads the updater URL
  */
+var loginToken = '';
 $(document).ready(function(){
+	$('#oca_updatenotification_button').click(function() {
+		// Load the new token
+		$.ajax({
+			url: OC.generateUrl('/apps/updatenotification/credentials')
+		}).success(function(data) {
+			loginToken = data;
+			$.ajax({
+				url: OC.webroot+'/updater/',
+				headers: {
+					'X-Updater-Auth': loginToken
+				},
+				method: 'POST',
+				success: function(data){
+					if(data !== 'false') {
+						var body = $('body');
+						$('head').remove();
+						body.html(data);
+						body.removeAttr('id');
+						body.attr('id', 'body-settings');
+					}
+				}
+			});
+		});
+	});
 	$('#release-channel').change(function() {
 		var newChannel = $('#release-channel').find(":selected").val();
 		$.post(
diff --git a/apps/updatenotification/lib/updatechecker.php b/apps/updatenotification/lib/updatechecker.php
index 153a6ae4aa3..32eab405a62 100644
--- a/apps/updatenotification/lib/updatechecker.php
+++ b/apps/updatenotification/lib/updatechecker.php
@@ -48,9 +48,6 @@ class UpdateChecker {
 			if(substr($data['web'], 0, 8) === 'https://') {
 				$result['updateLink'] = $data['web'];
 			}
-			if(substr($data['url'], 0, 8) === 'https://') {
-				$result['downloadLink'] = $data['url'];
-			}
 
 			return $result;
 		}
diff --git a/apps/updatenotification/templates/admin.php b/apps/updatenotification/templates/admin.php
index 32ad7ffd1ad..67f693ce7ea 100644
--- a/apps/updatenotification/templates/admin.php
+++ b/apps/updatenotification/templates/admin.php
@@ -20,8 +20,10 @@
 
 	<?php if($isNewVersionAvailable === true): ?>
 		<strong><?php p($l->t('A new version is available: %s', [$newVersionString])); ?></strong>
-		<?php if ($_['downloadLink']): ?>
-			<a href="<?php p($_['downloadLink']); ?>" class="button"><?php p($l->t('Download now')) ?></a>
+		<?php if($updaterRequirementsFulfilled === true): ?>
+			<input type="button" id="oca_updatenotification_button" value="<?php p($l->t('Open updater')) ?>">
+		<?php else: ?>
+			<br/><?php p($l->t('At the moment only manual updates are supported on your environment. This is very likely the case because functions such as shell_exec are not available.')); ?>
 		<?php endif; ?>
 	<?php else: ?>
 		<strong><?php print_unescaped($l->t('Your version is up to date.')); ?></strong>