diff options
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/loginflow/authpicker.php | 4 | ||||
| -rw-r--r-- | core/templates/loginflow/redirect.php | 2 | ||||
| -rw-r--r-- | core/templates/update.use-cli.php | 9 |
3 files changed, 14 insertions, 1 deletions
diff --git a/core/templates/loginflow/authpicker.php b/core/templates/loginflow/authpicker.php index c5eb6cb316d..c427d657e4a 100644 --- a/core/templates/loginflow/authpicker.php +++ b/core/templates/loginflow/authpicker.php @@ -35,7 +35,7 @@ $urlGenerator = $_['urlGenerator']; <br/> <p id="redirect-link"> - <a href="<?php p($urlGenerator->linkToRouteAbsolute('core.ClientFlowLogin.redirectPage', ['stateToken' => $_['stateToken']])) ?>"> + <a href="<?php p($urlGenerator->linkToRouteAbsolute('core.ClientFlowLogin.redirectPage', ['stateToken' => $_['stateToken'], 'clientIdentifier' => $_['clientIdentifier'], 'oauthState' => $_['oauthState']])) ?>"> <input type="submit" class="login primary icon-confirm-white" value="<?php p('Grant access') ?>"> </a> </p> @@ -54,4 +54,6 @@ $urlGenerator = $_['urlGenerator']; </fieldset> </div> +<?php if(empty($_['oauthState'])): ?> <a id="app-token-login" class="warning" href="#"><?php p($l->t('Alternative login using app token')) ?></a> +<?php endif; ?> diff --git a/core/templates/loginflow/redirect.php b/core/templates/loginflow/redirect.php index 7ef0184f61f..1c6e105b88d 100644 --- a/core/templates/loginflow/redirect.php +++ b/core/templates/loginflow/redirect.php @@ -31,7 +31,9 @@ $urlGenerator = $_['urlGenerator']; </div> <form method="POST" action="<?php p($urlGenerator->linkToRouteAbsolute('core.ClientFlowLogin.generateAppPassword')) ?>"> + <input type="hidden" name="clientIdentifier" value="<?php p($_['clientIdentifier']) ?>" /> <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" /> <input type="hidden" name="stateToken" value="<?php p($_['stateToken']) ?>" /> + <input type="hidden" name="oauthState" value="<?php p($_['oauthState']) ?>" /> <input id="submit-redirect-form" type="submit" class="hidden "/> </form> diff --git a/core/templates/update.use-cli.php b/core/templates/update.use-cli.php index 9fbdbca8b21..d30e15c8573 100644 --- a/core/templates/update.use-cli.php +++ b/core/templates/update.use-cli.php @@ -11,4 +11,13 @@ print_unescaped($l->t('For help, see the <a target="_blank" rel="noreferrer" href="%s">documentation</a>.', [link_to_docs('admin-cli-upgrade')])); ?><br><br> </div> </div> + + <?php if ($_['tooBig']) { ?> + <div class="warning updateAnyways"> + <?php p($l->t('I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure.' )); ?> + <a href="?IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup=IAmSuperSureToDoThis" class="button updateAnywaysButton"><?php p($l->t('Upgrade via web on my own risk' )); ?></a> + </div> + <?php } ?> + + </div> |