Turning the FIXMEs into one-liners.

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

diff --git a/src/configtest.php b/src/configtest.php
index b2fbb75309347fbd8d02bb0f5e9d011ca0e0feef..99cfdb57edef0240722469824591a2de643a26df 100644 (file)
--- a/src/configtest.php
+++ b/src/configtest.php
@@ -216,28 +216,21 @@ if ($safe_mode) {
 
 if ((bool) ini_get('register_globals') &&
     strtolower(ini_get('register_globals'))!='off') {
 
 if ((bool) ini_get('register_globals') &&
     strtolower(ini_get('register_globals'))!='off') {

-    do_err('You have register_globals turned on.  This is not an error, but it CAN be a security hazard.  Consider turning register_globals off.', false);
+    do_err('You have register_globals turned on. This is not an error, but it CAN be a security hazard. Consider turning register_globals off.', false);

 }
 
 
 /* variables_order check */
 
 }
 
 
 /* variables_order check */
 

-// FIXME(?): Hmm, how do we distinguish between when an ini setting is
-//           not available (ini_set() returns empty string) and when
-//           the administrator set the value to an empty string?  The
-//           latter is sure to be highly rare, so for now, just assume
-//           that empty value means the setting isn't even available
-//           (could also check PHP version when this setting was implemented)
-//           although, we'll also warn the user if it is empty, with
-//           a non-fatal error
+// FIXME(?): Hmm, how do we distinguish between when an ini setting is not available (ini_set() returns empty string) and when the administrator set the value to an empty string? The latter is sure to be highly rare, so for now, just assume that empty value means the setting isn't even available (could also check PHP version when this setting was implemented) although, we'll also warn the user if it is empty, with a non-fatal error

 $variables_order = strtoupper(ini_get('variables_order'));
 if (empty($variables_order))
 $variables_order = strtoupper(ini_get('variables_order'));
 if (empty($variables_order))

-    do_err('Your variables_order setting seems to be empty.  Make sure it is undefined in any PHP ini files, .htaccess files, etc. and not specifically set to an empty value or SquirrelMail may not function correctly', false);
+    do_err('Your variables_order setting seems to be empty. Make sure it is undefined in any PHP ini files, .htaccess files, etc. and not specifically set to an empty value or SquirrelMail may not function correctly', false);

 else if (strpos($variables_order, 'G') === FALSE
  || strpos($variables_order, 'P') === FALSE
  || strpos($variables_order, 'C') === FALSE
  || strpos($variables_order, 'S') === FALSE) {
 else if (strpos($variables_order, 'G') === FALSE
  || strpos($variables_order, 'P') === FALSE
  || strpos($variables_order, 'C') === FALSE
  || strpos($variables_order, 'S') === FALSE) {

-    do_err('Your variables_order setting is insufficient for SquirrelMail to function.  It needs at least "GPCS", but you have it set to "' . htmlspecialchars($variables_order) . '"', true);
+    do_err('Your variables_order setting is insufficient for SquirrelMail to function. It needs at least "GPCS", but you have it set to "' . htmlspecialchars($variables_order) . '"', true);

 } else {
     echo $IND . "variables_order OK: $variables_order.<br />\n";
 }
 } else {
     echo $IND . "variables_order OK: $variables_order.<br />\n";
 }


@@ -246,21 +239,14 @@ else if (strpos($variables_order, 'G') === FALSE
 /* gpc_order check (removed from PHP as of v5.0) */
 
 if (!check_php_version(5)) {
 /* gpc_order check (removed from PHP as of v5.0) */
 
 if (!check_php_version(5)) {

-    // FIXME(?): Hmm, how do we distinguish between when an ini setting is
-    //           not available (ini_set() returns empty string) and when
-    //           the administrator set the value to an empty string?  The
-    //           latter is sure to be highly rare, so for now, just assume
-    //           that empty value means the setting isn't even available
-    //           (could also check PHP version when this setting was implemented)
-    //           although, we'll also warn the user if it is empty, with
-    //           a non-fatal error
+    // FIXME(?): Hmm, how do we distinguish between when an ini setting is not available (ini_set() returns empty string) and when the administrator set the value to an empty string? The latter is sure to be highly rare, so for now, just assume that empty value means the setting isn't even available (could also check PHP version when this setting was implemented) although, we'll also warn the user if it is empty, with a non-fatal error

     $gpc_order = strtoupper(ini_get('gpc_order'));
     if (empty($gpc_order))
     $gpc_order = strtoupper(ini_get('gpc_order'));
     if (empty($gpc_order))

-        do_err('Your gpc_order setting seems to be empty.  Make sure it is undefined in any PHP ini files, .htaccess files, etc. and not specifically set to an empty value or SquirrelMail may not function correctly', false);
+        do_err('Your gpc_order setting seems to be empty. Make sure it is undefined in any PHP ini files, .htaccess files, etc. and not specifically set to an empty value or SquirrelMail may not function correctly', false);

     else if (strpos($gpc_order, 'G') === FALSE
      || strpos($gpc_order, 'P') === FALSE
      || strpos($gpc_order, 'C') === FALSE) {
     else if (strpos($gpc_order, 'G') === FALSE
      || strpos($gpc_order, 'P') === FALSE
      || strpos($gpc_order, 'C') === FALSE) {

-        do_err('Your gpc_order setting is insufficient for SquirrelMail to function.  It needs to be set to "GPC", but you have it set to "' . htmlspecialchars($gpc_order) . '"', true);
+        do_err('Your gpc_order setting is insufficient for SquirrelMail to function. It needs to be set to "GPC", but you have it set to "' . htmlspecialchars($gpc_order) . '"', true);

     } else {
         echo $IND . "gpc_order OK: $gpc_order.<br />\n";
     }
     } else {
         echo $IND . "gpc_order OK: $gpc_order.<br />\n";
     }


@@ -952,7 +938,7 @@ echo '<hr width="75%" align="center">';
 echo '<h2 align="center">Summary</h2>';
 $footer = '<hr width="75%" align="center">';
 if ($warnings) {
 echo '<h2 align="center">Summary</h2>';
 $footer = '<hr width="75%" align="center">';
 if ($warnings) {

-    echo '<p>No fatal errors were found, but there was at least 1 warning.  Please check the flagged issue(s) carefully, as correcting them may prevent erratic, undefined, or incorrect behavior (or flat out breakage).</p>';
+    echo '<p>No fatal errors were found, but there was at least 1 warning. Please check the flagged issue(s) carefully, as correcting them may prevent erratic, undefined, or incorrect behavior (or flat out breakage).</p>';

     echo $footer;
 } else {
     print <<< EOF
     echo $footer;
 } else {
     print <<< EOF