X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2Fdefault_advanced%2Fread_menubar_buttons.tpl;h=5f3f180f9926c363cecb1a05e2e770863643d7f0;hb=ba6d2a963accba3b98fff1d9acb5f1626705d832;hp=152dad4c9a4fd16ed006d50eb13b177adb78891d;hpb=a3c4ab30ff27907288487990b370f8d0471a7816;p=squirrelmail.git

diff --git a/templates/default_advanced/read_menubar_buttons.tpl b/templates/default_advanced/read_menubar_buttons.tpl
index 152dad4c..5f3f180f 100644
--- a/templates/default_advanced/read_menubar_buttons.tpl
+++ b/templates/default_advanced/read_menubar_buttons.tpl
@@ -39,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 © 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2011 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id: read_menubar_buttons.tpl 11850 2006-10-06 21:57:26Z stevetruckstuff $
  * @package squirrelmail
@@ -54,15 +63,7 @@
 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 here 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).*/
-
+/*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 here 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).*/
 
 /** preview pane prep */
 global $data_dir, $username, $base_uri;
@@ -103,14 +104,14 @@ if ($nav_on_top) {
             <?php
         }
     ?>
-    <input type="submit" name="smaction_reply" value="<?php echo _("Reply"); ?>" onclick="<?php echo $button_onclick; ?>" />&nbsp;
-    <input type="submit" name="smaction_reply_all" value="<?php echo _("Reply All"); ?>" onclick="<?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"); ?>" onclick="<?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
     }
@@ -121,10 +122,11 @@ 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 
+     <input type="submit" name="delete" <?php if ($accesskey_read_msg_delete != 'NONE') echo 'accesskey="' . $accesskey_read_msg_delete . '" '; ?>value="<?php 
 
 echo _("Delete") .'"';
 
@@ -135,7 +137,7 @@ if ($show_preview_pane && $pp_refresh_message_list)
 
 echo ' />'; ?>
 
-     <input type="checkbox" name="bypass_trash" id="bypass_trash" /><label for="bypass_trash"><?php echo _("Bypass Trash"); ?></label>
+     <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
@@ -147,18 +149,19 @@ echo ' />'; ?>
    <?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 
+     <input type="submit" name="moveButton" <?php if ($accesskey_read_msg_move != 'NONE') echo 'accesskey="' . $accesskey_read_msg_move . '" '; ?>value="<?php 
 
 echo _("Move") . '"'; 
 
@@ -172,7 +175,7 @@ echo ' />';
 
         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
         }
      ?>