From dc528046c09b177b3f7bdc55c3540c91383d7730 Mon Sep 17 00:00:00 2001 From: jervfors Date: Mon, 8 Oct 2007 21:25:02 +0000 Subject: [PATCH 1/1] Adding a "short_open_tag" configuration test. Minor changes in strings and white space to get the branches more in sync. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12730 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- ChangeLog | 1 + src/configtest.php | 29 ++++++++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02bdeedf..953cbfd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -222,6 +222,7 @@ Version 1.5.2 - SVN viewing details of attached messages. - Enabled user selection of address format when adding from address book during message composition. + - Added a "short_open_tag" configuration test. Version 1.5.1 (branched on 2006-02-12) -------------------------------------- diff --git a/src/configtest.php b/src/configtest.php index 10d7df2a..431904bc 100644 --- a/src/configtest.php +++ b/src/configtest.php @@ -205,7 +205,7 @@ if ($safe_mode) { echo $IND . 'safe_mode: ' . $safe_mode; if (empty($prefs_dsn) || empty($addrbook_dsn)) echo ' (double check data and attachment directory ownership, etc!)'; - if (!empty($addrbook_dsn) || !empty($prefs_dsn) || !empty($addrbook_global_dsn)) + if (!empty($addrbook_dsn) || !empty($prefs_dsn) || !empty($addrbook_global_dsn)) echo ' (does PHP have access to database interface?)'; echo "
\n"; $safe_mode_exec_dir = ini_get('safe_mode_exec_dir'); @@ -214,7 +214,7 @@ if ($safe_mode) { /* register_globals check: test for boolean false and any string that is not equal to 'off' */ -if ((bool) ini_get('register_globals') && +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); } @@ -223,7 +223,7 @@ if ((bool) ini_get('register_globals') && /* variables_order check */ // FIXME(?): Hmm, how do we distinguish between when an ini setting is -// not available (ini_set() returns empty string) and when +// 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 @@ -247,7 +247,7 @@ else if (strpos($variables_order, 'G') === FALSE 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 + // 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 @@ -307,6 +307,17 @@ if ( get_magic_quotes_runtime() || get_magic_quotes_gpc() || do_err($magic_quotes_warning,false); } +if (ini_get('short_open_tag') == 0) { + $short_open_tag_warning = 'You have configured PHP not to allow short tags ' + . '(short_open_tag=off). This shouldn\'t be a problem with ' + . 'SquirrelMail or any plugin coded coded according to the ' + . 'SquirrelMail Coding Guidelines, but if you experience problems with ' + . 'PHP code being displayed in some of the pages and changing setting ' + . 'to "on" solves the problem, please file a bug report against the ' + . 'failing plugin. The correct contact information is most likely ' + . 'to be found in the plugin documentation.'; + do_err($short_open_tag_warning, false); +} /* checking paths */ @@ -427,7 +438,7 @@ if (isset($plugins[0])) { $plugin_load_error = 'Some output is produced when plugins are loaded. Usually this means there is an error in one of the plugin setup or configuration files. The output was: '.htmlspecialchars($output); do_err($plugin_load_error); } - /** + /** * Print plugin versions */ echo $IND . "Plugin versions...
\n"; @@ -436,7 +447,7 @@ if (isset($plugins[0])) { $english_name = get_plugin_requirement($name, 'english_name'); echo $IND . $IND . (empty($english_name) ? $name . ' ' : $english_name . ' (' . $name . ') ') . (empty($plugin_version) ? '??' : $plugin_version) . "
\n"; - // check if this plugin has any other plugin + // check if this plugin has any other plugin // dependencies and if they are satisfied // $failed_dependencies = check_plugin_dependencies($name); @@ -453,7 +464,7 @@ if (isset($plugins[0])) { } /** - * This hook was added in 1.5.2 and 1.4.10. Each plugins should print an error + * This hook was added in 1.5.2 and 1.4.10. Each plugins should print an error * message and return TRUE if there are any errors in its setup/configuration. */ $plugin_err = boolean_hook_function('configtest', $null, 1); @@ -574,7 +585,7 @@ if($useSendmail) { break; } } else { - // + // $ehlo_error = true; $ehlo[]=$line; break; @@ -875,7 +886,7 @@ if($addrbook_dsn || $prefs_dsn || $addrbook_global_dsn) { } else { $db_error='Required PHP PEAR DB support is not available.' .' Is PEAR installed and is the include path set correctly to find DB.php?' - .' The include path is now:' . ini_get('include_path') . '.'; + .' The include path is now: "' . ini_get('include_path') . '".'; do_err($db_error); } } else { -- 2.25.1