X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fadministrator%2Fdefines.php;h=abef40442f0e72354be502e83f83cd314590d76b;hp=c7819c2b0a531e94a6d98c967884acca85d1932a;hb=c4faef335b2362c81b8ebf026d4066c12d70536c;hpb=e498ebbdf3b0933a733da9b52d9d6b6ca1e0815e diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php index c7819c2b..abef4044 100644 --- a/plugins/administrator/defines.php +++ b/plugins/administrator/defines.php @@ -1,22 +1,17 @@ $aTemplate) { + $ret[$aTemplate['ID']] = $aTemplate['NAME']; + } + return $ret; +} + +global $languages; $language_values = array( ); foreach ($languages as $lang_key => $lang_attributes) { @@ -54,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() ), @@ -111,16 +121,20 @@ $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, 'comment' => _("Use "detect" to auto-detect."), 'size' => 10, 'default' => 'detect' ), - '$use_imap_tls' => array( 'name' => _("Use TLS for IMAP Connections"), - 'type' => SMOPT_TYPE_BOOLEAN, - 'comment' => _("Requires PHP 4.3.x! Experimental."), - 'default' => false ), + '$use_imap_tls' => array( 'name' => _("IMAP Connection Security"), + 'type' => SMOPT_TYPE_NUMLIST, + 'posvals' => array( 0 => _("Plain text connection"), + 1 => _("Secure IMAP (TLS) connection"), + 2 => _("IMAP STARTTLS connection")), + 'comment' => _("Requires higher PHP version and special functions. See SquirrelMail documentation."), + 'default' => 0 ), '$imap_auth_mech' => array( 'name' => _("IMAP Authentication Type"), 'type' => SMOPT_TYPE_STRLIST, 'posvals' => array('login' => _("IMAP login"), @@ -133,15 +147,21 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"), '$sendmail_path' => array( 'name' => _("Sendmail Path"), 'type' => SMOPT_TYPE_STRING, 'size' => 40 ), + '$sendmail_args' => array( 'name' => _("Sendmail Arguments"), + 'type' => SMOPT_TYPE_STRING, + 'size' => 40 ), '$smtpServerAddress' => array( 'name' => _("SMTP Server Address"), 'type' => SMOPT_TYPE_STRING, 'size' => 40 ), '$smtpPort' => array( 'name' => _("SMTP Server Port"), 'type' => SMOPT_TYPE_INTEGER ), - '$use_smtp_tls' => array( 'name' => _("Use TLS for SMTP Connections"), - 'type' => SMOPT_TYPE_BOOLEAN, - 'comment' => _("Requires PHP 4.3.x! Experimental."), - 'default' => false ), + '$use_smtp_tls' => array( 'name' => _("SMTP Connection Security"), + 'type' => SMOPT_TYPE_NUMLIST, + 'posvals' => array( 0 => _("Plain text connection"), + 1 => _("Secure SMTP (TLS) connection"), + 2 => _("SMTP STARTTLS connection")), + 'comment' => _("Requires higher PHP version and special functions. See SquirrelMail documentation."), + 'default' => 0 ), '$smtp_auth_mech' => array( 'name' => _("SMTP Authentication Type"), 'type' => SMOPT_TYPE_STRLIST, 'posvals' => array('none' => _("No SMTP auth"), @@ -149,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 ), /* --------------------------------------------------------*/ @@ -235,14 +261,16 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"), '$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 ), + '$edit_reply_to' => array( 'name' => _("Allow editing of reply-to address"), 'type' => SMOPT_TYPE_BOOLEAN ), '$hide_auth_header' => array( 'name' => _("Remove username from headers"), 'comment' => _("Used only when identities can't be modified"), 'type' => SMOPT_TYPE_BOOLEAN ), - '$allow_server_sort' => array( 'name' => _("Use server-side sorting"), + '$disable_server_sort' => array( 'name' => _("Disable server-side sorting"), 'type' => SMOPT_TYPE_BOOLEAN, 'default' => false ), - '$allow_thread_sort' => array( 'name' => _("Use server-side thread sorting"), + '$disable_thread_sort' => array( 'name' => _("Disable server-side thread sorting"), 'type' => SMOPT_TYPE_BOOLEAN, 'default' => false ), '$allow_charset_search' => array( 'name' => _("Allow server charset search"), @@ -263,6 +291,16 @@ $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' => '' ), + '$use_transparent_security_image' => array( 'name' => _("Use transparent security image"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'default' => true ), + '$display_imap_login_error' => array( 'name' => _("Show login error message directly from IMAP server instead of generic one"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'default' => false ), /* --------------------------------------------------------*/ 'Group5' => array( 'name' => _("Message of the Day"), 'type' => SMOPT_TYPE_TITLE ), @@ -348,8 +386,6 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"), /* ---- Tweaks ---- */ 'Group10' => array( 'name' => _("Tweaks"), 'type' => SMOPT_TYPE_TITLE ), - '$advanced_tree' => array( 'name' => _("Use advanced tree folder listing"), - 'type' => SMOPT_TYPE_BOOLEAN ), '$use_icons' => array( 'name' => _("Use icons"), 'type' => SMOPT_TYPE_BOOLEAN ), '$use_iframe' => array( 'name' => _("Use inline frames with HTML mails"), @@ -371,12 +407,26 @@ $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' => _("Themes"), + 'Group7' => array( 'name' => _("Templates"), 'type' => SMOPT_TYPE_TITLE ), '$theme_css' => array( 'name' => _("Style Sheet URL (css)"), 'type' => SMOPT_TYPE_PATH, 'size' => 40 ), + '$default_fontsize' => array( 'name' => _("Default font size"), + 'type' => SMOPT_TYPE_STRING, + 'default' => ''), + '$default_fontset' => array( 'name' => _("Default font set"), + 'type' => SMOPT_TYPE_STRLIST, + 'posvals' => $fontsets), + '$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, @@ -389,5 +439,3 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"), /* --------------------------------------------------------*/ ); - -?> \ No newline at end of file