diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-07 06:29:56 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-07 06:29:56 -0700 |
| commit | b48dffa9a302881e8d1effe9d03bc97e96adc23b (patch) | |
| tree | a9bcc7299561960b637afc716f445093688cf3a4 /core | |
| parent | 0d492afee1ed6a6c032451181c20fd0b90f3105e (diff) | |
| parent | 47ed6a5135dd1c6bc01169f430ebb243e29f2694 (diff) | |
| download | nextcloud-server-b48dffa9a302881e8d1effe9d03bc97e96adc23b.tar.gz nextcloud-server-b48dffa9a302881e8d1effe9d03bc97e96adc23b.zip | |
Merge pull request #5072 from owncloud/apache-auth-master
OC6 Apache Authentication
Diffstat (limited to 'core')
| -rw-r--r-- | core/templates/layout.user.php | 2 | ||||
| -rw-r--r-- | core/templates/login.php | 6 |
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' : ''); ?> |