From 31633bef0e1ed61b1a040443f2a2a878a7d1bc13 Mon Sep 17 00:00:00 2001 From: pdontthink Date: Thu, 7 Sep 2006 09:40:04 +0000 Subject: [PATCH] Slight adjustment. Plugins create their own table row for login_form hook; core sets 'extra' variables separate from plugin data git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11681 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/login.php | 5 +++-- templates/default/login.tpl | 11 +++++------ templates/default_advanced/login.tpl | 11 +++++------ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/login.php b/src/login.php index a1228d4b..4cb1f31e 100644 --- a/src/login.php +++ b/src/login.php @@ -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 ''."\n"; echo '

'."\n"; diff --git a/templates/default/login.tpl b/templates/default/login.tpl index dabb185a..abe9c58e 100644 --- a/templates/default/login.tpl +++ b/templates/default/login.tpl @@ -12,8 +12,10 @@ * 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 © 1999-2006 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License @@ -53,13 +55,10 @@ extract($t); - - - - + " /> diff --git a/templates/default_advanced/login.tpl b/templates/default_advanced/login.tpl index 8776da85..5f2a0d85 100644 --- a/templates/default_advanced/login.tpl +++ b/templates/default_advanced/login.tpl @@ -12,8 +12,10 @@ * 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 © 1999-2006 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License @@ -66,13 +68,10 @@ extract($t); - - - - + " /> -- 2.25.1