X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2Fdefault%2Fread_menubar_buttons.tpl;h=780aae1583e78a21b9580a3d6234a8aa3c74a79a;hb=f2785d1147920588b40e8a34e3c980697e08748f;hp=3ea20d9b71c92faa851b1f22cf28df96d821bff6;hpb=3cb5a0bb0fc40e2f63e6d1434281df7fe54b441d;p=squirrelmail.git

diff --git a/templates/default/read_menubar_buttons.tpl b/templates/default/read_menubar_buttons.tpl
index 3ea20d9b..780aae15 100644
--- a/templates/default/read_menubar_buttons.tpl
+++ b/templates/default/read_menubar_buttons.tpl
@@ -17,10 +17,13 @@
  *    $view_msg_href - URL to go back to the main message.  Empty if N/A.
  *    $msg_list_href - URL to go to the message list.
  *    $search_href   - URL to go back to the serach results.  Empty if N/A.
- *    $form_extra    - Extra elements required by the forms to delete, move or copy
+ *    $form_extra    - Extra elements that will be added to the <form> tag verbatim
+ *    $form_method   - The value of the <form>'s method attribute (optional, may be blank)
+ *    $form_target   - The value of the <form>'s target attribute (optional, may be blank)
+ *    $form_onsubmit - The value of the <form>'s onsubmit handler (optional, may be blank)
  *    $compose_href  - Base URL to forward, reply, etc.  Note that a specific action
  *                     must also be given by the form or in this URL.
- *    $on_click      - Onclick event string for all buttons
+ *    $button_onclick - Onclick event string for all buttons
  *    $forward_as_attachment_enabled - boolean TRUE if forwarding as attachments
  *                     has been enabled.
  *    $can_resume_draft - boolean TRUE if the "resume draft" is legitimate for
@@ -36,9 +39,18 @@
  *    $delete_form_extra - additional input elements needed by the DELETE form
  *    $move_form_extra - additional input elements needed by the MOVE form.
  *    $last_move_target - the last folder that a message was moved/copied to. 
+ *    $accesskey_read_msg_reply        - The accesskey to be used for the Reply button
+ *    $accesskey_read_msg_reply_all    - The accesskey to be used for the Reply All button
+ *    $accesskey_read_msg_forward      - The accesskey to be used for the Forward button
+ *    $accesskey_read_msg_as_attach    - The accesskey to be used for the As Attachment checkbox
+ *    $accesskey_read_msg_delete       - The accesskey to be used for the Delete button
+ *    $accesskey_read_msg_bypass_trash - The accesskey to be used for the Bypass Trash checkbox
+ *    $accesskey_read_msg_move_to      - The accesskey to be used for the folder select list
+ *    $accesskey_read_msg_move         - The accesskey to be used for the Move button
+ *    $accesskey_read_msg_copy         - The accesskey to be used for the Copy button
  *    
  *
- * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2016 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -50,6 +62,8 @@
 /** extract template variables **/
 extract($t);
 
