provide failsafe language in case $sm_language is not set in accept_lang

[squirrelmail.git] / config / config_default.php

diff --git a/config/config_default.php b/config/config_default.php
index e883a04ccc9a3abc61babfa92666d785fc6dc1c9..8d24c2e744481f78ffe125751d4bd956e652bb2e 100644 (file)
--- a/config/config_default.php
+++ b/config/config_default.php
@@ -50,7 +50,7 @@ $org_logo_height = '111';
  * This is the web page title that appears at the top of the browser window.
  * @global string $org_title
  */
-$org_title = "SquirrelMail $version";
+$org_title = "SquirrelMail";
 
 /**
  * Signout page
@@ -90,12 +90,12 @@ $provider_name = 'SquirrelMail';
  * Provider URI
  *
  * Here you can set URL of the link displayed on the right side of main page.
- *
+ * When empty, this refers to the SquirrelMail About page.
  * Link will be displayed only if you have $hide_sm_attributions
  * option set to true.
  * @global string $provider_uri
  */
-$provider_uri = 'http://www.squirrelmail.org/';
+$provider_uri = '';
 
 /*** Server Settings ***/
 /**
@@ -750,15 +750,24 @@ $default_use_javascript_addr_book = false;
 /**
  * Shared filebased address book
  * @global string $abook_global_file
+ * @since 1.5.1 and 1.4.4
  */
 $abook_global_file = '';
 
 /**
  * Writing into shared address book control
  * @global bool $abook_global_file_writeable
+ * @since 1.5.1 and 1.4.4
  */
 $abook_global_file_writeable = false;
 
+/**
+ * Listing of shared address book control
+ * @global bool $abook_global_file_listing
+ * @since 1.5.1
+ */
+$abook_global_file_listing = true;
+
 /**
  * MOTD
  *
@@ -773,8 +782,8 @@ $motd = "";
  * the plugin directory name relative to the /plugins/ directory.
  * For instance, for the 'sqclock' plugin, you'd put a line like
  * the following.
- *    $plugins[0] = 'sqclock';
- *    $plugins[1] = 'attachment_common';
+ *    $plugins[] = 'sqclock';
+ *    $plugins[] = 'attachment_common';
  */
 // Add list of enabled plugins here
 
@@ -804,12 +813,31 @@ $prefs_table = 'userprefs';
 $prefs_key_field = 'prefkey';
 $prefs_user_field = 'user';
 $prefs_val_field = 'prefval';
+
+/*** Global sql database options ***/
 /**
- * Global sql database options
+ * DSN of global address book database
+ * @global string $addrbook_global_dsn
+ * @since 1.5.1
  */
 $addrbook_global_dsn = '';
+/**
+ * Table used for global database address book
+ * @global string $addrbook_global_table
+ * @since 1.5.1
+ */
 $addrbook_global_table = 'global_abook';
+/**
+ * Control writing into global database address book
+ * @global boolean $addrbook_global_writeable
+ * @since 1.5.1
+ */
 $addrbook_global_writeable = false;
+/**
+ * Control listing of global database address book
+ * @global boolean $addrbook_global_listing
+ * @since 1.5.1
+ */
 $addrbook_global_listing = false;
 
 /*** Language settings ***/
@@ -892,18 +920,21 @@ $lossy_encoding = false;
 $advanced_tree = false;
 
 /**
- * Older listing way control
+ * Iframe sandbox code control
  *
- * Use older way of folder listing
- * @global bool $oldway
+ * Use iframe to render html emails
+ * (temp option used during debuging of new code)
+ * @global bool $use_iframe
+ * @since 1.5.1
  */
-$oldway = false;
+$use_iframe = false;
 
 /**
  * Message Icons control
  *
  * Use icons for message and folder markers
  * @global bool $use_icons
+ * @since 1.5.1
  */
 $use_icons = false;
 
@@ -935,6 +966,13 @@ $use_php_recode = false;
  */
 $use_php_iconv = false;
 
+/**
+ * Controls remote configuration checks
+ * @global boolean $allow_remote_configtest
+ * @since 1.5.1
+ */
+$allow_remote_configtest = false;
+
 /**
  * Subscribe Listing Control
  *