adding address book block

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8320 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php
index c224866d2ab09233c375f11fa603fd587ac2571b..967408d3058196664a5cdf06238ca890d92e34f8 100644 (file)
--- a/plugins/administrator/defines.php
+++ b/plugins/administrator/defines.php
@@ -193,8 +193,6 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                                        SMPREF_UNSEEN_TOTAL => _("Unseen and Total") ) ),
                  '$auto_create_special' => array( 'name' => _("Auto Create Special Folders"),
                                                   'type' => SMOPT_TYPE_BOOLEAN ),
-                 '$default_use_javascript_addr_book' => array( 'name' => _("Default Javascript Addressbook"),
-                                                  'type' => SMOPT_TYPE_BOOLEAN ),
                  '$delete_folder' => array( 'name' => _("Auto delete folders"),
                                             'type' => SMOPT_TYPE_BOOLEAN ),
                  '$noselect_fix_enable' => array( 'name' => _("Enable /NoSelect folder fix"),
@@ -254,7 +252,7 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                  '$motd' => array( 'name' => _("Message of the Day"),
                                    'type' => SMOPT_TYPE_TEXTAREA,
                                    'size' => 40 ),
-                 /* --------------------------------------------------------*/
+                 /* ---- Database settings ---- */
                  'Group6' => array( 'name' => _("Database"),
                                     'type' => SMOPT_TYPE_TITLE ),
                  '$addrbook_dsn' => array( 'name' => _("Address book DSN"),
@@ -294,6 +292,7 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                             'type' => SMOPT_TYPE_BOOLEAN ),
                  '$addrbook_global_listing' => array( 'name' => _("Allow listing of global address book"),
                                             'type' => SMOPT_TYPE_BOOLEAN ),
+                 /* ---- Language settings ---- */
                  'Group9' => array( 'name' => _("Language settings"),
                                     'type' => SMOPT_TYPE_TITLE ),
                  '$squirrelmail_default_language' => array( 'name' => _("Default Language"),
@@ -321,6 +320,7 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                  'type' => SMOPT_TYPE_BOOLEAN ),
                  '$lossy_encoding'  => array( 'name' => _("Enable lossy encoding"),
                                                  'type' => SMOPT_TYPE_BOOLEAN ),
+                 /* ---- Tweaks ---- */
                  'Group10' => array( 'name' => _("Tweaks"),
                                      'type' => SMOPT_TYPE_TITLE ),
                  '$advanced_tree'  => array( 'name' => _("Use advanced tree folder listing"),
@@ -333,6 +333,15 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                               'type' => SMOPT_TYPE_BOOLEAN ),
                  '$use_php_iconv'  => array( 'name' => _("Use php iconv functions"),
                                              'type' => SMOPT_TYPE_BOOLEAN ),
+                 /* ---- Settings of address books ---- */
+                 'Group11' => array( 'name' => _("Address Books"),
+                                     'type' => SMOPT_TYPE_TITLE ),
+                 '$default_use_javascript_addr_book' => array( 'name' => _("Default Javascript Addressbook"),
+                                                  'type' => SMOPT_TYPE_BOOLEAN ),
+                 '$abook_global_file' => array( 'name' => _("Global address book file"),
+                                                  'type' => SMOPT_TYPE_STRING ),
+                 '$abook_global_file_writeable' => array( 'name' => _("Allow writing into global address book file"),
+                                                  'type' => SMOPT_TYPE_BOOLEAN ),
                  /* --------------------------------------------------------*/
                  'Group7' => array( 'name' => _("Themes"),
                                     'type' => SMOPT_TYPE_TITLE ),

diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php
index c7af2d8bbf067243a2c67f979ec1c710f1caa0da..f83688d50ca5969fdd176bf30f1fc30eedcd8a68 100644 (file)
--- a/plugins/administrator/options.php
+++ b/plugins/administrator/options.php
@@ -254,7 +254,8 @@ $colapse = array( 'Titles' => 'off',
                   'Group7' => getPref($data_dir, $username, 'adm_Group7', 'on' ),
                   'Group8' => getPref($data_dir, $username, 'adm_Group8', 'on' ),
                   'Group9' => getPref($data_dir, $username, 'adm_Group9', 'on' ),
-                  'Group10' => getPref($data_dir, $username, 'adm_Group10', 'on' ) );
+                  'Group10' => getPref($data_dir, $username, 'adm_Group10', 'on' ),
+                  'Group11' => getPref($data_dir, $username, 'adm_Group10', 'on' ) );
 
 /* look in $_GET array for 'switch' */
 if ( sqgetGlobalVar('switch', $switch, SQ_GET) ) {