X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fadministrator%2Foptions.php;h=2baf4ed88f289fb1a99fcb35f4255860bbe2490f;hb=3656ccef5631a36c623368000b13d831541145ad;hp=ddbcf716585bab6df49aa7c32a46d17ba5d185de;hpb=c3d7aa6e6b1c8d87f5ab323197327dde565cebaf;p=squirrelmail.git

diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php
index ddbcf716..2baf4ed8 100644
--- a/plugins/administrator/options.php
+++ b/plugins/administrator/options.php
@@ -7,13 +7,15 @@
  * SquirrelMail configuration file.
  *
  * @author Philippe Mingo
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
  * @subpackage administrator
  */
 
+define('PAGE_NAME', 'administrator_options');
+
 /**
  * parse the config file
  *
@@ -170,6 +172,7 @@ function change_to_rel_path($old_path) {
  *     empty_string            --> ''
  *     ../images/logo.gif      --> SM_PATH . 'images/logo.gif'
  *     images/logo.gif         --> SM_PATH . 'config/images/logo.gif'
+ *     C:/absolute/win/path    --> 'C:/absolute/win/path'
  *     /absolute/path/logo.gif --> '/absolute/path/logo.gif'
  *     http://whatever/        --> 'http://whatever'
  *
@@ -180,7 +183,8 @@ function change_to_rel_path($old_path) {
 function change_to_sm_path($old_path) {
     if ( $old_path === '' || $old_path == "''" ) {
         return "''";
-    } elseif ( preg_match("/^(\/|http)/", $old_path) ) {
+    } elseif ( preg_match("/^(\/|http)/", $old_path) ||
+        substr($old_path,1,2) == ':/' ) {
         return "'" . $old_path . "'";
     } elseif ( preg_match("/^(\$|SM_PATH)/", $old_path) ) {
         return $old_path;
@@ -219,15 +223,12 @@ function change_to_sm_path($old_path) {
 
 
 /* ---------------------- main -------------------------- */
-
-/** @ignore */
-define('SM_PATH','../../');
-
-/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'plugins/administrator/defines.php');
-require_once(SM_PATH . 'plugins/administrator/auth.php');
+/** main SquirrelMail include */
+require('../../include/init.php');
+/* configuration definitions */
+include_once(SM_PATH . 'plugins/administrator/defines.php');
+/* additional functions */
+include_once(SM_PATH . 'plugins/administrator/auth.php');
 
 global $data_dir, $username;
 
@@ -236,7 +237,7 @@ if ( !adm_check_user() ) {
     exit;
 }
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 $newcfg = array( );
 
@@ -625,8 +626,7 @@ if ( $fp = @fopen( $cfgfile, 'w' ) ) {
     " * SquirrelMail Configuration File\n".
     " * Created using the Administrator Plugin\n".
     " */\n".
-    "\n".
-    "global \$version;\n" );
+    "\n" );
 
     foreach ( $newcfg as $k => $v ) {
         if ( $k{0} == '$' && $v <> '' || is_int($v)) {
@@ -639,8 +639,6 @@ if ( $fp = @fopen( $cfgfile, 'w' ) ) {
             fwrite( $fp, "$k = $v;\n" );
         }
     }
-    // add local config support
-    fwrite( $fp, "@include SM_PATH . 'config/config_local.php';\n" );
     // close php
     fwrite( $fp, '?>' );
     fclose( $fp );
@@ -651,4 +649,4 @@ if ( $fp = @fopen( $cfgfile, 'w' ) ) {
 }
 
 ?>
-</body></html>
\ No newline at end of file
+</body></html>