There was a problem when passing arrays to the decode header. From

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

diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php
index 677e58627977fcf74207636b3ef63e4f06fc2fea..e25a0f17c4225e89f67d662ad4107d92388853b5 100644 (file)
--- a/plugins/administrator/defines.php
+++ b/plugins/administrator/defines.php
@@ -11,6 +11,7 @@
  * $Id$
  */
 
+require_once( '../functions/constants.php' );
 
 /* Define constants for the various option types. */
 define('SMOPT_TYPE_UNDEFINED', -1);
@@ -27,6 +28,7 @@ define('SMOPT_TYPE_TITLE', 9);
 define('SMOPT_TYPE_THEME', 10);
 define('SMOPT_TYPE_PLUGINS', 11);
 define('SMOPT_TYPE_LDAP', 12);
+define('SMOPT_TYPE_EXTERNAL', 32);
 
 global $languages;
 
@@ -46,6 +48,12 @@ for ($lsv = 100; $lsv <= 300; $lsv += 10) {
 $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                              'type' => SMOPT_TYPE_COMMENT,
                                              'size' => 7 ),
+                 'SM_ver' => array( 'name' => _("Squirrelmail Version"),
+                                    'type' => SMOPT_TYPE_EXTERNAL,
+                                    'value' => "$version" ),
+                 'PHP_ver' => array( 'name' => _("PHP Version"),
+                                     'type' => SMOPT_TYPE_EXTERNAL,
+                                     'value' => phpversion() ),
                  /* --------------------------------------------------------*/
                  'Group1' => array( 'name' => _("Organization Preferences"),
                                     'type' => SMOPT_TYPE_TITLE ),
@@ -73,13 +81,13 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                  'Group2' => array( 'name' => _("Server Settings"),
                                     'type' => SMOPT_TYPE_TITLE ),
                  '$domain' => array( 'name' => _("Mail Domain"),
-                                                'type' => SMOPT_TYPE_STRING,
-                                                'size' => 40 ),
+                                     'type' => SMOPT_TYPE_STRING,
+                                     'size' => 40 ),
                  '$imapServerAddress' => array( 'name' => _("IMAP Server Address"),
                                                 'type' => SMOPT_TYPE_STRING,
                                                 'size' => 40 ),
                  '$imapPort' => array( 'name' => _("IMAP Server Port"),
-                                                 'type' => SMOPT_TYPE_INTEGER ),
+                                       'type' => SMOPT_TYPE_INTEGER ),
                  '$imap_server_type' => array( 'name' => _("IMAP Server Type"),
                                                'type' => SMOPT_TYPE_STRLIST,
                                                'posvals' => array( 'cyrus' => _("Cyrus IMAP server"),
@@ -101,7 +109,7 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                 'type' => SMOPT_TYPE_STRING,
                                                 'size' => 40 ),
                  '$smtpPort' => array( 'name' => _("SMTP Server Port"),
-                                                 'type' => SMOPT_TYPE_INTEGER ),
+                                       'type' => SMOPT_TYPE_INTEGER ),
                  '$use_authenticated_smtp' => array( 'name' => _("Authenticated SMTP"),
                                                      'type' => SMOPT_TYPE_BOOLEAN ),
                  '$invert_time' => array( 'name' => _("Invert Time"),
@@ -140,13 +148,20 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                  '$show_contain_subfolders_option' => array( 'name' => _("Show 'Contain Sub.' Option"),
                                                              'type' => SMOPT_TYPE_BOOLEAN ),
                  '$default_unseen_notify' => array( 'name' => _("Default Unseen Notify"),
-                                                    'type' => SMOPT_TYPE_INTEGER ),
+                                                    'type' => SMOPT_TYPE_NUMLIST,
+                                                    'posvals' => array( SMPREF_UNSEEN_NONE  => _("No Notification"),
+                                                                        SMPREF_UNSEEN_INBOX => _("Only INBOX"),
+                                                                        SMPREF_UNSEEN_ALL   => _("All Folders")) ),
                  '$default_unseen_type'  => array( 'name' => _("Default Unseen Type"),
-                                                   'type' => SMOPT_TYPE_INTEGER ),
+                                                   'type' => SMOPT_TYPE_NUMLIST ,
+                                                   'posvals' => array( SMPREF_UNSEEN_ONLY  => _("Only Unseen"),
+                                                                       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 Adrressbook"),
                                                   'type' => SMOPT_TYPE_BOOLEAN ),
+                 '$delete_folder' => array( 'name' => _("Auto delete folders"),
+                                            'type' => SMOPT_TYPE_BOOLEAN ),
                  /* --------------------------------------------------------*/
                  'Group4' => array( 'name' => _("General Options"),
                                     'type' => SMOPT_TYPE_TITLE ),
@@ -194,11 +209,18 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                     'type' => SMOPT_TYPE_TITLE ),
                  '$addrbook_dsn' => array( 'name' => _("Address book DSN"),
                                            'type' => SMOPT_TYPE_STRING,
-                                           'size' => 40 ), 
+                                           'size' => 40 ),
                  '$addrbook_table' => array( 'name' => _("Address book table"),
                                              'type' => SMOPT_TYPE_STRING,
                                              'size' => 40,
                                              'default' => 'address' ),
+                 '$prefs_dsn' => array( 'name' => _("Preferences DSN"),
+                                        'type' => SMOPT_TYPE_STRING,
+                                        'size' => 40 ),
+                 '$prefs_table' => array( 'name' => _("Preferences table"),
+                                          'type' => SMOPT_TYPE_STRING,
+                                          'size' => 40,
+                                          'default' => 'userprefs' ),
                  /* --------------------------------------------------------*/
                  'Group7' => array( 'name' => _("Themes"),
                                     'type' => SMOPT_TYPE_TITLE ),
@@ -206,7 +228,8 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                         'type' => SMOPT_TYPE_STRING,
                                         'size' => 40 ),
                  /* --------------------------------------------------------*/
-                 '$config_use_color' => array( 'type' => SMOPT_TYPE_HIDDEN )
+                 '$config_use_color' => array(  'name' => '',
+                                                'type' => SMOPT_TYPE_HIDDEN )
                  /* --------------------------------------------------------*/
 
                );