X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fadministrator%2Fdefines.php;h=8b3010a6963d0d36473efa2db8391bb027002576;hb=5628fdde05c1b41eb32e1d6bb4274108c4284c5d;hp=e25a0f17c4225e89f67d662ad4107d92388853b5;hpb=4e85a37fc4a968e1fd255219069e85df7d08e558;p=squirrelmail.git

diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php
index e25a0f17..8b3010a6 100644
--- a/plugins/administrator/defines.php
+++ b/plugins/administrator/defines.php
@@ -63,6 +63,14 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                  '$org_logo' => array( 'name' => _("Organization Logo"),
                                        'type' => SMOPT_TYPE_STRING,
                                        'size' => 40 ),
+                 '$org_logo_width' => array( 'name'    => _("Organization Logo Width"),
+                                             'type'    => SMOPT_TYPE_INTEGER,
+                                             'size'    => 5,
+                                             'default' => 0),
+                 '$org_logo_height' => array( 'name'    => _("Organization Logo Height"),
+                                              'type'    => SMOPT_TYPE_INTEGER,
+                                              'size'    => 5,
+                                              'default' => 0),
                  '$org_title' => array( 'name' => _("Organization Title"),
                                         'type' => SMOPT_TYPE_STRING,
                                         'size' => 40 ),
@@ -114,6 +122,8 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                      'type' => SMOPT_TYPE_BOOLEAN ),
                  '$invert_time' => array( 'name' => _("Invert Time"),
                                           'type' => SMOPT_TYPE_BOOLEAN ),
+                 '$default_use_mdn' => array( 'name' => _("Use Confirmation Flags"),
+                                              'type' => SMOPT_TYPE_BOOLEAN ),                                          
                  /* --------------------------------------------------------*/
                  'Group3' => array( 'name' => _("Folders Defaults"),
                                     'type' => SMOPT_TYPE_TITLE ),
@@ -167,15 +177,16 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                     'type' => SMOPT_TYPE_TITLE ),
                  '$default_charset' => array( 'name' => _("Default Charset"),
                                               'type' => SMOPT_TYPE_STRLIST,
-                                              'posvals' => array( 'iso_8859_1' => 'iso_8859_1',
-                                                                  'iso_8859_2' => 'iso_8859_2',
-                                                                  'iso_8859_7' => 'iso_8859_7',
-                                                                  'iso_8859_15' => 'iso_8859_15',
-                                                                  'iso_8859_15' => 'iso_8859_15',
+                                              'posvals' => array( 'iso-8859-1' => 'iso-8859-1',
+                                                                  'iso-8859-2' => 'iso-8859-2',
+                                                                  'iso-8859-7' => 'iso-8859-7',
+                                                                  'iso-8859-15' => 'iso-8859-15',
+                                                                  'iso-8859-15' => 'iso-8859-15',
                                                                   'ns_4551_1' => 'ns_4551_1',
                                                                   'koi8-r' => 'koi8-r',
                                                                   'euc-KR' => 'euc-KR',
-                                                                  'windows-1251' => 'windows-1251' ) ),
+                                                                  'windows-1251' => 'windows-1251',
+                                                                  'ISO-2022-JP' => 'ISO-2022-JP' ) ),
                  '$data_dir' => array( 'name' => _("Data Directory"),
                                        'type' => SMOPT_TYPE_STRING,
                                        'size' => 40 ),
@@ -198,6 +209,12 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                     'type' => SMOPT_TYPE_BOOLEAN ),
                  '$hide_sm_attributions' => array( 'name' => _("Hide SM attributions"),
                                                    'type' => SMOPT_TYPE_BOOLEAN ),
+                 'default_use_mdn' => array( 'name' => _("Enable use of delivery receipts"),
+                                             'type' => SMOPT_TYPE_BOOLEAN ),
+                 '$edit_identity' => array( 'name' => _("Allow editing of identities"),
+                                            'type' => SMOPT_TYPE_BOOLEAN ),
+                 '$edit_name' => array( 'name' => _("Allow editing of full name"),
+                                        'type' => SMOPT_TYPE_BOOLEAN ),
                  /* --------------------------------------------------------*/
                  'Group5' => array( 'name' => _("Message of the Day"),
                                     'type' => SMOPT_TYPE_TITLE ),
@@ -221,6 +238,18 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                           'type' => SMOPT_TYPE_STRING,
                                           'size' => 40,
                                           'default' => 'userprefs' ),
+                 '$prefs_user_field' => array('name' => _("Preferences username field"),
+                                              'type' => SMOPT_TYPE_STRING,
+                                              'size' => 40,
+                                              'default' => 'user' ),
+                 '$prefs_key_field' => array('name' => _("Preferences key field"),
+                                             'type' => SMOPT_TYPE_STRING,
+                                             'size' => 40,
+                                             'default' => 'prefkey' ),
+                 '$prefs_val_field' => array('name' => _("Preferences value field"),
+                                             'type' => SMOPT_TYPE_STRING,
+                                             'size' => 40,
+                                             'default' => 'prefval' ),
                  /* --------------------------------------------------------*/
                  'Group7' => array( 'name' => _("Themes"),
                                     'type' => SMOPT_TYPE_TITLE ),