19 vuotta sitten · 12b80beb84
--- a/src/login.php
+++ b/src/login.php
@@ -158,7 +158,6 @@ $password_field = addPwField('secretkey');
 
				 $login_extra = addHidden('js_autodetect_results', SMPREF_JS_OFF).
			
 
				                $rcptaddress .
			
 
				                addHidden('just_logged_in', '1');
			
 
				-$plugin_extra = concat_hook_function('login_form');
			
 
				 
			
 
				 session_write_close();
			
 
				 
			
@@ -168,7 +167,6 @@ $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";
			
--- a/templates/default/login.tpl
+++ b/templates/default/login.tpl
@@ -15,7 +15,8 @@
 
				  *      $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).
			
 
				+ *      $plugin_output      - An array of extra output 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
			
@@ -58,7 +59,7 @@ extract($t);
 
				    <?php echo $login_extra; ?>
			
 
				   </td>
			
 
				  </tr>
			
 
				- <?php echo $plugin_extra; ?>
			
 
				+ <?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"); ?>" />
			
--- a/templates/default_advanced/login.tpl
+++ b/templates/default_advanced/login.tpl
@@ -15,7 +15,8 @@
 
				  *      $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).
			
 
				+ *      $plugin_output      - An array of extra output 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
			
@@ -71,7 +72,7 @@ extract($t);
 
				       <?php echo $login_extra; ?>
			
 
				      </td>
			
 
				     </tr>
			
 
				-    <?php echo $plugin_extra; ?>
			
 
				+    <?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', _("Login"), _("Login")); ?>" alt="<?php echo _("Login"); ?>" />