X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=include%2Foptions%2Fcompose.php;h=1b26f69910724ff4a73e4d268ee92110885a1797;hp=b6064a9b1d0d3aae91d05331c17ac24b7b096d13;hb=ae5dddc065f9501f267c4edaf68a066835da915f;hpb=4b4abf93a9624311afef0c385023724ee46a2b60

diff --git a/include/options/compose.php b/include/options/compose.php
index b6064a9b..1b26f699 100644
--- a/include/options/compose.php
+++ b/include/options/compose.php
@@ -5,7 +5,7 @@
  *
  * Displays all options concerning composing of new messages
  *
- * @copyright © 1999-2005 The SquirrelMail Project Team
+ * @copyright 1999-2011 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -71,11 +71,22 @@ 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"))
     );
 
 
@@ -107,13 +118,6 @@ function load_optpage_data_compose() {
     $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',
         'caption' => _("Include Me in CC when I Reply All"),
@@ -123,7 +127,7 @@ function load_optpage_data_compose() {
 
     $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
     );
@@ -185,4 +189,3 @@ function save_option_reply_prefix($option) {
     save_option($option);
 
 }
-?>
\ No newline at end of file