Happy New Year

[squirrelmail.git] / templates / default / login.tpl
diff --git a/templates/default/login.tpl b/templates/default/login.tpl

index dabb185a03ecb4247d9ee4ae329adc3c4a7c208b..78a153adc97d32a315d9899337a48cb17ceb7940 100644 (file)
--- a/templates/default/login.tpl
+++ b/templates/default/login.tpl
@@ -12,10 +12,13 @@
   *                            this has been disabled by the admin.
   *      $org_name_str       - translated string containing orginization's name
   *      $login_field_value  - default value for the user name field
- *      $login_extra        - Some extra fields needed by SquirrelMail for the 
- *                            login.  YOU SHOULD ALWAYS INCLUDE THIS FIELD!!
+ *      $login_extra        - Some extra form fields needed by SquirrelMail
+ *                            for the login.  Template designers SHOULD ALWAYS
+ *                            INCLUDE this value somewhere in the form.
+ *      $plugin_output      - An array of extra output that may be added by 
+ *                            plugin(s).
   * 
- * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2020 The SquirrelMail Project Team
   * @license http://opensource.org/licenses/gpl-license.php GNU Public License
   * @version $Id$
   * @package squirrelmail
@@ -25,13 +28,17 @@
  /* retrieve the template vars */
  extract($t);
  
-?>
+?><body onload="squirrelmail_loginpage_onload()">
+<form name="login_form" id="login_form" action="redirect.php" method="post" onsubmit="document.login_form.js_autodetect_results.value=1">
+<?php if (!empty($plugin_output['login_top'])) echo $plugin_output['login_top']; ?>
  <div id="sqm_login">
  <table cellspacing="0">
   <tr>
    <td class="sqm_loginTop" colspan="2">
-   <?php echo $logo_str; ?>
-   <?php echo $sm_attribute_str; ?>
+   <?php 
+       echo $logo_str; if (!empty($logo_str)) echo '<br />'; 
+       echo nl2br($sm_attribute_str) . (empty($sm_attribute_str) ? '' : '<br /><br />'); 
+   ?>
    </td>
   </tr>
   <tr>
@@ -40,26 +47,23 @@ extract($t);
    </td>
   </tr>
   <tr>
-  <td class="sqm_loginFieldName">
+  <td class="sqm_loginFieldName"><label for="login_username">
     <?php echo _("Name:"); ?>
-  </td>
+  </label></td>
    <td class="sqm_loginFieldInput">
-   <input type="text" name="login_username" value="<?php echo $login_field_value; ?>" id="login_username" />
+   <input type="text" name="<?php global $username_form_name; echo $username_form_name; ?>" value="<?php echo $login_field_value; ?>" id="login_username" onfocus="alreadyFocused=true;" <?php global $username_form_extra; echo $username_form_extra; ?> />
    </td>
   </tr>
   <tr>
-  <td class="sqm_loginFieldName">
+  <td class="sqm_loginFieldName"><label for="secretkey">
     <?php echo _("Password:"); ?>
-  </td>
+  </label></td>
    <td class="sqm_loginFieldInput">
-   <input type="password" name="secretkey" value="" id="secretkey" />
-  </td>
- </tr>
- <tr>
-  <td colspan="2">
+   <input type="password" name="<?php global $password_form_name; echo $password_form_name; ?>" value="" id="secretkey" onfocus="alreadyFocused=true;" <?php global $password_form_extra; echo $password_form_extra; ?> />
     <?php echo $login_extra; ?>
    </td>
   </tr>
+ <?php if (!empty($plugin_output['login_form'])) echo $plugin_output['login_form']; ?>
   <tr>
    <td class="sqm_loginSubmit" colspan="2">
     <input type="submit" value="<?php echo _("Login"); ?>" />
@@ -67,3 +71,4 @@ extract($t);
   </tr>
  </table>
  </div>
+</form>