Remove HTML from login src and add image template

[squirrelmail.git] / src / login.php

diff --git a/src/login.php b/src/login.php
index 4cb1f31e37ede846876f5e0caa9abda72a28d51f..40b0ffb9b229f8cde32f9054853cdf0987d1fe7b 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -35,19 +35,12 @@ set_up_language($squirrelmail_language, TRUE, TRUE);
  * In case the last session was not terminated properly, make sure
  * we get a new one, but make sure we preserve session_expired_*
  */
-/**
- * PHP bug. http://bugs.php.net/11643 (warning, spammed bug tracker) and
- * http://bugs.php.net/13834
- * SID constant is not destroyed in PHP 4.1.2, 4.2.3 and maybe other
- * versions. Produces warning on login page. Bug should be fixed only in 4.3.0
- */
 if ( !empty($_SESSION['session_expired_post']) && !empty($_SESSION['session_expired_location']) ) {
     $sep = $_SESSION['session_expired_post'];
     $sel = $_SESSION['session_expired_location'];
 
     sqsession_destroy();
-  
-    sqsession_is_active();
+    @sqsession_is_active();
     $_SESSION=array();
     sqsession_register($sep, 'session_expired_post');
     sqsession_register($sel, 'session_expired_location');
@@ -86,10 +79,11 @@ if($imap_auth_mech == 'login') {
     }
 }
 
-do_hook('login_cookie');
+do_hook('login_cookie', $null);
 
 $loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($loginname) : '');
 
+//FIXME: should be part of the template, not the core!
 /* Output the javascript onload function. */
 $header = "<script type=\"text/javascript\">\n" .
           "<!--\n".
@@ -129,24 +123,33 @@ sqsetcookieflush();
 displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE );
 
 
+//FIXME: need to remove *ALL* HTML from this file!
+
 /* If they don't have a logo, don't bother.. */
 $logo_str = '';
 if (isset($org_logo) && $org_logo) {
-    /* Display width and height like good little people */
-    $width_and_height = '';
+    
+    $oTemplate->assign('src', $org_logo);
+    $oTemplate->assign('alt', sprintf(_("%s Logo"), $org_name));
+    $oTemplate->assign('class', 'sqm_loginImage');
     if (isset($org_logo_width) && is_numeric($org_logo_width) &&
      $org_logo_width>0) {
-        $width_and_height = "width=\"$org_logo_width\" ";
+        $oTemplate->assign('width', $worg_logo_width);
+    } else {
+        $oTemplate->assign('width', '');
     }
     if (isset($org_logo_height) && is_numeric($org_logo_height) &&
      $org_logo_height>0) {
-        $width_and_height .= "height=\"$org_logo_height\" ";
+        $oTemplate->assign('height', $worg_logo_height);
+    } else {
+        $oTemplate->assign('height', '');
     }
-    
-    $logo_str = '<img src="'.$org_logo.'" ' .
-                'alt="'. sprintf(_("%s Logo"), $org_name).'" ' .
-                $width_and_height .
-                'class="sqm_loginImage" /><br />'."\n";
+    $oTemplate->assign('onclick', '');
+    $oTemplate->assign('align', '');
+    $oTemplate->assign('border', '');
+    $oTemplate->assign('hspace', '');
+    $oTemplate->assign('vspace', '');
+    $logo_str = $oTemplate->fetch('image.tpl');
 }
 
 $sm_attribute_str = '';
@@ -155,17 +158,16 @@ if (isset($hide_sm_attributions) && !$hide_sm_attributions) {
                         _("By the SquirrelMail Project Team")."<br />\n";
 }
 
-if(sqgetGlobalVar('mailto', $mailto)) {
-    $rcptaddress = addHidden('mailto', $mailto);
+if(sqgetGlobalVar('mailtodata', $mailtodata)) {
+    $mailtofield = addHidden('mailtodata', $mailtodata);
 } else {
-    $rcptaddress = '';
+    $mailtofield = '';
 }
 
 $password_field = addPwField('secretkey');
 $login_extra = addHidden('js_autodetect_results', SMPREF_JS_OFF).
-               $rcptaddress .
+               $mailtofield .
                addHidden('just_logged_in', '1');
-$plugin_extra = concat_hook_function('login_form');
 
 session_write_close();
 
@@ -175,16 +177,15 @@ $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 '<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');
+do_hook('login_top', $null);
 
 $oTemplate->display('login.tpl');
 
 echo "</form>\n";
-do_hook('login_bottom');
+do_hook('login_bottom', $null);
 
 // Turn off delayed error handling to make sure all errors are dumped.
 $oErrorHandler->setDelayedErrors(false);