place login form elements before login button. #1245070.

I think change was approved by Paul in plugins mailing list. If you think
that I am breaking too many things, I can revert the change.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9979 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index e8ddf48e5757f3c0bd9611d31cfb90b440680566..fa27d3384367ff676255cf9fb8f2d249e2f4def5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -431,6 +431,8 @@ Version 1.5.1 -- CVS
     able to convert html formated mails to different character set. Initial
     patch by Peter Draganov (#1195232). Fixed display of html formated emails
     in formatBody() function (#1258925).
+  - login_form hook changed from do_hook to concat_hook_function in order to
+    place form elements before login button (#1245070).
 
 Version 1.5.0 - 2 February 2004
 -------------------------------

diff --git a/doc/Development/plugin.txt b/doc/Development/plugin.txt
index 64ca8f0a40af6d3f7f6a8e333dadd7510731b5af..c2dcb2f4df65ae6e47a8f01a2ee210155f6f381f 100644 (file)
--- a/doc/Development/plugin.txt
+++ b/doc/Development/plugin.txt
@@ -314,7 +314,8 @@ but may be out of date soon thereafter.  You never know.  ;-)
   left_main_after                src/left_main.php               do_hook
   login_cookie                   src/login.php                   do_hook
   login_top                      src/login.php                   do_hook
-  login_form                     src/login.php                   do_hook
+  login_form                     src/login.php                   concat_hook
+    (was do_hook before 1.5.1)
   login_bottom                   src/login.php                   do_hook
 * optpage_set_loadinfo           src/options.php                 do_hook
 * optpage_loadhook_personal      src/options.php                 do_hook

diff --git a/src/login.php b/src/login.php
index 4e83354c10abe302f93c41cbbbf64957f7374ede..88b43680bd0a04fe907185a92495ff2fccc650c7 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -185,7 +185,8 @@ echo html_tag( 'table',
                                     $rcptaddress .
                                     addHidden('just_logged_in', '1'),
                                     'left', '', 'width="*"' )
-                                ) ,
+                                ) .
+                                concat_hook_function('login_form') ,
                             'center', $color[4], 'border="0" width="100%"' ) ,
                         'left', $color[4] )
                         ) .
@@ -198,7 +199,6 @@ echo html_tag( 'table',
                         'center' )
                         ) ,
                         '', $color[4], 'border="0" cellspacing="0" cellpadding="0" width="100%"' );
-do_hook('login_form');
 echo '</form>' . "\n";
 
 do_hook('login_bottom');