X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=include%2Foptions%2Ffolder.php;h=b09abcb9719641de566680d5c86d4d9e96bb87ea;hb=91c27aee3c2f6c883b2996827567999e291cfd19;hp=0a7a81d0f15fc10005d72f48dd734568ab7f9d78;hpb=2b64659747776ed791389955cc915cfb7f0b89b2;p=squirrelmail.git diff --git a/include/options/folder.php b/include/options/folder.php index 0a7a81d0..b09abcb9 100644 --- a/include/options/folder.php +++ b/include/options/folder.php @@ -3,12 +3,12 @@ /** * options_folder.php * - * Copyright (c) 1999-2003 The SquirrelMail Project Team + * Copyright (c) 1999-2005 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * Displays all options relating to folders * - * $Id$ + * @version $Id$ * @package squirrelmail */ @@ -16,12 +16,24 @@ require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/imap_general.php'); -/* Define the group constants for the folder options page. */ +/* Define the group constants for the folder options page. */ define('SMOPT_GRP_SPCFOLDER', 0); define('SMOPT_GRP_FOLDERLIST', 1); define('SMOPT_GRP_FOLDERSELECT', 2); -/* Define the optpage load function for the folder options page. */ +/** + * This function builds an array with all the information about + * the options available to the user, and returns it. The options + * are grouped by the groups in which they are displayed. + * For each option, the following information is stored: + * - name: the internal (variable) name + * - caption: the description of the option in the UI + * - type: one of SMOPT_TYPE_* + * - refresh: one of SMOPT_REFRESH_* + * - size: one of SMOPT_SIZE_* + * - save: the name of a function to call when saving this option + * @return array all option information + */ function load_optpage_data_folder() { global $username, $key, $imapServerAddress, $imapPort; global $folder_prefix, $default_folder_prefix, $show_prefix_option; @@ -64,7 +76,18 @@ function load_optpage_data_folder() { 'posvals' => $trash_folder_values, 'save' => 'save_option_trash_folder' ); - + + $draft_folder_values = array(SMPREF_NONE => '[ '._("Do not use Drafts").' ]', + 'whatever' => $boxes); + $optvals[SMOPT_GRP_SPCFOLDER][] = array( + 'name' => 'draft_folder', + 'caption' => _("Draft Folder"), + 'type' => SMOPT_TYPE_FLDRLIST, + 'refresh' => SMOPT_REFRESH_FOLDERLIST, + 'posvals' => $draft_folder_values, + 'save' => 'save_option_draft_folder' + ); + $sent_folder_values = array(SMPREF_NONE => '[ '._("Do not use Sent").' ]', 'whatever' => $boxes); $optvals[SMOPT_GRP_SPCFOLDER][] = array( @@ -75,16 +98,12 @@ function load_optpage_data_folder() { 'posvals' => $sent_folder_values, 'save' => 'save_option_sent_folder' ); - - $draft_folder_values = array(SMPREF_NONE => '[ '._("Do not use Drafts").' ]', - 'whatever' => $boxes); + $optvals[SMOPT_GRP_SPCFOLDER][] = array( - 'name' => 'draft_folder', - 'caption' => _("Draft Folder"), - 'type' => SMOPT_TYPE_FLDRLIST, - 'refresh' => SMOPT_REFRESH_FOLDERLIST, - 'posvals' => $draft_folder_values, - 'save' => 'save_option_draft_folder' + 'name' => 'save_reply_with_orig', + 'caption' => _("Save Replies with Original Message"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'refresh' => SMOPT_REFRESH_FOLDERLIST ); /*** Load the General Options into the array ***/ @@ -112,15 +131,12 @@ function load_optpage_data_folder() { 'posvals' => $left_size_values ); - $minute_str = _("Minutes"); $left_refresh_values = array(SMPREF_NONE => _("Never")); - foreach (array(30,60,120,180,300,600) as $lr_val) { + foreach (array(30,60,120,180,300,600,1200) as $lr_val) { if ($lr_val < 60) { $left_refresh_values[$lr_val] = "$lr_val " . _("Seconds"); - } else if ($lr_val == 60) { - $left_refresh_values[$lr_val] = "1 " . _("Minute"); } else { - $left_refresh_values[$lr_val] = ($lr_val/60) . " $minute_str"; + $left_refresh_values[$lr_val] = sprintf(ngettext("%d Minute","%d Minutes",($lr_val/60)),($lr_val/60)); } } $optvals[SMOPT_GRP_FOLDERLIST][] = array( @@ -147,7 +163,7 @@ function load_optpage_data_folder() { 'type' => SMOPT_TYPE_STRLIST, 'refresh' => SMOPT_REFRESH_FOLDERLIST, 'posvals' => array(SMPREF_UNSEEN_ONLY => _("Only Unseen"), - SMPREF_UNSEEN_TOTAL => _("Unseen and Total")) + SMPREF_UNSEEN_TOTAL => _("Unseen and Total")) ); $optvals[SMOPT_GRP_FOLDERLIST][] = array( @@ -170,23 +186,15 @@ function load_optpage_data_folder() { 'caption' => _("Show Clock on Folders Panel"), 'type' => SMOPT_TYPE_STRLIST, 'refresh' => SMOPT_REFRESH_FOLDERLIST, - 'posvals' => array( '1' => 'MM/DD/YY HH:MM', - '2' => 'DD/MM/YY HH:MM', + 'posvals' => array( '0' => _("International date and time"), + '1' => _("American date and time"), + '2' => _("European date and time"), '3' => _("Show weekday and time"), '4' => _("Show time with seconds"), '5' => _("Show time"), '6' => _("No Clock")), ); - $optvals[SMOPT_GRP_FOLDERLIST][] = array( - 'name' => 'hour_format', - 'caption' => _("Hour Format"), - 'type' => SMOPT_TYPE_STRLIST, - 'refresh' => SMOPT_REFRESH_FOLDERLIST, - 'posvals' => array(SMPREF_TIME_12HR => _("12-hour clock"), - SMPREF_TIME_24HR => _("24-hour clock")) - ); - $optvals[SMOPT_GRP_FOLDERLIST][] = array( 'name' => 'search_memory', 'caption' => _("Memory Search"), @@ -204,6 +212,12 @@ function load_optpage_data_folder() { 9 => '9') ); + $optvals[SMOPT_GRP_FOLDERLIST][] = array( + 'name' => 'show_only_subscribed_folders', + 'caption' => _("Show only subscribed folders"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'refresh' => SMOPT_REFRESH_FOLDERLIST + ); /*** Load the General Options into the array ***/ $optgrps[SMOPT_GRP_FOLDERSELECT] = _("Folder Selection Options"); @@ -217,7 +231,8 @@ function load_optpage_data_folder() { 'refresh' => SMOPT_REFRESH_NONE, 'posvals' => array( 0 => _("Long: ") . '"' . _("Folder") . $delim . _("Subfolder") . '"', 1 => _("Indented: ") . '"    ' . _("Subfolder") . '"', - 2 => _("Delimited: ") . '". ' . _("Subfolder") . '"') + 2 => _("Delimited: ") . '". ' . _("Subfolder") . '"'), + 'htmlencoded' => true ); /* Assemble all this together and return it as our result. */ @@ -232,6 +247,10 @@ function load_optpage_data_folder() { /******************************************************************/ /** Define any specialized save functions for this option page. ***/ /******************************************************************/ + +/** + * Saves the trash folder option. + */ function save_option_trash_folder($option) { global $data_dir, $username; @@ -243,6 +262,9 @@ function save_option_trash_folder($option) { save_option($option); } +/** + * Saves the sent folder option. + */ function save_option_sent_folder($option) { global $data_dir, $username; @@ -254,6 +276,9 @@ function save_option_sent_folder($option) { save_option($option); } +/** + * Saves the draft folder option. + */ function save_option_draft_folder($option) { global $data_dir, $username;