* Clean up the wording of the "couldn't find Turck, eAccelerator or APC" message...

* Spacing here and there

diff --git a/config/index.php b/config/index.php
index fef48ef..0798001 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -405,18 +405,18 @@ if ( $conf->eaccel ) {
     $conf->turck = 'eaccelerator';
     print "<li><a href=\"http://eaccelerator.sourceforge.net/\">eAccelerator</a> installed</li>\n";
 }
-if (!$conf->turck && !$conf->eaccel && !$conf->apc) {
-       print "<li>Neither <a href=\"http://turck-mmcache.sourceforge.net/\">Turck MMCache</a> nor ".
-               "<a href=\"http://eaccelerator.sourceforge.net/\">eAccelerator</a> nor ".
-               "<a href=\"http://www.php.net/apc\">APC</a> are installed, " .
-               "can't use object caching functions</li>\n";
+
+if( !$conf->turck && !$conf->eaccel && !$conf->apc ) {
+       echo( '<li>Couldn\'t find <a href="http://turck-mmcache.sourceforge.net">Turck MMCache</a>,
+                 <a href="http://eaccelerator.sourceforge.net">eAccelerator</a> or
+                  <a href="http://www.php.net/apc">APC</a>. Object caching functions cannot be used.</li>' );
 }
 
 $conf->diff3 = false;
-$diff3locations = array("/usr/bin", "/usr/local/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin") + explode($sep, getenv("PATH"));
-$diff3names = array("gdiff3", "diff3", "diff3.exe");
+$diff3locations = array( "/usr/bin", "/usr/local/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin" ) + explode( $sep, getenv( "PATH" ) );
+$diff3names = array( "gdiff3", "diff3", "diff3.exe" );
 
-$diff3versioninfo = array('$1 --version 2>&1', 'diff3 (GNU diffutils)');
+$diff3versioninfo = array( '$1 --version 2>&1', 'diff3 (GNU diffutils)' );
 foreach ($diff3locations as $loc) {
        $exe = locate_executable($loc, $diff3names, $diff3versioninfo);
        if ($exe !== false) {