From db962a6055db4fcfc25aa35689cbade25fbc564f Mon Sep 17 00:00:00 2001 From: pdontthink Date: Wed, 7 May 2008 17:04:03 +0000 Subject: [PATCH] Move some HTML out of core (src/login.php) git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13107 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- plugins/demo/setup.php | 4 ---- src/login.php | 7 ------- templates/default/login.tpl | 5 ++++- templates/default_advanced/login.tpl | 5 ++++- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/plugins/demo/setup.php b/plugins/demo/setup.php index 14db1594..5c99b1b7 100644 --- a/plugins/demo/setup.php +++ b/plugins/demo/setup.php @@ -28,10 +28,6 @@ function squirrelmail_plugin_init_demo() $squirrelmail_plugin_hooks['login_cookie']['demo'] = 'demo_login_cookie'; -//FIXME: not all of the above hooks are yet implemented below - $squirrelmail_plugin_hooks['login_top']['demo'] - = 'demo_login_top'; - //FIXME: not all of the above hooks are yet implemented below $squirrelmail_plugin_hooks['login_bottom']['demo'] = 'demo_login_bottom'; diff --git a/src/login.php b/src/login.php index ef769f85..8665b2ee 100644 --- a/src/login.php +++ b/src/login.php @@ -153,15 +153,8 @@ $oTemplate->assign('org_logo_str', sprintf (_("The %s logo"), $org_name)); $oTemplate->assign('login_field_value', $loginname_value); $oTemplate->assign('login_extra', $login_extra, FALSE); -//FIXME: need to remove *ALL* HTML from this file! -echo ''."\n"; -echo '\n"; do_hook('login_bottom', $null); // Turn off delayed error handling to make sure all errors are dumped. diff --git a/templates/default/login.tpl b/templates/default/login.tpl index 3b390159..15a2584c 100644 --- a/templates/default/login.tpl +++ b/templates/default/login.tpl @@ -28,7 +28,9 @@ /* retrieve the template vars */ extract($t); -?> +?> + diff --git a/templates/default_advanced/login.tpl b/templates/default_advanced/login.tpl index b89fe042..1ab48558 100644 --- a/templates/default_advanced/login.tpl +++ b/templates/default_advanced/login.tpl @@ -30,7 +30,9 @@ /* retrieve the template vars */ extract($t); -?> +?> + -- 2.25.1