From 75058370795fda4f06f589ee970edf94dc0ddf88 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 3 Jan 2013 21:32:33 -0500
Subject: Basic update progress of database update only

---
 core/templates/update.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 core/templates/update.php

(limited to 'core/templates')

diff --git a/core/templates/update.php b/core/templates/update.php
new file mode 100644
index 00000000000..cf3f2ab0d79
--- /dev/null
+++ b/core/templates/update.php
@@ -0,0 +1,27 @@
+<ul>
+	<li class='update'>
+		<?php echo $l->t('Updating ownCloud from version %s to version %s, this may take a while.', array($_['installed'], $_['current'])); ?><br /><br />
+	</li>
+</ul>
+<script>
+	$(document).ready(function () {
+		OC.EventSource.requesttoken = oc_requesttoken;
+		var updateEventSource = new OC.EventSource(OC.webroot+'/core/ajax/update.php');
+		updateEventSource.listen('success', function(message) {
+			$('<span>').append(message).append('<br />').appendTo($('.update'));
+		});
+		updateEventSource.listen('error', function(message) {
+			$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
+		});
+		updateEventSource.listen('failure', function(message) {
+			$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
+			$('<span>').addClass('error bold').append('<br />').append(t('core', 'The update was unsuccessful. Please report this issue to the <a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.')).appendTo($('.update'));
+		});
+		updateEventSource.listen('done', function(message) {
+			$('<span>').addClass('bold').append('<br />').append(t('core', 'The update was successful. Redirecting you to ownCloud now.')).appendTo($('.update'));
+			setTimeout(function () {
+				window.location.href = OC.webroot;
+			}, 3000);
+		});
+	});
+</script>
\ No newline at end of file
-- 
cgit v1.2.3


From a94405b4e4ebbeea2f8bc3a220572dab1ae7cb3a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 4 Jan 2013 20:13:00 -0500
Subject: Only show the version updating to instead of worrying about
 converting internal to a formatted version

---
 core/templates/update.php | 2 +-
 lib/base.php              | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'core/templates')

diff --git a/core/templates/update.php b/core/templates/update.php
index cf3f2ab0d79..41da712c6ca 100644
--- a/core/templates/update.php
+++ b/core/templates/update.php
@@ -1,6 +1,6 @@
 <ul>
 	<li class='update'>
-		<?php echo $l->t('Updating ownCloud from version %s to version %s, this may take a while.', array($_['installed'], $_['current'])); ?><br /><br />
+		<?php echo $l->t('Updating ownCloud to version %s, this may take a while.', array($_['version'])); ?><br /><br />
 	</li>
 </ul>
 <script>
diff --git a/lib/base.php b/lib/base.php
index e6355013c73..3d3e7d59f90 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -247,8 +247,7 @@ class OC
 					OC_Config::setValue('maintenance', true);
 					OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::DEBUG);
 					$tmpl = new OC_Template('', 'update', 'guest');
-					$tmpl->assign('current', $currentVersion);
-					$tmpl->assign('installed', $installedVersion);
+					$tmpl->assign('version', OC_Util::getVersionString());
 					$tmpl->printPage();
 					exit();
 				} else {
-- 
cgit v1.2.3


From 5ea8adc7c7a3659fb95e9111078acf995cea39fb Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 5 Jan 2013 12:21:57 -0500
Subject: Reformat long line

---
 core/templates/update.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'core/templates')

diff --git a/core/templates/update.php b/core/templates/update.php
index 41da712c6ca..c9f3144f257 100644
--- a/core/templates/update.php
+++ b/core/templates/update.php
@@ -15,7 +15,11 @@
 		});
 		updateEventSource.listen('failure', function(message) {
 			$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
-			$('<span>').addClass('error bold').append('<br />').append(t('core', 'The update was unsuccessful. Please report this issue to the <a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.')).appendTo($('.update'));
+			$('<span>')
+				.addClass('error bold')
+				.append('<br />')
+				.append(t('core', 'The update was unsuccessful. Please report this issue to the <a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.'))
+				.appendTo($('.update'));
 		});
 		updateEventSource.listen('done', function(message) {
 			$('<span>').addClass('bold').append('<br />').append(t('core', 'The update was successful. Redirecting you to ownCloud now.')).appendTo($('.update'));
-- 
cgit v1.2.3