From: Tomas K. <to...@us...> - 2005-10-19 16:23:37
|
Update of /cvsroot/squirrelmail/squirrelmail/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24423 Modified Files: Tag: SM-1_4-STABLE conf.pl config_default.php Log Message: documenting added configuration options adding default value for global db address book dsn Index: conf.pl =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/config/conf.pl,v retrieving revision 1.154.2.20 retrieving revision 1.154.2.21 diff -u -w -r1.154.2.20 -r1.154.2.21 --- conf.pl 17 Jul 2005 15:47:20 -0000 1.154.2.20 +++ conf.pl 19 Oct 2005 16:23:28 -0000 1.154.2.21 @@ -313,6 +313,7 @@ # Added in 1.4.4 $lossy_encoding = 'false' if ( !$lossy_encoding ); +$addrbook_global_dsn = '' if ( !$addrbook_global_dsn ); $addrbook_global_table = 'global_abook' if ( !$addrbook_global_table ); $addrbook_global_writeable = 'false' if ( !$addrbook_global_writeable ); $addrbook_global_listing = 'false' if ( !$addrbook_global_listing ); Index: config_default.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/config/config_default.php,v retrieving revision 1.84.2.11 retrieving revision 1.84.2.12 diff -u -w -r1.84.2.11 -r1.84.2.12 --- config_default.php 20 Jul 2005 08:57:43 -0000 1.84.2.11 +++ config_default.php 19 Oct 2005 16:23:29 -0000 1.84.2.12 @@ -774,6 +774,19 @@ */ $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; /** * MOTD @@ -821,6 +834,32 @@ $prefs_user_field = 'user'; $prefs_val_field = 'prefval'; +/*** Global sql database options ***/ +/** + * DSN of global address book database + * @global string $addrbook_global_dsn + * @since 1.5.1 and 1.4.4 + */ +$addrbook_global_dsn = ''; +/** + * Table used for global database address book + * @global string $addrbook_global_table + * @since 1.5.1 and 1.4.4 + */ +$addrbook_global_table = 'global_abook'; +/** + * Control writing into global database address book + * @global boolean $addrbook_global_writeable + * @since 1.5.1 and 1.4.4 + */ +$addrbook_global_writeable = false; +/** + * Control listing of global database address book + * @global boolean $addrbook_global_listing + * @since 1.5.1 and 1.4.4 + */ +$addrbook_global_listing = false; + /*** Language settings ***/ /** * Default language |