Slight adjustment. Plugins create their own table row for login_form hook; core...
authorpdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 7 Sep 2006 09:40:04 +0000 (09:40 +0000)
committerpdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 7 Sep 2006 09:40:04 +0000 (09:40 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11681 7612ce4b-ef26-0410-bec9-ea0150e637f0

src/login.php
templates/default/login.tpl
templates/default_advanced/login.tpl

index a1228d4..4cb1f31 100644 (file)
@@ -164,8 +164,8 @@ if(sqgetGlobalVar('mailto', $mailto)) {
 $password_field = addPwField('secretkey');
 $login_extra = addHidden('js_autodetect_results', SMPREF_JS_OFF).
                $rcptaddress .
-               addHidden('just_logged_in', '1') .
-               concat_hook_function('login_form');
+               addHidden('just_logged_in', '1');
+$plugin_extra = concat_hook_function('login_form');
 
 session_write_close();
 
@@ -175,6 +175,7 @@ $oTemplate->assign('sm_attribute_str', $sm_attribute_str);
 $oTemplate->assign('org_name_str', sprintf (_("%s Login"), $org_name));
 $oTemplate->assign('login_field_value', $loginname_value);
 $oTemplate->assign('login_extra', $login_extra);
+$oTemplate->assign('plugin_extra', $plugin_extra);
 
 echo '<body onLoad="squirrelmail_loginpage_onload()">'."\n";
 echo '<form action="redirect.php" method="post" onSubmit="document.forms[0].js_autodetect_results.value='. SMPREF_JS_ON .'">'."\n";
index dabb185..abe9c58 100644 (file)
  *                            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_extra       - Extra table row(s) that may be added by plugin(s).
  * 
  * @copyright &copy; 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
@@ -53,13 +55,10 @@ extract($t);
   </td>
   <td class="sqm_loginFieldInput">
    <input type="password" name="secretkey" value="" id="secretkey" />
-  </td>
- </tr>
- <tr>
-  <td colspan="2">
    <?php echo $login_extra; ?>
   </td>
  </tr>
+ <?php echo $plugin_extra; ?>
  <tr>
   <td class="sqm_loginSubmit" colspan="2">
    <input type="submit" value="<?php echo _("Login"); ?>" />
index 8776da8..5f2a0d8 100644 (file)
  *                            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_extra       - Extra table row(s) that may be added by plugin(s).
  * 
  * @copyright &copy; 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
@@ -66,13 +68,10 @@ 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 echo $plugin_extra; ?>
     <tr>
      <td class="loginSubmit" colspan="2">
       <input type="image" src="<?php echo getIconPath($icon_theme_path, 'login_submit.png'); ?>" alt="<?php echo _("Login"); ?>" />