From b13576fe6b22f4f5e3449e7e1d46ae95ed0a1454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Fri, 31 Oct 2008 22:53:00 +0000
Subject: [PATCH] login-admin module now do not ask for username.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@963 44740490-163a-0410-bde0-09ae8108e29a
---
templates/default/login.php | 29 +++++++++++++++++++++++------
www/auth/login-admin.php | 2 ++
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/templates/default/login.php b/templates/default/login.php
index 0d1608587..e317aa5ac 100644
--- a/templates/default/login.php
+++ b/templates/default/login.php
@@ -1,6 +1,8 @@
<?php
if (!array_key_exists('icon', $this->data)) $this->data['icon'] = 'lock.png';
- $this->data['autofocus'] = 'username';
+ if (!isset($this->data['autofocus'])) {
+ $this->data['autofocus'] = 'username';
+ }
$this->includeAtTemplateBase('includes/header.php');
?>
@@ -23,10 +25,25 @@
<tr>
<td rowspan="2"><img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/pencil.png" /></td>
<td style="padding: .3em;"><?php echo $this->t('username'); ?></td>
- <td><input type="text" id="username" tabindex="1" name="username"
- <?php if (isset($this->data['username'])) {
- echo 'value="' . htmlspecialchars($this->data['username']) . '"';
- } ?> /></td>
+
+
+ <td>
+ <?php
+
+ if (array_key_exists('admin', $this->data)) {
+ echo '<strong style="font-size: medium">Administrator</strong>';
+ } else {
+
+ echo '<input type="text" id="username" tabindex="1" name="username" ';
+ if (isset($this->data['username'])) {
+ echo 'value="' . htmlspecialchars($this->data['username']) . '"';
+ }
+ echo '/></td>';
+ }
+
+
+ ?>
+
<td style="padding: .4em;" rowspan="2">
<input type="submit" tabindex="3" value="<?php echo $this->t('login_button'); ?>" />
<input type="hidden" name="RelayState" value="<?php echo htmlspecialchars($this->data['relaystate']); ?>" />
@@ -34,7 +51,7 @@
</tr>
<tr>
<td style="padding: .3em;"><?php echo $this->t('password'); ?></td>
- <td><input type="password" tabindex="2" name="password" /></td>
+ <td><input id="password" type="password" tabindex="2" name="password" /></td>
</tr>
</table>
diff --git a/www/auth/login-admin.php b/www/auth/login-admin.php
index 307140809..2e9fc1eaa 100644
--- a/www/auth/login-admin.php
+++ b/www/auth/login-admin.php
@@ -83,6 +83,8 @@ $t = new SimpleSAML_XHTML_Template($config, 'login.php', 'login');
$t->data['header'] = 'simpleSAMLphp: Enter username and password';
$t->data['relaystate'] = $relaystate;
+$t->data['admin'] = TRUE;
+$t->data['autofocus'] = 'password';
$t->data['error'] = $error;
if (isset($error)) {
$t->data['username'] = $username;
--
GitLab