Move configtest.php script to src/, because it will be called directly

by the browser. Unfortunately, CVS doesn't support moving files (unlike
Subversion).

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

diff --git a/ChangeLog b/ChangeLog
index e412f709f00fa27a1549fa5deeb752848a7f8851..70734e4b0c3acf4f16031c6cd382526a82188ad3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@ Version 1.5.1 -- CVS
   - Fix that subfolders named "foo.inbox" didn't always work well.
   - sqimap_create_stream() was not obeying passed params properly.  Fixed.
   - Fix non selectable inbox.
   - Fix that subfolders named "foo.inbox" didn't always work well.
   - sqimap_create_stream() was not obeying passed params properly.  Fixed.
   - Fix non selectable inbox.

+  - Add src/configtest.php script which checks for common errors in the config.
+  

 
 Version 1.5.0
 --------------------
 
 Version 1.5.0
 --------------------

diff --git a/INSTALL b/INSTALL
index 71e4001410018b625c042e78c13e223d5d957edc..2f8c7081bd160bca350f44d5e087d27f5c131a65 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -180,7 +180,7 @@ c. Setting up SquirrelMail
   and edit that manually.
 
   After you've created a configuration, you can use your webbrowser to
   and edit that manually.
 
   After you've created a configuration, you can use your webbrowser to

-  browse to http://your-squirrelmail-location/config/configtest.php.
+  browse to http://your-squirrelmail-location/src/configtest.php.

   This will perform some basic checks on your config to make sure
   everything works like it should.
 
   This will perform some basic checks on your config to make sure
   everything works like it should.
 

diff --git a/config/conf.pl b/config/conf.pl
index 54853b92123acd0e18eae3e0d5ed520ed21f9bca..6fde9147fa26cfc9dabfaad05aae388bc44bceae 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -837,7 +837,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
 # we exit here
 print "\nExiting conf.pl.\n".
        "You might want to test your configuration by browsing to\n".
 # we exit here
 print "\nExiting conf.pl.\n".
        "You might want to test your configuration by browsing to\n".

-       "http://your-squirrelmail-location/config/configtest.php\n".
+       "http://your-squirrelmail-location/src/configtest.php\n".

        "Happy SquirrelMailing!\n\n";
 
 
        "Happy SquirrelMailing!\n\n";
 
 

diff --git a/config/configtest.php b/src/configtest.php
similarity index 99%
rename from config/configtest.php
rename to src/configtest.php
index 2bf7582bdc60c93af61ba952c3de224f2705b65a..b3f6324e1b99c2ee64c694268dbe96554f521c5a 100644 (file)
--- a/config/configtest.php
+++ b/src/configtest.php
@@ -239,7 +239,7 @@ echo $IND . 'IMAP server OK (<tt><small>'.trim($imapline)."</small></tt>)<br />\
 
 <p>Congratulations, your SquirrelMail setup looks fine to me!</p>
 
 
 <p>Congratulations, your SquirrelMail setup looks fine to me!</p>
 

-<p><a href="<?php echo SM_PATH; ?>src/login.php">Login now</a></p>
+<p><a href="login.php">Login now</a></p>

 
 </body>
 </html>
 
 </body>
 </html>