data and attachment directories need trailing slash. If we don't require it,

[squirrelmail.git] / config / config_default.php

diff --git a/config/config_default.php b/config/config_default.php
index 30faa13a71316710e3748c3d7f9119fd15b32593..a5aaed212b62f6dc9c42a9c1d90eb36c35e6a5d9 100644 (file)
--- a/config/config_default.php
+++ b/config/config_default.php
@@ -474,7 +474,7 @@ $noselect_fix_enable = false;
  *
  * @global string $data_dir
  */
-$data_dir = '/var/local/squirrelmail/data';
+$data_dir = '/var/local/squirrelmail/data/';
 
 /**
  * Attachments directory
@@ -493,7 +493,7 @@ $data_dir = '/var/local/squirrelmail/data';
  *    + It should probably be another directory than data_dir.
  * @global string $attachment_dir
  */
-$attachment_dir = $data_dir;
+$attachment_dir = '/var/local/squirrelmail/attach/';
 
 /**
  * Hash level used for data directory.
@@ -1119,6 +1119,29 @@ $lossy_encoding = false;
  */
 $time_zone_type = 0;
 
+/**
+ * Location base
+ * 
+ * This is used to build the URL to the SquirrelMail location.
+ * It should contain only the protocol and hostname/port parts
+ * of the URL; the full path will be appended automatically.
+ *
+ * If not specified or empty, it will be autodetected.
+ *
+ * Examples:
+ * http://webmail.example.org
+ * http://webmail.example.com:8080
+ * https://webmail.example.com:6691
+ *
+ * To be clear: do not include any of the path elements, so if
+ * SquirrelMail is at http://www.example.net/web/mail/src/login.php, you
+ * write: http://www.example.net
+ *
+ * @global string $config_location_base;
+ * @since 1.5.2
+ */
+$config_location_base = '';
+
 /*** Tweaks ***/
 /**
  * Iframe sandbox code control
@@ -1201,11 +1224,3 @@ $config_use_color = 2;
  */
 @include SM_PATH . 'config/config_local.php';
 
-/**
- * Make sure there are no characters after the PHP closing
- * tag below (including newline characters and whitespace).
- * Otherwise, that character will cause the headers to be
- * sent and regular output to begin, which will majorly screw
- * things up when we try to send more headers later.
- */
-?>