X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=config%2Fconfig_default.php;h=4b0d442c141a7e90cd0a2cdc80b8ff643ef2a55a;hp=7b92d598a1096e9f82262b9f71c062a9a60ba467;hb=348610ca25bdd394d7c895a54870ca11b8c64402;hpb=6c99d1de81366bceab6c9d6cf12179eedc81f9bc

diff --git a/config/config_default.php b/config/config_default.php
index 7b92d598..4b0d442c 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.
@@ -651,13 +673,11 @@ $session_name = 'SQMSESSID';
  * add a new number to the array at the bottom, and follow the pattern.
  *
  * $theme_default sets theme that will be used by default
- * $theme_css sets stylesheet (from theme/css directory) that will be
  * used by default.
  * @global integer $theme_default
  * @global string $theme_css
  */
 $theme_default = 0;
-$theme_css = '';
 
 /**
  * Listing of installed themes
@@ -821,24 +841,26 @@ $theme[51]['NAME'] = 'Turquoise';
 
 /**
  * Templates
- *   You can define your own template and put it in this directory.
- *   You must call it as the example below. You can name the template
- *   whatever you want. For an example of a template, see the ones
- *   included in the template directory.
+ *   You can define your own template and put it in a new directory
+ *   under SM_PATH/templates.  The ID must match the name of
+ *   the template directory as the example below. You can name the 
+ *   template whatever you want. For an example of a template, see 
+ *   the ones included in the SM_PATH/templates directory.
  *
  * To add a new template to the options that users can choose from, just
  * add a new number to the array at the bottom, and follow the pattern.
  *
- * $templateset_default sets theme that will be used by default
- * used by default.
+ * $templateset_default sets theme that will be used by default.
+ *
  * @global integer $templateset_default
  */
 $templateset_default = 0;
+$templateset_fallback = 0;
 
-$aTemplateSet[0]['PATH'] = SM_PATH . 'templates/default/';
-$aTemplateSet[0]['NAME'] = 'Default template';
-$aTemplateSet[1]['PATH'] = SM_PATH . 'templates/default_advanced/';
-$aTemplateSet[1]['NAME'] = 'Advanced template';
+$aTemplateSet[0]['ID'] = 'default';
+$aTemplateSet[0]['NAME'] = 'Default';
+$aTemplateSet[1]['ID'] = 'default_advanced';
+$aTemplateSet[1]['NAME'] = 'Advanced';
 
 /**
  * Default interface font size.
@@ -1119,6 +1141,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 and 1.4.8
+ */
+$config_location_base = '';
+
 /*** Tweaks ***/
 /**
  * Iframe sandbox code control
@@ -1195,16 +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';
-
-/**
- * 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.
- */