Enabled user selection of address format when adding from address book during message...

[squirrelmail.git] / include / options / compose.php

diff --git a/include/options/compose.php b/include/options/compose.php
index e10fdcaec838115ed8c6a77aa6568ae415497dea..dbc53c41b47c87e27b134003e5bb586cdf5018b0 100644 (file)
--- a/include/options/compose.php
+++ b/include/options/compose.php
@@ -3,11 +3,10 @@
 /**
  * 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-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
@@ -38,7 +37,7 @@ function load_optpage_data_compose() {
     /******************************************************/
     /* LOAD EACH GROUP OF OPTIONS INTO THE OPTIONS ARRAY. */
     /******************************************************/
-    
+
     /*** Load the General Compose Options into the array ***/
     $optgrps[SMOPT_GRP_COMPOSE] = _("General Message Composition");
     $optvals[SMOPT_GRP_COMPOSE] = array();
@@ -72,14 +71,25 @@ function load_optpage_data_compose() {
 
     $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"))
+        'posvals' => array('1' => _("Pop-up window"),
+                           '0' => _("In-page"))
     );
-    
-    
+
+
+    $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_COMPOSE][] = array(
         'name'    => 'compose_new_win',
         'caption' => _("Compose Messages in New Window"),
@@ -103,17 +113,10 @@ function load_optpage_data_compose() {
         'size'    => SMOPT_SIZE_TINY
     );
 
-    
+
     /*** 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'    => 'forward_cc',
-        'caption' => _("Include CCs when Forwarding Messages"),
-        'type'    => SMOPT_TYPE_BOOLEAN,
-        'refresh' => SMOPT_REFRESH_NONE
-    );
 
     $optvals[SMOPT_GRP_COMPOSE_REPLY][] = array(
         'name'    => 'include_self_reply_all',
@@ -121,10 +124,10 @@ function load_optpage_data_compose() {
         '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
     );
@@ -166,10 +169,23 @@ function load_optpage_data_compose() {
 
 /******************************************************************/
 /** 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);
+
+}