X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fconfigtest.php;h=adc1ae00721191ecac1757a5e06c7104b8833966;hp=b3f0307d82a31d8fa5e0f205643a31bba34da904;hb=91e0dccca7b2452d8b450791cae3aa4125e8889e;hpb=0f610dca6fd52a148e290f79cdfcfc572998b475
diff --git a/src/configtest.php b/src/configtest.php
index b3f0307d..adc1ae00 100644
--- a/src/configtest.php
+++ b/src/configtest.php
@@ -35,9 +35,9 @@ ob_implicit_flush();
define('SM_PATH', '../');
/*
- * Load config before output begins. functions/strings.php depends on
+ * Load config before output begins. functions/strings.php depends on
* functions/globals.php. functions/global.php needs to be run before
- * any html output starts. If config.php is missing, error will be displayed
+ * any html output starts. If config.php is missing, error will be displayed
* later.
*/
if (file_exists(SM_PATH . 'config/config.php')) {
@@ -76,7 +76,7 @@ if(!in_array('strings.php', $included)) {
echo "
\nSquirrelMail version: | " . $version . " |
\n" .
'Config file version: | ' . $config_version . " |
\n" .
- 'Config file last modified: | ' .
+ 'Config file last modified: | ' .
date ('d F Y H:i:s', filemtime(SM_PATH . 'config/config.php')) .
" | \n |
\n\n\n";
@@ -103,13 +103,13 @@ echo "Checking paths...
\n";
if(!file_exists($data_dir)) {
do_err("Data dir ($data_dir) does not exist!");
-}
+}
if(!is_dir($data_dir)) {
do_err("Data dir ($data_dir) is not a directory!");
-}
+}
if(!is_readable($data_dir)) {
do_err("I cannot read from data dir ($data_dir)!");
-}
+}
if(!is_writable($data_dir)) {
do_err("I cannot write to data dir ($data_dir)!");
}
@@ -123,10 +123,10 @@ if($data_dir == $attachment_dir) {
} else {
if(!file_exists($attachment_dir)) {
do_err("Attachment dir ($attachment_dir) does not exist!");
- }
+ }
if (!is_dir($attachment_dir)) {
do_err("Attachment dir ($attachment_dir) is not a directory!");
- }
+ }
if (!is_writable($attachment_dir)) {
do_err("I cannot write to attachment dir ($attachment_dir)!");
}
@@ -175,7 +175,7 @@ if($useSendmail) {
// is_executable also checks for existance, but we want to be as precise as possible with the errors
if(!file_exists($sendmail_path)) {
do_err("Location of sendmail program incorrect ($sendmail_path)!");
- }
+ }
if(!is_executable($sendmail_path)) {
do_err("I cannot execute the sendmail program ($sendmail_path)!");
}
@@ -313,9 +313,9 @@ if($addrbook_dsn || $prefs_dsn || $addrbook_global_dsn) {
if (class_exists('DB')) {
echo "$IND PHP Pear DB support is present.
\n";
$db_functions=array(
- 'dbase' => 'dbase_open',
- 'fbsql' => 'fbsql_connect',
- 'interbase' => 'ibase_connect',
+ 'dbase' => 'dbase_open',
+ 'fbsql' => 'fbsql_connect',
+ 'interbase' => 'ibase_connect',
'informix' => 'ifx_connect',
'msql' => 'msql_connect',
'mssql' => 'mssql_connect',
@@ -382,14 +382,14 @@ if( empty($ldap_server) ) {
if ( $linkid ) {
echo "$IND LDAP connect to ".$param['host']." successful: ".$linkid."
\n";
-
+
if ( !empty($param['protocol']) &&
!ldap_set_option($linkid, LDAP_OPT_PROTOCOL_VERSION, $param['protocol']) ) {
do_err('Unable to set LDAP protocol');
- }
+ }
if ( empty($param['binddn']) ) {
- $bind = ldap_bind($linkid);
+ $bind = ldap_bind($linkid);
} else {
$bind = ldap_bind($param['binddn'], $param['bindpw']);
}
@@ -399,7 +399,7 @@ if( empty($ldap_server) ) {
} else {
do_err('Unable to Bind to LDAP Server');
}
-
+
ldap_close($linkid);
} else {
do_err('Connection to LDAP failed');
@@ -417,4 +417,4 @@ if( empty($ldap_server) ) {