X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2Fdefault_advanced%2Flogin.tpl;h=d7f966a3d27feee61af1ade9d479e3c1087ca024;hb=c53099a24f178707acdbeac627a4e7a80569e519;hp=8776da85f44598bbe8f19b28a526e5e9d5456593;hpb=3410acccdc38631ac52415deb00f71da549b6380;p=squirrelmail.git

diff --git a/templates/default_advanced/login.tpl b/templates/default_advanced/login.tpl
index 8776da85..d7f966a3 100644
--- a/templates/default_advanced/login.tpl
+++ b/templates/default_advanced/login.tpl
@@ -12,8 +12,11 @@
  *                            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
@@ -33,7 +36,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>
@@ -66,16 +69,13 @@ extract($t);
      </td>
      <td class="fieldInput">
       <input type="password" name="secretkey" value="" id="secretkey" class="input" />
-     </td>
-    </tr>
-    <tr>
-     <td colspan="2">
       <?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>