summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/templates/layout.user.php2
-rw-r--r--core/templates/login.php6
2 files changed, 7 insertions, 1 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 71bec11d219..fcca43624fe 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -64,7 +64,7 @@
</li>
<?php endforeach; ?>
<li>
- <a id="logout" href="<?php print_unescaped(link_to('', 'index.php')); ?>?logout=true">
+ <a id="logout" <?php print_unescaped(OC_User::getLogoutAttribute()); ?>>
<img class="svg" alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg')); ?>" />
<?php p($l->t('Log out'));?>
</a>
diff --git a/core/templates/login.php b/core/templates/login.php
index 06f64d41e39..aca42c84387 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -12,6 +12,12 @@
<small><?php p($l->t('Please change your password to secure your account again.')); ?></small>
</div>
<?php endif; ?>
+ <?php if (isset($_['apacheauthfailed']) && ($_['apacheauthfailed'])): ?>
+ <div class="warning">
+ <?php p($l->t('Server side authentication failed!')); ?><br>
+ <small><?php p($l->t('Please contact your administrator.')); ?></small>
+ </div>
+ <?php endif; ?>
<p class="infield grouptop">
<input type="text" name="user" id="user" placeholder=""
value="<?php p($_['username']); ?>"<?php p($_['user_autofocus'] ? ' autofocus' : ''); ?>