From fdefb2e7b796bdd8fc2531c7a81d0703874e806c Mon Sep 17 00:00:00 2001 From: tokul Date: Mon, 3 May 2004 15:52:54 +0000 Subject: [PATCH] added search control to default config and administrator plugin cleaned tabs from defines.php git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7350 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- config/config_default.php | 10 ++ plugins/administrator/defines.php | 147 +++++++++++++++--------------- 2 files changed, 86 insertions(+), 71 deletions(-) diff --git a/config/config_default.php b/config/config_default.php index 7c88b136..9eb27e94 100644 --- a/config/config_default.php +++ b/config/config_default.php @@ -554,6 +554,16 @@ $allow_server_sort = false; */ $allow_charset_search = true; +/** + * Search functions control + * + * This option allows you to control the use of advanced search form. + * Set to 0 to enable basic search only, 1 to enable advanced search only + * or 2 to enable both. + * @global integer $allow_advanced_search + */ +$allow_advanced_search = 0; + /** * PHP session name. * diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php index 84857aa9..f6a3f3c2 100644 --- a/plugins/administrator/defines.php +++ b/plugins/administrator/defines.php @@ -64,7 +64,7 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"), '$org_logo' => array( 'name' => _("Organization Logo"), 'type' => SMOPT_TYPE_PATH, 'size' => 40, - 'default' => '../images/sm_logo.png'), + 'default' => '../images/sm_logo.png'), '$org_logo_width' => array( 'name' => _("Organization Logo Width"), 'type' => SMOPT_TYPE_STRING, 'size' => 5, @@ -79,10 +79,10 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"), '$signout_page' => array( 'name' => _("Signout Page"), 'type' => SMOPT_TYPE_PATH, 'size' => 40 ), - '$provider_uri' => array( 'name' => _("Provider Link URI"), - 'type' => SMOPT_TYPE_STRING ), - '$provider_name' => array( 'name' => _("Provider Name"), - 'type' => SMOPT_TYPE_STRING ), + '$provider_uri' => array( 'name' => _("Provider Link URI"), + 'type' => SMOPT_TYPE_STRING ), + '$provider_name' => array( 'name' => _("Provider Name"), + 'type' => SMOPT_TYPE_STRING ), '$frame_top' => array( 'name' => _("Top Frame"), 'type' => SMOPT_TYPE_STRING, 'size' => 40, @@ -110,19 +110,19 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"), '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 ), - '$imap_auth_mech' => array( 'name' => _("IMAP Authentication Type"), - 'type' => SMOPT_TYPE_STRLIST, - 'posvals' => array('login' => 'IMAP LOGIN', - 'cram-md5' => 'CRAM-MD5', - 'digest-md5' => 'DIGEST-MD5'), - 'default' => 'login' ), + '$use_imap_tls' => array( 'name' => _("Use TLS for IMAP Connections"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'comment' => _("Requires PHP 4.3.x! Experimental."), + 'default' => false ), + '$imap_auth_mech' => array( 'name' => _("IMAP Authentication Type"), + 'type' => SMOPT_TYPE_STRLIST, + 'posvals' => array('login' => 'IMAP LOGIN', + 'cram-md5' => 'CRAM-MD5', + 'digest-md5' => 'DIGEST-MD5'), + 'default' => 'login' ), '$useSendmail' => array( 'name' => _("Use Sendmail Binary"), 'type' => SMOPT_TYPE_BOOLEAN, - 'comment' => "Say 'no' for SMTP" ), + 'comment' => "Say 'no' for SMTP" ), '$sendmail_path' => array( 'name' => _("Sendmail Path"), 'type' => SMOPT_TYPE_STRING, 'size' => 40 ), @@ -131,20 +131,20 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"), '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 ), - '$smtp_auth_mech' => array( 'name' => _("SMTP Authentication Type"), - 'type' => SMOPT_TYPE_STRLIST, - 'posvals' => array('none' => 'No SMTP auth', - 'login' => 'Login (Plaintext)', - 'cram-md5' => 'CRAM-MD5', - 'digest-md5' => 'DIGEST-MD5'), - 'default' => 'none'), - '$pop_before_smtp' => array( 'name' => _("POP3 Before SMTP?"), - 'type' => SMOPT_TYPE_BOOLEAN, - 'default' => false ), + '$use_smtp_tls' => array( 'name' => _("Use TLS for SMTP Connections"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'comment' => _("Requires PHP 4.3.x! Experimental."), + 'default' => false ), + '$smtp_auth_mech' => array( 'name' => _("SMTP Authentication Type"), + 'type' => SMOPT_TYPE_STRLIST, + 'posvals' => array('none' => 'No SMTP auth', + 'login' => 'Login (Plaintext)', + 'cram-md5' => 'CRAM-MD5', + 'digest-md5' => 'DIGEST-MD5'), + 'default' => 'none'), + '$pop_before_smtp' => array( 'name' => _("POP3 Before SMTP?"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'default' => false ), '$skip_SM_header' => array( 'name' => _("Hide SquirrelMail Header"), 'type' => SMOPT_TYPE_BOOLEAN ), '$invert_time' => array( 'name' => _("Invert Time"), @@ -197,9 +197,9 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"), 'type' => SMOPT_TYPE_BOOLEAN ), '$delete_folder' => array( 'name' => _("Auto delete folders"), 'type' => SMOPT_TYPE_BOOLEAN ), - '$noselect_fix_enable' => array( 'name' => _("Enable /NoSelect folder fix"), - 'type' => SMOPT_TYPE_BOOLEAN, - 'default' => false), + '$noselect_fix_enable' => array( 'name' => _("Enable /NoSelect folder fix"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'default' => false), /* --------------------------------------------------------*/ 'Group4' => array( 'name' => _("General Options"), 'type' => SMOPT_TYPE_TITLE ), @@ -231,17 +231,23 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"), 'type' => SMOPT_TYPE_BOOLEAN ), '$edit_name' => array( 'name' => _("Allow editing of full name"), 'type' => SMOPT_TYPE_BOOLEAN ), - '$allow_server_sort' => array( 'name' => _("Use server-side sorting"), - 'type' => SMOPT_TYPE_BOOLEAN, - 'default' => false ), - '$allow_thread_sort' => array( 'name' => _("Use server-side thread sorting"), - 'type' => SMOPT_TYPE_BOOLEAN, - 'default' => false ), - '$allow_charset_search' => array( 'name' => _("Allow server charset search"), - 'type' => SMOPT_TYPE_BOOLEAN, - 'default' => false ), - '$session_name' => array( 'name' => _("PHP session name"), - 'type' => SMOPT_TYPE_HIDDEN ), + '$allow_server_sort' => array( 'name' => _("Use server-side sorting"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'default' => false ), + '$allow_thread_sort' => array( 'name' => _("Use server-side thread sorting"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'default' => false ), + '$allow_charset_search' => array( 'name' => _("Allow server charset search"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'default' => false ), + '$allow_advanced_search' => array( 'name' => _("Search functions"), + 'type' => SMOPT_TYPE_NUMLIST, + 'posvals' => array( 0 => _("Only basic search"), + 1 => _("Only advanced search"), + 2 => _("Both search functions") ), + 'default' => 0 ), + '$session_name' => array( 'name' => _("PHP session name"), + 'type' => SMOPT_TYPE_HIDDEN ), /* --------------------------------------------------------*/ 'Group5' => array( 'name' => _("Message of the Day"), 'type' => SMOPT_TYPE_TITLE ), @@ -290,12 +296,11 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"), 'type' => SMOPT_TYPE_BOOLEAN ), 'Group9' => array( 'name' => _("Language settings"), 'type' => SMOPT_TYPE_TITLE ), - '$squirrelmail_default_language' => array( 'name' => _("Default Language"), + '$squirrelmail_default_language' => array( 'name' => _("Default Language"), 'type' => SMOPT_TYPE_STRLIST, 'size' => 7, 'posvals' => $language_values ), - - '$default_charset' => array( 'name' => _("Default Charset"), + '$default_charset' => array( 'name' => _("Default Charset"), 'type' => SMOPT_TYPE_STRLIST, 'posvals' => array( 'iso-8859-1' => 'iso-8859-1', 'iso-8859-2' => 'iso-8859-2', @@ -307,40 +312,40 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"), 'euc-KR' => 'euc-KR', 'windows-1251' => 'windows-1251', 'ISO-2022-JP' => 'ISO-2022-JP' ) ), - '$show_alternative_names' => array( 'name' => _("Show alternative language names"), - 'type' => SMOPT_TYPE_BOOLEAN ), - '$available_languages' => array( 'name' => _("Available languages"), - 'type' => SMOPT_TYPE_STRING, - 'size' => 40 ), - '$agresive_decoding' => array( 'name' => _("Use agresive decoding"), - 'type' => SMOPT_TYPE_BOOLEAN ), + '$show_alternative_names' => array( 'name' => _("Show alternative language names"), + 'type' => SMOPT_TYPE_BOOLEAN ), + '$available_languages' => array( 'name' => _("Available languages"), + 'type' => SMOPT_TYPE_STRING, + 'size' => 40 ), + '$agresive_decoding' => array( 'name' => _("Use agresive decoding"), + 'type' => SMOPT_TYPE_BOOLEAN ), 'Group10' => array( 'name' => _("Tweaks"), - 'type' => SMOPT_TYPE_TITLE ), - '$advanced_tree' => array( 'name' => _("Use advanced tree folder listing"), - 'type' => SMOPT_TYPE_BOOLEAN ), - '$oldway' => array( 'name' => _("Use old folder listing functions"), - 'type' => SMOPT_TYPE_BOOLEAN ), - '$use_icons' => array( 'name' => _("Use icons"), - 'type' => SMOPT_TYPE_BOOLEAN ), - '$use_php_recode' => array( 'name' => _("Use php recode functions"), - 'type' => SMOPT_TYPE_BOOLEAN ), - '$use_php_iconv' => array( 'name' => _("Use php iconv functions"), - 'type' => SMOPT_TYPE_BOOLEAN ), + 'type' => SMOPT_TYPE_TITLE ), + '$advanced_tree' => array( 'name' => _("Use advanced tree folder listing"), + 'type' => SMOPT_TYPE_BOOLEAN ), + '$oldway' => array( 'name' => _("Use old folder listing functions"), + 'type' => SMOPT_TYPE_BOOLEAN ), + '$use_icons' => array( 'name' => _("Use icons"), + 'type' => SMOPT_TYPE_BOOLEAN ), + '$use_php_recode' => array( 'name' => _("Use php recode functions"), + 'type' => SMOPT_TYPE_BOOLEAN ), + '$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") ), + '$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' => '', - 'type' => SMOPT_TYPE_HIDDEN ), + '$no_list_for_subscribe' => array( 'name' => '', + 'type' => SMOPT_TYPE_HIDDEN ), /* --------------------------------------------------------*/ ); -- 2.25.1