From c53099a24f178707acdbeac627a4e7a80569e519 Mon Sep 17 00:00:00 2001 From: pdontthink Date: Thu, 21 Sep 2006 15:19:44 +0000 Subject: [PATCH] Removing login_form hook, plugins can now use template_construct hook and add an array index called login_form to the return value for that hook git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11730 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/login.php | 2 -- templates/default/login.tpl | 5 +++-- templates/default_advanced/login.tpl | 5 +++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/login.php b/src/login.php index 1a348617..50efeb3f 100644 --- 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 ''."\n"; echo '

'."\n"; diff --git a/templates/default/login.tpl b/templates/default/login.tpl index abe9c58e..421b1d69 100644 --- 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 © 1999-2006 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License @@ -58,7 +59,7 @@ extract($t); - + " /> diff --git a/templates/default_advanced/login.tpl b/templates/default_advanced/login.tpl index cf3441cc..d7f966a3 100644 --- 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 © 1999-2006 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License @@ -71,7 +72,7 @@ extract($t); - + " alt="" /> -- 2.25.1