Remove warning message for 4.3.x; we believe the session issues have been

fixed. Leave the warning in ReleaseNotes because we don't have enough
testing experience with PHP 4.3.x to be sure about the stability.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4702 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 39e2caf4dc1de12209418377d463ce784121b809..d3d5691784ca6ced884d76572a2bbde20cfe771b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,8 +20,7 @@ Version 1.4.0 CVS
     by register_globals = off.
   - Added Greek locale. Thanks to George P. Kremmydas 
     <george at kefalonia-ithaki.gr> and Alexandros Vellis <avel at noc.uoa.gr>
-  - Added notes about PHP 4.3.x to documentation, and a gaudy warning message
-    in src/login.php.  Warning can be disabled.
+  - Added notes about PHP 4.3.x to documentation.
   - Fixed \Noselect mailbox detection.
   - Fixed charset decode of base64 encoded strings.
   - Fixed encoding of email addresses in our composed messages.

diff --git a/INSTALL b/INSTALL
index ad5b46aa782cb6b8b8fababd72c652bb31ea2653..41196e25f24253414340f2c16907116527e6884f 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -25,9 +25,8 @@ Table of Contents:
 
 a. Obtaining and compiling PHP4
   
-  SquirrelMail has not been tested for use with PHP 4.3.x.  The
-  development team does not recommend the use of this software with
-  PHP 4.3.x until further testing can be done.
+  SquirrelMail has not been extensively tested for use with PHP 4.3.x.
+  See the ReleaseNotes file.
 
   Point your favorite webserver at http://www.php.net/version4/ and
   download the source. Untar (tar xvfz filename-you-downloaded.tgz)

diff --git a/ReleaseNotes b/ReleaseNotes
index 09a230092088aa89cecf477429200b9ed3a8e266..a5e992257fa432826c0b4d650fdc5017cc94eb52 100644 (file)
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -38,16 +38,10 @@ A note on PHP 4.3.x
 
 While the developers realize that PHP 4.3.x is the "latest and greatest"
 version of PHP to be available, SquirrelMail has not been extensively
-tested with it.  There may be potential session issues with PHP 4.3.x,
-and PHP by default has a session warning which will need to be disabled
-if you wish to use it with SquirrelMail.
-
-Put simply: The SquirrelMail team does not recommend the use of
-PHP 4.3.x with SquirrelMail at this time.
-
-SquirrelMail will put a large ugly warning about the use of PHP 4.3.x on
-the login screen unless you add "$shootMyFootOff = true;" to 
-config/config_local.php, or downgrade PHP.
+tested with it. We currently believe that SquirrelMail should work on
+PHP 4.3.x but we lack the experience with this new version to be
+absolutely sure. If you want to be safe, or experience problems, you may
+want to downgrade to PHP 4.2.x.
 
 Major updates
 ==============

diff --git a/src/login.php b/src/login.php
index fb004cacb48996f3472a0488a8e286adcb9d5d76..684357e8d79950519d9387516d6993d03f94fd4f 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -94,18 +94,6 @@ 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";
-}
 
 echo html_tag( 'table',
     html_tag( 'tr',