and back in sync again

[squirrelmail.git] / src / login.php

diff --git a/src/login.php b/src/login.php
index fb004cacb48996f3472a0488a8e286adcb9d5d76..4c4c41c3f0fa3c3115ba34c69f3f97cdc997fea1 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -94,19 +94,12 @@ if (isset($org_logo) && $org_logo) {
         $width_and_height .= " height=\"$org_logo_height\"";
     }
 }
-global $shootMyFootOff;
-if (check_php_version(4,3) and !isset($shootMyFootOff)) {
-    echo '<center><hr width="75%">' . "\n";
-    echo '<h2>PHP 4.3.x has been detected</h2>' . "\n";
-    echo '</center><p>The SquirrelMail team does not recommend the use of PHP 4.3.x with';
-    echo ' this software.  Please see the <a href="http://www.squirrelmail.org">SquirrelMail';
-    echo ' website</a>, or the documentation that came with SquirrelMail for more information.</p>';
-    echo '<p>This warning can be disabled by either downgrading PHP, or inserting';
-    echo '"$shootMyFootOff = true;" in config/config_local.php.</p>' . "\n";
-    echo '<center><hr width="75%"></center>' . "\n";
-    echo "\n";
-}
 
+if(sqgetGlobalVar('mailto', $mailto)) {
+    $rcptaddress = '<input type="hidden" name="mailto" value="' . urlencode($mailto) . '" />' . "\n";
+} else {
+    $rcptaddress = '';
+}
 echo html_tag( 'table',
     html_tag( 'tr',
         html_tag( 'td',
@@ -116,7 +109,7 @@ echo html_tag( 'table',
                 sprintf(_("%s Logo"), $org_name) .'"' . $width_and_height .
                 ' /><br />' . "\n"
               : '' ).
-            ( $hide_sm_attributions ? '' :
+            ( (isset($hide_sm_attributions) && $hide_sm_attributions) ? '' :
             '<small>' . sprintf (_("SquirrelMail version %s"), $version) . '<br />' ."\n".
             '  ' . _("By the SquirrelMail Development Team") . '<br /></small>' . "\n" ) .
             html_tag( 'table',
@@ -143,6 +136,7 @@ echo html_tag( 'table',
                                 html_tag( 'td',
                                     '<input type="password" name="' . $password_form_name . '" />' . "\n" .
                                     '<input type="hidden" name="js_autodetect_results" value="SMPREF_JS_OFF" />' . "\n" .
+                                    $rcptaddress .
                                     '<input type="hidden" name="just_logged_in" value="1" />' . "\n",
                                 'left', '', 'width="*"' )
                             ) ,