+/*FIXME: This is a place where Marc's idea for putting all the buttons and links and other widgets into an array is sorely needed instead of hard-coding everything.  Whomever implements that, PLEASE, PLEASE look at how the preview pane plugin code is used in this same template file for the *default_advanced* set to change some links and buttons and make sure your implementation can support it (tip: it may or may not be OK to let a plugin do the modification of the widgets, since a template set can turn on the needed plugin, but that might not be the most clear way to solve said issue).*/
+
 /** Begin template **/
 if ($nav_on_top) {
     $table_class = 'bottom';
@@ -63,27 +77,32 @@ if ($nav_on_top) {
 <table class="<?php echo $table_class; ?>" cellspacing="0">
  <tr class="buttons">
   <td class="buttons">
-   <form name="composeForm" action="<?php echo $compose_href; ?>" <?php echo $form_extra; ?> >
+   <form name="composeForm" action="<?php 
+                  echo $compose_href . '" '  
+                     . (!empty($form_method) ? 'method="' . $form_method . '" ' : '')
+                     . (!empty($form_target) ? 'target="' . $form_target . '" ' : '')
+                     . (!empty($form_onsubmit) ? 'onsubmit="' . $form_onsubmit . '" ' : '')
+                     . $form_extra; ?> >
    <small>
     <?php
         if ($can_resume_draft) {
             ?>
-    <input type="submit" name="smaction_draft" value="<?php echo _("Resume Draft"); ?>" <?php echo $button_onclick; ?> />&nbsp;
+    <input type="submit" name="smaction_draft" value="<?php echo _("Resume Draft"); ?>" onclick="<?php echo $button_onclick; ?>" />&nbsp;
             <?php
         } elseif ($can_edit_as_new) {
             ?>
-    <input type="submit" name="smaction_edit_new" value="<?php echo _("Edit Message as New"); ?>" <?php echo $button_onclick; ?> />&nbsp;
+    <input type="submit" name="smaction_edit_new" value="<?php echo _("Edit Message as New"); ?>" onclick="<?php echo $button_onclick; ?>" />&nbsp;
             <?php
         }
     ?>
-    <input type="submit" name="smaction_reply" value="<?php echo _("Reply"); ?>" <?php echo $button_onclick; ?> />&nbsp;
-    <input type="submit" name="smaction_reply_all" value="<?php echo _("Reply All"); ?>" <?php echo $button_onclick; ?> />
+    <input type="submit" name="smaction_reply" <?php if ($accesskey_read_msg_reply != 'NONE') echo 'accesskey="' . $accesskey_read_msg_reply . '" '; ?>value="<?php echo _("Reply"); ?>" onclick="<?php echo $button_onclick; ?>" />&nbsp;
+    <input type="submit" name="smaction_reply_all" <?php if ($accesskey_read_msg_reply_all != 'NONE') echo 'accesskey="' . $accesskey_read_msg_reply_all . '" '; ?>value="<?php echo _("Reply All"); ?>" onclick="<?php echo $button_onclick; ?>" />
     &nbsp;&nbsp;|&nbsp;&nbsp;
-    <input type="submit" name="smaction_forward" value="<?php echo _("Forward"); ?>" <?php echo $button_onclick; ?> />
+    <input type="submit" name="smaction_forward" <?php if ($accesskey_read_msg_forward != 'NONE') echo 'accesskey="' . $accesskey_read_msg_forward . '" '; ?>value="<?php echo _("Forward"); ?>" onclick="<?php echo $button_onclick; ?>" />
     <?php
     if ($forward_as_attachment_enabled) {
         ?>
-    <input type="checkbox" name="smaction_attache" id="smaction_attache">
+    <input type="checkbox" name="smaction_attache" id="smaction_attache" <?php if ($accesskey_read_msg_as_attach != 'NONE') echo 'accesskey="' . $accesskey_read_msg_as_attach . '" '; ?>/>
     <label for="smaction_attache"><?php echo _("As Attachment"); ?></label>
         <?php
     }
@@ -94,11 +113,12 @@ if ($nav_on_top) {
     <?php
     if ($can_be_deleted) {
         ?>
-    <form name="deleteMessageForm" action="<?php echo $move_delete_form_action; ?>" method="POST">
+    <form name="deleteMessageForm" action="<?php echo $move_delete_form_action; ?>" method="post">
+     <input type="hidden" name="smtoken" value="<?php echo sm_generate_security_token(); ?>" />
      <?php echo $delete_form_extra; ?>
      <small>
-     <input type="submit" name="delete" value="<?php echo _("Delete"); ?>" />
-     <input type="checkbox" name="bypass_trash" id="bypass_trash"><label for="bypass_trash"><?php echo _("Bypass Trash"); ?></label>
+     <input type="submit" name="delete" <?php if ($accesskey_read_msg_delete != 'NONE') echo 'accesskey="' . $accesskey_read_msg_delete . '" '; ?>value="<?php echo _("Delete"); ?>" />
+     <input type="checkbox" name="bypass_trash" id="bypass_trash" <?php if ($accesskey_read_msg_bypass_trash != 'NONE') echo 'accesskey="' . $accesskey_read_msg_bypass_trash . '" '; ?>/><label for="bypass_trash"><?php echo _("Bypass Trash"); ?></label>
      </small>
     </form>
         <?php
@@ -110,22 +130,23 @@ if ($nav_on_top) {
    <?php
     if ($can_be_moved) {
         ?>
-    <form name="moveMessageForm" action="<?php echo $move_delete_form_action; ?>" method="POST">
+    <form name="moveMessageForm" action="<?php echo $move_delete_form_action; ?>" method="post">
+     <input type="hidden" name="smtoken" value="<?php echo sm_generate_security_token(); ?>" />
      <?php echo $move_form_extra; ?>
      <small>
      <?php echo _("Move To"); ?>:
-     <select name="targetMailbox">
+     <select <?php if ($accesskey_read_msg_move_to != 'NONE') echo 'accesskey="' . $accesskey_read_msg_move_to . '" '; ?>name="targetMailbox">
      <?php
         foreach ($mailboxes as $value=>$option) {
             echo '<option value="'. $value .'"' . ($value==$last_move_target ? ' selected="selected"' : '').'>' . $option .'</option>'."\n";
         }
      ?>
      </select>
-     <input type="submit" name="moveButton" value="<?php echo _("Move"); ?>" />
+     <input type="submit" name="moveButton" <?php if ($accesskey_read_msg_move != 'NONE') echo 'accesskey="' . $accesskey_read_msg_move . '" '; ?>value="<?php echo _("Move"); ?>" />
      <?php
         if ($can_be_copied) {
             ?>
-     <input type="submit" name="copyButton" value="<?php echo _("Copy"); ?>" />
+     <input type="submit" name="copyButton" <?php if ($accesskey_read_msg_copy != 'NONE') echo 'accesskey="' . $accesskey_read_msg_copy . '" '; ?>value="<?php echo _("Copy"); ?>" />
             <?php
         }
      ?>