projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 708a2a83b9f038888e7796376008f0040e7fc8b3..8d24c2e744481f78ffe125751d4bd956e652bb2e 100644
(file)
--- a/
config/config_default.php
+++ b/
config/config_default.php
@@
-750,15
+750,24
@@
$default_use_javascript_addr_book = false;
/**
* Shared filebased address book
* @global string $abook_global_file
/**
* 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
*/
$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;
*/
$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
*
/**
* MOTD
*
@@
-804,12
+813,31
@@
$prefs_table = 'userprefs';
$prefs_key_field = 'prefkey';
$prefs_user_field = 'user';
$prefs_val_field = 'prefval';
$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 = '';
*/
$addrbook_global_dsn = '';
+/**
+ * Table used for global database address book
+ * @global string $addrbook_global_table
+ * @since 1.5.1
+ */
$addrbook_global_table = 'global_abook';
$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;
$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 ***/
$addrbook_global_listing = false;
/*** Language settings ***/
@@
-892,18
+920,21
@@
$lossy_encoding = false;
$advanced_tree = 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
/**
* Message Icons control
*
* Use icons for message and folder markers
* @global bool $use_icons
+ * @since 1.5.1
*/
$use_icons = false;
*/
$use_icons = false;
@@
-935,6
+966,13
@@
$use_php_recode = false;
*/
$use_php_iconv = 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
*
/**
* Subscribe Listing Control
*
@@
-969,4
+1007,4
@@
$config_use_color = 2;
* sent and regular output to begin, which will majorly screw
* things up when we try to send more headers later.
*/
* sent and regular output to begin, which will majorly screw
* things up when we try to send more headers later.
*/
-?>
+?>
\ No newline at end of file