-echo '<CENTER>'.
- " <IMG SRC=\"$org_logo\" ALT=\"" . sprintf(_("%s Logo"), $org_name) .
- "\"$width_and_height><BR>\n".
- ( $hide_sm_attributions ? '' :
- '<SMALL>' . sprintf (_("SquirrelMail version %s"), $version) . "<BR>\n".
- ' ' . _("By the SquirrelMail Development Team") . "<BR></SMALL>\n" ) .
- "</CENTER>\n".
-
- "<CENTER>\n".
- "<TABLE COLS=\"1\" WIDTH=\"350\">\n".
- " <TR><TD ALIGN=CENTER BGCOLOR=\"#DCDCDC\">\n".
- ' <B>' . sprintf (_("%s Login"), $org_name) . "</B>\n".
- " </TD></TR>".
- " <TR><TD BGCOLOR=\"#FFFFFF\"><TABLE COLS=2 WIDTH=\"100%\">\n".
- " <TR>\n".
- ' <TD WIDTH="30%" ALIGN=right>' . _("Name:") . "</TD>\n".
- " <TD WIDTH=\"*\" ALIGN=left>\n".
- " <INPUT TYPE=TEXT NAME=\"$username_form_name\" VALUE=\"$loginname_value\">\n".
- " </TD>\n".
- " </TR>\n".
- " <TR>\n".
- ' <TD WIDTH="30%" ALIGN=right>' . _("Password:") . "</TD>\n".
- " <TD WIDTH=\"*\" ALIGN=left>\n".
- " <INPUT TYPE=PASSWORD NAME=\"$password_form_name\">\n".
- " <INPUT TYPE=HIDDEN NAME=\"js_autodetect_results\" VALUE=\"" . SMPREF_JS_OFF . "\">\n".
- " <INPUT TYPE=HIDDEN NAME=\"just_logged_in\" value=1>\n".
- " </TD>\n".
- " </TR>\n".
- " </TABLE></TD></TR>\n".
- " <TR><TD>\n".
- ' <CENTER><INPUT TYPE=SUBMIT VALUE="' . _("Login") . "\"></CENTER>\n".
- " </TD></TR>\n".
- "</TABLE>\n".
- "</CENTER>\n";
-
-do_hook('login_form');
-echo "</FORM>\n";
-
-do_hook('login_bottom');
-echo "</BODY>\n".
- "</HTML>\n";
-?>
\ No newline at end of file
+$password_field = addPwField('secretkey');
+$login_extra = addHidden('js_autodetect_results', SMPREF_JS_OFF).
+ $mailtofield .
+ addHidden('just_logged_in', '1');
+
+session_write_close();
+
+$oTemplate->assign('logo_str', $logo_str);
+$oTemplate->assign('logo_path', $org_logo);
+$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);
+
+//FIXME: need to remove *ALL* HTML from this file!
+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";
+do_hook('login_top', $null);
+
+$oTemplate->display('login.tpl');
+
+//FIXME: need to remove *ALL* HTML from this file!
+echo "</form>\n";
+do_hook('login_bottom', $null);
+
+// Turn off delayed error handling to make sure all errors are dumped.
+$oErrorHandler->setDelayedErrors(false);
+
+$oTemplate->display('footer.tpl');
+?>