X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=config%2Fconfig_default.php;h=4d73465436d9117b612b3574fbf91bee390335fb;hb=0fa9bde70c488226bcd0e1a37bb199b6b8556e77;hp=915322565820db09905243590049cedddf229aa9;hpb=74530cf4e12212c9597a5f29c9f0ed1d31bdb65d;p=squirrelmail.git

diff --git a/config/config_default.php b/config/config_default.php
index 91532256..4d734654 100644
--- a/config/config_default.php
+++ b/config/config_default.php
@@ -189,7 +189,7 @@ $sendmail_path = '/usr/sbin/sendmail';
  * which does not support -t and -i arguments, set variable to empty string
  * or use arguments suitable for your mailer.
  * @global string $sendmail_args
- * @since 1.5.1
+ * @since 1.5.1 and 1.4.8
  */
 $sendmail_args = '-i -t';
 
@@ -267,6 +267,28 @@ $use_smtp_tls = 0;
  */
 $smtp_auth_mech = 'none';
 
+/**
+ * Custom SMTP authentication username
+ *
+ * IMAP username is used if variable is set to empty string.
+ * Variable is included in main configuration file only from 1.5.2 version.
+ * Older versions stored it in config_local.php.
+ * @global string $smtp_sitewide_user
+ * @since 1.5.0
+ */
+$smtp_sitewide_user = '';
+
+/**
+ * Custom SMTP authentication password
+ *
+ * IMAP password is used if $smtp_sitewide_user global is set to empty string.
+ * Variable is included in main configuration file only from 1.5.2 version.
+ * Older versions stored it in config_local.php.
+ * @global string $smtp_sitewide_pass
+ * @since 1.5.0
+ */
+$smtp_sitewide_pass = '';
+
 /**
  * IMAP authentication mechanism
  *
@@ -474,7 +496,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 +515,7 @@ $data_dir = '/var/local/squirrelmail/data';
  *    + It should probably be another directory than data_dir.
  * @global string $attachment_dir
  */
-$attachment_dir = '/var/local/squirrelmail/attach';
+$attachment_dir = '/var/local/squirrelmail/attach/';
 
 /**
  * Hash level used for data directory.
@@ -1137,8 +1159,8 @@ $time_zone_type = 0;
  * 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
+ * @global string $config_location_base
+ * @since 1.5.2 and 1.4.8
  */
 $config_location_base = '';
 
@@ -1218,9 +1240,3 @@ $no_list_for_subscribe = false;
  * @global integer $config_use_color
  */
 $config_use_color = 2;
-
-/**
- * This option includes special configuration options
- */
-@include SM_PATH . 'config/config_local.php';
-