Skip to content

Refinements #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukasReschke merged 8 commits into from
Sep 26, 2016
Merged

Refinements #32

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b026785
add proper error text instead of cryptic HTTP error codes
MorrisJobke Sep 21, 2016
584ab32
Add more extensive logging
MorrisJobke Sep 21, 2016
bf28fd5
log a request ID and the current version
MorrisJobke Sep 21, 2016
d960eb4
use the NEXTCLOUD_CONFIG_DIR if available to determine config dir
MorrisJobke Sep 21, 2016
3411a98
escape all responses from server
MorrisJobke Sep 22, 2016
4778649
check if the data directory is actually set
MorrisJobke Sep 23, 2016
4c725ad
show release channel in updater
MorrisJobke Sep 26, 2016
46e2b15
allow to retry updater step directly from the updater
MorrisJobke Sep 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
allow to retry updater step directly from the updater
  • Loading branch information
@MorrisJobke
MorrisJobke committed Sep 26, 2016
commit 46e2b150b11bc41086d008f61b6761b4fb0f1ff0
77 changes: 63 additions & 14 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,8 @@ public function downloadUpdate() {
$message .= ' - curl error message: ' . $curlErrorMessage;
}

$message .= ' - URL: ' . htmlentities($response['url']);

throw new \Exception($message);
}
curl_close($ch);
Expand Down Expand Up @@ -1165,6 +1167,9 @@ public function logVersion() {
$updater->log('[info] show HTML page');
$updater->logVersion();
$updaterUrl = explode('?', $_SERVER['REQUEST_URI'], 2)[0];
if(strpos($updaterUrl, 'index.php') === false) {
$updaterUrl = rtrim($updaterUrl, '/') . '/index.php';
}
?>

<html>
Expand Down Expand Up @@ -1431,6 +1436,7 @@ public function logVersion() {
<?php
}
?>
<button id="retryUpdateButton" class="hidden">Retry update</button>
</div>
</li>
<li id="step-check-files" class="step <?php if($stepNumber >= 1) { echo 'passed-step'; }?>">
Expand Down Expand Up @@ -1479,7 +1485,7 @@ public function logVersion() {
<li id="step-done" class="step <?php if($stepNumber >= 11) { echo 'passed-step'; }?>">
<h2>Done</h2>
<div class="output hidden">
<a class="button" href="<?php echo $updaterUrl . '../'?>">Go to back to your Nextcloud instance to finish the update</a>
<a class="button" href="<?php echo str_replace('/index.php', '/../', $updaterUrl); ?>">Go to back to your Nextcloud instance to finish the update</a>
</div>
</li>
</ul>
Expand Down Expand Up @@ -1517,15 +1523,22 @@ function escapeHTML(s) {
var done = false;
var started = false;
var updaterStepStart = parseInt(document.getElementById('updater-step-start').value);
var elementId =false;
function addStepText(id, text) {
var el = document.getElementById(id);
var output =el.getElementsByClassName('output')[0];
var output = el.getElementsByClassName('output')[0];
if(typeof text === 'object') {
text = JSON.stringify(text);
}
output.innerHTML = output.innerHTML + text;
output.classList.remove('hidden');
}
function removeStepText(id) {
var el = document.getElementById(id);
var output = el.getElementsByClassName('output')[0];
output.innerHTML = '';
output.classList.add('hidden');
}

function currentStep(id) {
var el = document.getElementById(id);
Expand All @@ -1535,12 +1548,20 @@ function currentStep(id) {
el.classList.add('current-step');
}

function errorStep(id) {
function errorStep(id, numericId) {
var el = document.getElementById(id);
el.classList.remove('passed-step');
el.classList.remove('current-step');
el.classList.remove('waiting-step');
el.classList.add('failed-step');

// set start step to previous one
updaterStepStart = numericId - 1;
elementId = id;

// show restart button
var button = document.getElementById('retryUpdateButton');
button.classList.remove('hidden');
}

function successStep(id) {
Expand Down Expand Up @@ -1602,7 +1623,7 @@ function performStep(number, callback) {
currentStep('step-check-permissions');
performStep(2, performStepCallbacks[2]);
} else {
errorStep('step-check-files');
errorStep('step-check-files', 1);

var text = '';
if (typeof response['response'] === 'string') {
Expand All @@ -1623,7 +1644,7 @@ function performStep(number, callback) {
currentStep('step-enable-maintenance');
performStep(3, performStepCallbacks[3]);
} else {
errorStep('step-check-permissions');
errorStep('step-check-permissions', 2);

var text = '';
if (typeof response['response'] === 'string') {
Expand All @@ -1644,7 +1665,7 @@ function performStep(number, callback) {
currentStep('step-backup');
performStep(4, performStepCallbacks[4]);
} else {
errorStep('step-enable-maintenance');
errorStep('step-enable-maintenance', 3);

if(response.response) {
addStepText('step-enable-maintenance', escapeHTML(response.response));
Expand All @@ -1657,7 +1678,7 @@ function performStep(number, callback) {
currentStep('step-download');
performStep(5, performStepCallbacks[5]);
} else {
errorStep('step-backup');
errorStep('step-backup', 4);

if(response.response) {
addStepText('step-backup', escapeHTML(response.response));
Expand All @@ -1670,7 +1691,7 @@ function performStep(number, callback) {
currentStep('step-extract');
performStep(6, performStepCallbacks[6]);
} else {
errorStep('step-download');
errorStep('step-download', 5);

if(response.response) {
addStepText('step-download', escapeHTML(response.response));
Expand All @@ -1683,7 +1704,7 @@ function performStep(number, callback) {
currentStep('step-entrypoints');
performStep(7, performStepCallbacks[7]);
} else {
errorStep('step-extract');
errorStep('step-extract', 6);

if(response.response) {
addStepText('step-extract', escapeHTML(response.response));
Expand All @@ -1696,7 +1717,7 @@ function performStep(number, callback) {
currentStep('step-delete');
performStep(8, performStepCallbacks[8]);
} else {
errorStep('step-entrypoints');
errorStep('step-entrypoints', 7);

if(response.response) {
addStepText('step-entrypoints', escapeHTML(response.response));
Expand All @@ -1709,7 +1730,7 @@ function performStep(number, callback) {
currentStep('step-move');
performStep(9, performStepCallbacks[9]);
} else {
errorStep('step-delete');
errorStep('step-delete', 8);

if(response.response) {
addStepText('step-delete', escapeHTML(response.response));
Expand All @@ -1726,7 +1747,7 @@ function performStep(number, callback) {
.getElementsByClassName('output')[0];
el.classList.remove('hidden');
} else {
errorStep('step-move');
errorStep('step-move', 9);

if(response.response) {
addStepText('step-move', escapeHTML(response.response));
Expand All @@ -1739,7 +1760,7 @@ function performStep(number, callback) {
currentStep('step-done');
performStep(11, performStepCallbacks[11]);
} else {
errorStep('step-maintenance-mode');
errorStep('step-maintenance-mode', 10);

if(response.response) {
addStepText('step-maintenance-mode', escapeHTML(response.response));
Expand All @@ -1755,7 +1776,7 @@ function performStep(number, callback) {
.getElementsByClassName('output')[0];
el.classList.remove('hidden');
} else {
errorStep('step-done');
errorStep('step-done', 11);
}
done = true;
},
Expand All @@ -1767,6 +1788,27 @@ function startUpdate() {
});
}

function retryUpdate() {
//remove failed log
if (elementId !== false) {
var el = document.getElementById(elementId);
el.classList.remove('passed-step');
el.classList.remove('current-step');
el.classList.remove('waiting-step');
el.classList.remove('failed-step');

removeStepText(elementId);

elementId = false;
}

// hide restart button
var button = document.getElementById('retryUpdateButton');
button.classList.add('hidden');

startUpdate();
}

function askForMaintenance(keepActive) {
var el = document.getElementById('step-maintenance-mode')
.getElementsByClassName('output')[0];
Expand All @@ -1785,9 +1827,16 @@ function askForMaintenance(keepActive) {
if(document.getElementById('startUpdateButton')) {
document.getElementById('startUpdateButton').onclick = function (e) {
e.preventDefault();
this.classList.add('hidden');
startUpdate();
};
}
if(document.getElementById('retryUpdateButton')) {
document.getElementById('retryUpdateButton').onclick = function (e) {
e.preventDefault();
retryUpdate();
};
}
if(document.getElementById('maintenance-enable')) {
document.getElementById('maintenance-enable').onclick = function (e) {
e.preventDefault();
Expand Down