/**
* options_compose.php
*
- * Copyright (c) 1999-2005 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
* Displays all options concerning composing of new messages
*
+ * @copyright 1999-2010 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
/** Define the group constants for this options page. */
-define('SMOPT_GRP_GENERAL', 0);
+define('SMOPT_GRP_COMPOSE', 0);
+define('SMOPT_GRP_COMPOSE_REPLY', 1);
/**
* This function builds an array with all the information about
/******************************************************/
/* LOAD EACH GROUP OF OPTIONS INTO THE OPTIONS ARRAY. */
/******************************************************/
-
- /*** Load the General Options into the array ***/
- $optgrps[SMOPT_GRP_GENERAL] = _("Message Composition");
- $optvals[SMOPT_GRP_GENERAL] = array();
- $optvals[SMOPT_GRP_GENERAL][] = array(
+ /*** Load the General Compose Options into the array ***/
+ $optgrps[SMOPT_GRP_COMPOSE] = _("General Message Composition");
+ $optvals[SMOPT_GRP_COMPOSE] = array();
+
+ $optvals[SMOPT_GRP_COMPOSE][] = array(
'name' => 'editor_size',
'caption' => _("Width of Editor Window"),
'type' => SMOPT_TYPE_INTEGER,
'size' => SMOPT_SIZE_TINY
);
- $optvals[SMOPT_GRP_GENERAL][] = array(
+ $optvals[SMOPT_GRP_COMPOSE][] = array(
'name' => 'editor_height',
'caption' => _("Height of Editor Window"),
'type' => SMOPT_TYPE_INTEGER,
'size' => SMOPT_SIZE_TINY
);
- $optvals[SMOPT_GRP_GENERAL][] = array(
+ $optvals[SMOPT_GRP_COMPOSE][] = array(
'name' => 'location_of_buttons',
'caption' => _("Location of Buttons when Composing"),
'type' => SMOPT_TYPE_STRLIST,
);
- $optvals[SMOPT_GRP_GENERAL][] = array(
+ $optvals[SMOPT_GRP_COMPOSE][] = array(
'name' => 'use_javascript_addr_book',
- 'caption' => _("Addressbook Display Format"),
+ 'caption' => _("Address Book Display Format"),
'type' => SMOPT_TYPE_STRLIST,
'refresh' => SMOPT_REFRESH_NONE,
- 'posvals' => array('1' => _("Javascript"),
- '0' => _("HTML"))
- );
-
- $optvals[SMOPT_GRP_GENERAL][] = array(
- 'name' => 'forward_cc',
- 'caption' => _("Include CCs when Forwarding Messages"),
- 'type' => SMOPT_TYPE_BOOLEAN,
- 'refresh' => SMOPT_REFRESH_NONE
+ 'posvals' => array('1' => _("Pop-up window"),
+ '0' => _("In-page"))
);
- $optvals[SMOPT_GRP_GENERAL][] = array(
- 'name' => 'include_self_reply_all',
- 'caption' => _("Include Me in CC when I Reply All"),
- 'type' => SMOPT_TYPE_BOOLEAN,
- 'refresh' => SMOPT_REFRESH_NONE
+
+ $optvals[SMOPT_GRP_COMPOSE][] = array(
+ 'name' => 'addrsrch_fullname',
+ 'caption' => _("Format of Addresses Added From Address Book"),
+ 'type' => SMOPT_TYPE_STRLIST,
+ 'refresh' => SMOPT_REFRESH_NONE,
+ 'posvals' => array('noprefix' => _("No prefix/Address only"),
+ 'nickname' => _("Nickname and address"),
+ 'fullname' => _("Full name and address"))
);
-
- $optvals[SMOPT_GRP_GENERAL][] = array(
+
+
+ $optvals[SMOPT_GRP_COMPOSE][] = array(
'name' => 'compose_new_win',
'caption' => _("Compose Messages in New Window"),
'type' => SMOPT_TYPE_BOOLEAN,
'refresh' => SMOPT_REFRESH_ALL
);
- $optvals[SMOPT_GRP_GENERAL][] = array(
+ $optvals[SMOPT_GRP_COMPOSE][] = array(
'name' => 'compose_width',
'caption' => _("Width of Compose Window"),
'type' => SMOPT_TYPE_INTEGER,
'size' => SMOPT_SIZE_TINY
);
- $optvals[SMOPT_GRP_GENERAL][] = array(
+ $optvals[SMOPT_GRP_COMPOSE][] = array(
'name' => 'compose_height',
'caption' => _("Height of Compose Window"),
'type' => SMOPT_TYPE_INTEGER,
'size' => SMOPT_SIZE_TINY
);
- $optvals[SMOPT_GRP_GENERAL][] = array(
+
+ /*** Load the General Options into the array ***/
+ $optgrps[SMOPT_GRP_COMPOSE_REPLY] = _("Replying and Forwarding Messages");
+ $optvals[SMOPT_GRP_COMPOSE_REPLY] = array();
+
+ $optvals[SMOPT_GRP_COMPOSE_REPLY][] = array(
+ 'name' => 'include_self_reply_all',
+ 'caption' => _("Include Me in CC when I Reply All"),
+ 'type' => SMOPT_TYPE_BOOLEAN,
+ 'refresh' => SMOPT_REFRESH_NONE
+ );
+
+ $optvals[SMOPT_GRP_COMPOSE_REPLY][] = array(
'name' => 'sig_first',
- 'caption' => _("Append Signature before Reply/Forward Text"),
+ 'caption' => _("Prepend Signature before Reply/Forward Text"),
'type' => SMOPT_TYPE_BOOLEAN,
'refresh' => SMOPT_REFRESH_NONE
);
- $optvals[SMOPT_GRP_GENERAL][] = array(
+ $optvals[SMOPT_GRP_COMPOSE_REPLY][] = array(
'name' => 'body_quote',
'caption' => _("Prefix for Original Message when Replying"),
'type' => SMOPT_TYPE_STRING,
'save' => 'save_option_reply_prefix'
);
- $optvals[SMOPT_GRP_GENERAL][] = array(
+ $optvals[SMOPT_GRP_COMPOSE_REPLY][] = array(
'name' => 'reply_focus',
'caption' => _("Cursor Position when Replying"),
'type' => SMOPT_TYPE_STRLIST,
'none' => _("No focus"))
);
- $optvals[SMOPT_GRP_GENERAL][] = array(
+ $optvals[SMOPT_GRP_COMPOSE_REPLY][] = array(
'name' => 'strip_sigs',
'caption' => _("Strip signature when replying"),
'type' => SMOPT_TYPE_BOOLEAN,
/******************************************************************/
/** Define any specialized save functions for this option page. ***/
+/** ***/
+/** You must add every function that is set in save parameter ***/
/******************************************************************/
-function save_option_header($option) {
-}
+/**
+ * This function saves the reply prefix (body_quote) character(s)
+ * @param object $option
+ */
+function save_option_reply_prefix($option) {
+ // save as "NONE" if it was blanked out
+ //
+ if (empty($option->new_value)) $option->new_value = 'NONE';
-?>
+
+ // Save the option like normal.
+ //
+ save_option($option);
+
+}