X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fconfigtest.php;h=bcd2d2de9b0d8e50a39d23dfcbdd3a0621564f2e;hb=0f18c6120b81101579de08e16fd3dd378a015a07;hp=d0080d53f1796331586124e3a35c019c7bbe8222;hpb=a15f9d9379cebc62fa39b6cb10d2195f95ed5081;p=squirrelmail.git diff --git a/src/configtest.php b/src/configtest.php index d0080d53..bcd2d2de 100644 --- a/src/configtest.php +++ b/src/configtest.php @@ -46,7 +46,8 @@ if (file_exists(SM_PATH . 'config/config.php')) { include(SM_PATH . 'config/config.php'); include(SM_PATH . 'functions/strings.php'); } -?> +?> @@ -92,7 +93,10 @@ echo "

\n\n
SquirrelMail version:" . $version . "< date ('d F Y H:i:s', filemtime(SM_PATH . 'config/config.php')) . "
\n

\n\n"; -/* TODO: check $config_version here */ +/* check $config_version */ +if ($config_version!='1.4.0') { + do_err('Configuration file version does not match required version. Please update your configuration file.'); +} echo "Checking PHP configuration...
\n"; @@ -392,7 +396,7 @@ while ($line=fgets($stream, 1024)){ /* don't display capabilities before STARTTLS */ if ($use_imap_tls==2 && stristr($capline, 'STARTTLS') === false) { do_err('Your server doesn\'t support STARTTLS.'); -} else { +} elseif($use_imap_tls==2) { /* try starting starttls */ fwrite($stream,"A002 STARTTLS\r\n"); $starttls_line=fgets($stream, 1024);