X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=include%2Foptions%2Ffolder.php;h=c383b247b76e28ca477e16a4e8b676589cc5fca1;hp=ea9c2b5e8ab45c87521bf373b3a9365ea99a80d0;hb=61d57ab2718ef04d537b2f4870d7b6a92066d8e0;hpb=6c84ba1ec45ab854c37b6f65c5b4d84ab1c7aad4 diff --git a/include/options/folder.php b/include/options/folder.php index ea9c2b5e..c383b247 100644 --- a/include/options/folder.php +++ b/include/options/folder.php @@ -3,18 +3,16 @@ /** * options_folder.php * - * 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 * + * @copyright © 1999-2009 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail */ /** SquirrelMail required files. */ -require_once(SM_PATH . 'functions/imap.php'); -require_once(SM_PATH . 'functions/imap_general.php'); +include(SM_PATH . 'functions/imap_general.php'); /* Define the group constants for the folder options page. */ define('SMOPT_GRP_SPCFOLDER', 0); @@ -35,12 +33,11 @@ define('SMOPT_GRP_FOLDERSELECT', 2); * @return array all option information */ function load_optpage_data_folder() { - global $username, $key, $imapServerAddress, $imapPort; - global $folder_prefix, $default_folder_prefix, $show_prefix_option; + global $username, $imapServerAddress, $imapPort, $oTemplate, $nbsp, + $folder_prefix, $default_folder_prefix, $show_prefix_option; /* Get some imap data we need later. */ - $imapConnection = - sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0); $boxes = sqimap_mailbox_list($imapConnection); /* Build a simple array into which we will build options. */ @@ -67,7 +64,7 @@ function load_optpage_data_folder() { } $trash_folder_values = array(SMPREF_NONE => '[ '._("Do not use Trash").' ]', - 'whatever' => $boxes); + 'ignore' => $boxes); $optvals[SMOPT_GRP_SPCFOLDER][] = array( 'name' => 'trash_folder', 'caption' => _("Trash Folder"), @@ -78,7 +75,7 @@ function load_optpage_data_folder() { ); $draft_folder_values = array(SMPREF_NONE => '[ '._("Do not use Drafts").' ]', - 'whatever' => $boxes); + 'ignore' => $boxes); $optvals[SMOPT_GRP_SPCFOLDER][] = array( 'name' => 'draft_folder', 'caption' => _("Draft Folder"), @@ -89,7 +86,7 @@ function load_optpage_data_folder() { ); $sent_folder_values = array(SMPREF_NONE => '[ '._("Do not use Sent").' ]', - 'whatever' => $boxes); + 'ignore' => $boxes); $optvals[SMOPT_GRP_SPCFOLDER][] = array( 'name' => 'sent_folder', 'caption' => _("Sent Folder"), @@ -99,6 +96,13 @@ function load_optpage_data_folder() { 'save' => 'save_option_sent_folder' ); + $optvals[SMOPT_GRP_SPCFOLDER][] = array( + 'name' => 'translate_special_folders', + 'caption' => _("Translate Special Folders"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'refresh' => SMOPT_REFRESH_FOLDERLIST + ); + $optvals[SMOPT_GRP_SPCFOLDER][] = array( 'name' => 'save_reply_with_orig', 'caption' => _("Save Replies with Original Message"), @@ -131,15 +135,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( @@ -198,15 +199,6 @@ function load_optpage_data_folder() { '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"), @@ -224,6 +216,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"); @@ -235,9 +233,13 @@ function load_optpage_data_folder() { 'caption' => _("Selection List Style"), 'type' => SMOPT_TYPE_STRLIST, 'refresh' => SMOPT_REFRESH_NONE, - 'posvals' => array( 0 => _("Long: ") . '"' . _("Folder") . $delim . _("Subfolder") . '"', - 1 => _("Indented: ") . '"    ' . _("Subfolder") . '"', - 2 => _("Delimited: ") . '". ' . _("Subfolder") . '"'), + 'posvals' => array( + SMPREF_MAILBOX_SELECT_LONG => + _("Long:") . ' "' . _("Folder") . $delim . _("Subfolder") . '"', + SMPREF_MAILBOX_SELECT_INDENTED => + _("Indented:") . " \"$nbsp$nbsp$nbsp$nbsp" . _("Subfolder") . '"', + SMPREF_MAILBOX_SELECT_DELIMITED => + _("Delimited:") . " \".$nbsp" . _("Subfolder") . '"'), 'htmlencoded' => true ); @@ -256,44 +258,63 @@ function load_optpage_data_folder() { /** * Saves the trash folder option. + * @param object $option SquirrelOption object + * @since 1.3.2 */ function save_option_trash_folder($option) { global $data_dir, $username; - /* Set move to trash on or off. */ - $trash_on = ($option->new_value == SMPREF_NONE ? SMPREF_OFF : SMPREF_ON); - setPref($data_dir, $username, 'move_to_trash', $trash_on); + if (strtolower($option->new_value)=='inbox') { + // make sure that it is not INBOX + error_option_save(_("You can't select INBOX as Trash folder.")); + } else { + /* Set move to trash on or off. */ + $trash_on = ($option->new_value == SMPREF_NONE ? SMPREF_OFF : SMPREF_ON); + setPref($data_dir, $username, 'move_to_trash', $trash_on); - /* Now just save the option as normal. */ - save_option($option); + /* Now just save the option as normal. */ + save_option($option); + } } /** * Saves the sent folder option. + * @param object $option SquirrelOption object + * @since 1.3.2 */ function save_option_sent_folder($option) { global $data_dir, $username; - /* Set move to sent on or off. */ - $sent_on = ($option->new_value == SMPREF_NONE ? SMPREF_OFF : SMPREF_ON); - setPref($data_dir, $username, 'move_to_sent', $sent_on); + if (strtolower($option->new_value)=='inbox') { + // make sure that it is not INBOX + error_option_save(_("You can't select INBOX as Sent folder.")); + } else { + /* Set move to sent on or off. */ + $sent_on = ($option->new_value == SMPREF_NONE ? SMPREF_OFF : SMPREF_ON); + setPref($data_dir, $username, 'move_to_sent', $sent_on); - /* Now just save the option as normal. */ - save_option($option); + /* Now just save the option as normal. */ + save_option($option); + } } /** * Saves the draft folder option. + * @param object $option SquirrelOption object + * @since 1.3.2 */ function save_option_draft_folder($option) { global $data_dir, $username; - /* Set move to draft on or off. */ - $draft_on = ($option->new_value == SMPREF_NONE ? SMPREF_OFF : SMPREF_ON); - setPref($data_dir, $username, 'save_as_draft', $draft_on); - - /* Now just save the option as normal. */ - save_option($option); + if (strtolower($option->new_value)=='inbox') { + // make sure that it is not INBOX + error_option_save(_("You can't select INBOX as Draft folder.")); + } else { + /* Set move to draft on or off. */ + $draft_on = ($option->new_value == SMPREF_NONE ? SMPREF_OFF : SMPREF_ON); + setPref($data_dir, $username, 'save_as_draft', $draft_on); + + /* Now just save the option as normal. */ + save_option($option); + } } - -?> \ No newline at end of file