1. added non anonymous ldap binding patch. (thanks to Ilyak Kasnacheev <ilyak at...

[squirrelmail.git] / plugins / administrator / defines.php

diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php
index 3d7dae322cbadc3c486d20f4b894086809333fba..7776f845d2b7b4d760bb5cf69d671607a080fb53 100644 (file)
--- a/plugins/administrator/defines.php
+++ b/plugins/administrator/defines.php
@@ -243,9 +243,6 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                 '$allow_charset_search' => array( 'name' => _("Allow server charset search"),
                                                                                                   'type' => SMOPT_TYPE_BOOLEAN,
                                                                                                   'default' => false ),
-                                '$uid_support' => array( 'name' => _("UID support"),
-                                                                                 'type' => SMOPT_TYPE_BOOLEAN,
-                                                                                 'default' => false ),
                                 '$session_name' => array( 'name' => _("PHP session name"),
                                                                                   'type' => SMOPT_TYPE_HIDDEN ),
                  /* --------------------------------------------------------*/
@@ -283,16 +280,17 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                              'type' => SMOPT_TYPE_STRING,
                                              'size' => 40,
                                              'default' => 'prefval' ),
-                 /* --------------------------------------------------------*/
-                 'Group7' => array( 'name' => _("Themes"),
-                                    'type' => SMOPT_TYPE_TITLE ),
-                 '$theme_css' => array( 'name' => _("Style Sheet URL (css)"),
-                                        'type' => SMOPT_TYPE_PATH,
-                                        'size' => 40 ),
-                '$theme_default' => array( 'name' => _("Default theme"),
-                                           'type' => SMOPT_TYPE_INTEGER,
-                                           'default' => 0,
-                                           'comment' => _("Use index number of theme") ),
+                 '$addrbook_global_dsn' => array( 'name' => _("Global address book DSN"),
+                                           'type' => SMOPT_TYPE_STRING,
+                                           'size' => 40 ),
+                 '$addrbook_global_table' => array( 'name' => _("Global address book table"),
+                                             'type' => SMOPT_TYPE_STRING,
+                                             'size' => 40,
+                                             'default' => 'global_abook' ),
+                 '$addrbook_global_writable' => array( 'name' => _("Allow writing into global address book"),
+                                            'type' => SMOPT_TYPE_BOOLEAN ),
+                 '$addrbook_global_listing' => array( 'name' => _("Allow listing of global address book"),
+                                            'type' => SMOPT_TYPE_BOOLEAN ),
                  'Group9' => array( 'name' => _("Language settings"),
                                     'type' => SMOPT_TYPE_TITLE ),
                '$squirrelmail_default_language' => array( 'name' => _("Default Language"),
@@ -330,6 +328,16 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                 '$use_php_iconv'  => array( 'name' => _("Use php iconv functions"),
                                                     'type' => SMOPT_TYPE_BOOLEAN ),
                  /* --------------------------------------------------------*/
+                 'Group7' => array( 'name' => _("Themes"),
+                                    'type' => SMOPT_TYPE_TITLE ),
+                 '$theme_css' => array( 'name' => _("Style Sheet URL (css)"),
+                                        'type' => SMOPT_TYPE_PATH,
+                                        'size' => 40 ),
+                '$theme_default' => array( 'name' => _("Default theme"),
+                                           'type' => SMOPT_TYPE_INTEGER,
+                                           'default' => 0,
+                                           'comment' => _("Use index number of theme") ),
+                 /* --------------------------------------------------------*/
                  '$config_use_color' => array(  'name' => '',
                                                 'type' => SMOPT_TYPE_HIDDEN ),
                                 '$no_list_for_subscribe' => array( 'name' => '',