X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=include%2Foptions%2Fcompose.php;h=5a475a01fb6250ce29bef2a2add4786e34e6656c;hp=1b6ce41914ba65711a98c0263acd7635e02e1a0d;hb=77a1e3d10b0fe8a81bd645e3797d425839592954;hpb=e4835cf2091559618969be69c9bd745d6cc1fb20

diff --git a/include/options/compose.php b/include/options/compose.php
index 1b6ce419..5a475a01 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-2007 The SquirrelMail Project Team
+ * @copyright 1999-2022 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,6 +118,13 @@ 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'    => 'do_not_reply_to_self',
+        'caption' => _("Send Replies To My Own Messages To Previous Recipient"),
+        '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"),
@@ -114,6 +132,13 @@ function load_optpage_data_compose() {
         'refresh' => SMOPT_REFRESH_NONE
     );
 
+    $optvals[SMOPT_GRP_COMPOSE_REPLY][] = array(
+        'name'    => 'return_to_message_after_reply',
+        'caption' => _("Return to Original Message After Replying"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
     $optvals[SMOPT_GRP_COMPOSE_REPLY][] = array(
         'name'    => 'sig_first',
         'caption' => _("Prepend Signature before Reply/Forward Text"),