Prevent endless recursive sent subfolder names - see: http://thread.gmane.org/gmane...

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

diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php
index d985aa459120608bce063db90e7639940e2d7d86..9288cd2ac49651c7b553790ea6c1ffad3cf82954 100644 (file)
--- a/plugins/administrator/defines.php
+++ b/plugins/administrator/defines.php
@@ -4,14 +4,14 @@
  * Administrator plugin - Option definitions
  *
  * @author Philippe Mingo
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2012 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
  * @subpackage administrator
  */
 
-/* Define constants for the various option types. */
+/** Define constants for the various option types. */
 define('SMOPT_TYPE_UNDEFINED', -1);
 define('SMOPT_TYPE_STRING', 0);
 define('SMOPT_TYPE_STRLIST', 1);
@@ -39,12 +39,12 @@ function adm_template_options() {
     global $aTemplateSet;
     $ret = array();
     foreach ($aTemplateSet as $iTemplateID => $aTemplate) {
-        $ret[$iTemplateID] = $aTemplate['NAME'];
+        $ret[$aTemplate['ID']] = $aTemplate['NAME'];
     }
     return $ret;
 }
 
-global $languages, $version;
+global $languages;
 
 $language_values = array( );
 foreach ($languages as $lang_key => $lang_attributes) {
@@ -64,7 +64,7 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                              'size' => 7 ),
                  'SM_ver' => array( 'name' => _("SquirrelMail Version"),
                                     'type' => SMOPT_TYPE_EXTERNAL,
-                                    'value' => "$version" ),
+                                    'value' => SM_VERSION ),
                  'PHP_ver' => array( 'name' => _("PHP Version"),
                                      'type' => SMOPT_TYPE_EXTERNAL,
                                      'value' => phpversion() ),
@@ -121,6 +121,7 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                                    'hmailserver' => _("hMailServer IMAP server"),
                                                                    'mercury32' => _("Mercury/32 IMAP server"),
                                                                    'bincimap' => _("Binc IMAP server"),
+                                                                   'dovecot' => _("Dovecot IMAP server"),
                                                                    'other' => _("Not one of the above servers") ) ),
                  '$optional_delimiter' => array( 'name' => _("IMAP Folder Delimiter"),
                                                  'type' => SMOPT_TYPE_STRING,
@@ -168,11 +169,17 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                                 'cram-md5' => 'CRAM-MD5',
                                                                 'digest-md5' => 'DIGEST-MD5'),
                                              'default' => 'none'),
+                 '$smtp_sitewide_user' => array( 'name' => _("Custom SMTP AUTH username"),
+                                                 'type' => SMOPT_TYPE_STRING,
+                                                 'size' => 40 ),
+                 '$smtp_sitewide_pass' => array( 'name' => _("Custom SMTP AUTH password"),
+                                                 'type' => SMOPT_TYPE_STRING,
+                                                 'size' => 40 ),
                  '$pop_before_smtp' => array( 'name' => _("POP3 Before SMTP?"),
                                               'type' => SMOPT_TYPE_BOOLEAN,
                                               'default' => false ),
                  '$encode_header_key' => array( 'name' => _("Header Encryption Key"),
-                                          'type' => SMOPT_TYPE_STRING ),
+                                                'type' => SMOPT_TYPE_STRING ),
                  '$invert_time' => array( 'name' => _("Invert Time"),
                                           'type' => SMOPT_TYPE_BOOLEAN ),
                  /* --------------------------------------------------------*/
@@ -282,6 +289,10 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                                  2 => _("Custom GNU C time zones"),
                                                                  3 => _("Custom strict time zones")),
                                              'default' => 0 ),
+                 '$config_location_base' => array( 'name' => _("Location base"),
+                                                   'type' => SMOPT_TYPE_STRING,
+                                                   'size' => 40,
+                                                   'default' => '' ),
                  /* --------------------------------------------------------*/
                  'Group5' => array( 'name' => _("Message of the Day"),
                                     'type' => SMOPT_TYPE_TITLE ),
@@ -388,6 +399,8 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                           'type' => SMOPT_TYPE_BOOLEAN ),
                  '$abook_global_file_listing'   => array( 'name' => _("Allow listing of global address book"),
                                                           'type' => SMOPT_TYPE_BOOLEAN ),
+                 '$abook_file_line_length' => array( 'name' => _("Address book file line length"),
+                                                     'type' => SMOPT_TYPE_INTEGER ),
                  /* --------------------------------------------------------*/
                  'Group7' => array( 'name' => _("Templates"),
                                     'type' => SMOPT_TYPE_TITLE ),
@@ -403,6 +416,9 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                  '$templateset_default' => array( 'name' => _("Default template"),
                                                   'type' => SMOPT_TYPE_STRLIST,
                                                   'posvals' => adm_template_options()),
+                 '$templateset_fallback' => array( 'name' => _("Fallback template"),
+                                                  'type' => SMOPT_TYPE_STRLIST,
+                                                  'posvals' => adm_template_options()),
                  '$theme_default' => array( 'name' => _("Default theme"),
                                             'type' => SMOPT_TYPE_INTEGER,
                                             'default' => 0,
@@ -415,5 +431,3 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                  /* --------------------------------------------------------*/
 
                );
-
-?>
\ No newline at end of file