Synch advanced template with SM attribute string changes

[squirrelmail.git] / templates / default_advanced / login.tpl

diff --git a/templates/default_advanced/login.tpl b/templates/default_advanced/login.tpl
index 90e7bdc6495b6968a605683b59f02fcbb8ed0657..c662c0bf167df66b5731fb246712706659974fa5 100644 (file)
--- a/templates/default_advanced/login.tpl
+++ b/templates/default_advanced/login.tpl
@@ -12,9 +12,12 @@
  *                            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 © 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
@@ -22,8 +25,6 @@
  * @subpackage templates
  */
 
-// add includes
-require(SM_PATH . 'templates/util_global.php');
 
 /* retrieve the template vars */
 extract($t);
@@ -33,7 +34,7 @@ extract($t);
 <table cellspacing="0">
  <tr>
   <td colspan="2">
-   <?php echo getIcon($icon_theme_path, 'login1.png', _("Login"), _("Login")); ?>
+   <?php echo getIcon($icon_theme_path, 'login1.png', ''); ?>
   </td>
  </tr>
  <tr>
@@ -43,7 +44,7 @@ extract($t);
  </tr>
  <tr>
   <td class="attr" colspan="2">
-   <?php echo $sm_attribute_str; ?>
+   <?php echo nl2br($sm_attribute_str) . (empty($sm_attribute_str) ? '' : '<br /><br />'); ?>
   </td>
  </tr>
  <tr>
@@ -69,13 +70,14 @@ extract($t);
       <?php echo $login_extra; ?>
      </td>
     </tr>
+    <?php if (!empty($plugin_output['login_form'])) echo $plugin_output['login_form']; ?>
     <tr>
      <td class="loginSubmit" colspan="2">
-      <input type="image" src="<?php echo getIconPath($icon_theme_path, 'login_submit.png'); ?>" alt="<?php echo _("Login"); ?>" />
+      <input type="image" src="<?php echo getIconPath($icon_theme_path, 'login_submit.png', _("Login"), _("Login")); ?>" alt="<?php echo _("Login"); ?>" />
      </td>
     </tr>
    </table>
   </td>
  </tr>
 </table>
-</div>
\ No newline at end of file
+</div>