X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=templates%2Fdefault%2Fmessage_list_controls.tpl;h=39dc38328f78ee7d1b79fc592e55928526499941;hp=bd650ed2c130e34183859c1a02fdd095081eef4e;hb=c4faef335b2362c81b8ebf026d4066c12d70536c;hpb=69a023cff70c943d30c800d301204c82a99b9bba

diff --git a/templates/default/message_list_controls.tpl b/templates/default/message_list_controls.tpl
index bd650ed2..39dc3832 100644
--- a/templates/default/message_list_controls.tpl
+++ b/templates/default/message_list_controls.tpl
@@ -49,7 +49,8 @@
  *    $trash_folder
  *    $sent_folder
  *    $draft_folder
- *    $thread_link_str
+ *    $thread_link_uri
+ *    $thread_name
  *    $php_self
  *    $mailbox
  *    $enablesort
@@ -62,7 +63,7 @@
  *    $compact_paginator
  *    $aErrors
  *
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2020 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -85,16 +86,33 @@ extract($t);
             switch ($widget_attrs['type']) {
             case 'submit':
                 if ($widget_name != 'moveButton' && $widget_name != 'copyButton' && $widget_name != 'delete' && $widget_name != 'undeleteButton') { // add these later in another table cell
-                    echo '<input type="submit" name="' . $widget_name . '" value="' . $widget_attrs['value'] . '" class="message_control_button" />&nbsp;';
+                    echo '<input type="submit" name="' . $widget_name . '" value="' . $widget_attrs['value'] . '" class="message_control_button"';
+                    if (isset($widget_attrs['accesskey'])
+                      && $widget_attrs['accesskey'] != 'NONE')
+                        echo ' accesskey="' . $widget_attrs['accesskey'] . '"';
+                    if (!empty($widget_attrs['extra_attrs'])) {
+                        foreach ($widget_attrs['extra_attrs'] as $attr => $val) {
+                            echo ' ' . $attr . '="' . $val . '"';
+                        }
+                    }
+                    echo ' />&nbsp;';
                 }
                 break;
             case 'checkbox':
                 if ($widget_name != 'bypass_trash') {
-                    echo '<input type="checkbox" name="' . $widget_name . '" id="' . $widget_name . '" /><label for="' . $widget_name . '">' . $widget_attrs['value'] . '</label>&nbsp;';
+                    echo '<input type="checkbox" name="' . $widget_name . '" id="' . $widget_name . '"';
+                    if ($widget_attrs['accesskey'] != 'NONE')
+                        echo ' accesskey="' . $widget_attrs['accesskey'] . '"';
+                    if (!empty($widget_attrs['extra_attrs'])) {
+                        foreach ($widget_attrs['extra_attrs'] as $attr => $val) {
+                            echo ' ' . $attr . '="' . $val . '"';
+                        }
+                    }
+                    echo ' /><label for="' . $widget_name . '">' . $widget_attrs['value'] . '</label>&nbsp;';
                 }
                 break;
             case 'hidden':
-                echo '<input type="hidden" name="'.$widget_name.'" value="'. $widget_attrs['value']."\">\n";
+                echo '<input type="hidden" name="'.$widget_name.'" value="'. $widget_attrs['value']."\" />";
                 break;
             default: break;
             }
@@ -104,12 +122,12 @@ extract($t);
               <td class="message_control_delete">
 <?php
         if (isset($aFormElements['delete'])) {
-            echo '<input type="submit" name="delete" value="' . $aFormElements['delete']['value'] . '" class="message_control_button" />&nbsp;';
+            echo '<input type="submit" name="delete" value="' . $aFormElements['delete']['value'] . '" class="message_control_button" ' . ($aFormElements['delete']['accesskey'] != 'NONE' ? 'accesskey="' . $aFormElements['delete']['accesskey'] . '" ' : '') . '/>&nbsp;';
             if (isset($aFormElements['bypass_trash'])) {
-                echo '<input type="checkbox" name="bypass_trash" id="bypass_trash" /><label for="bypass_trash">' . $aFormElements['bypass_trash']['value'] . '</label>&nbsp;';
+                echo '<input type="checkbox" name="bypass_trash" id="bypass_trash" ' . ($aFormElements['bypass_trash']['accesskey'] != 'NONE' ? 'accesskey="' . $aFormElements['bypass_trash']['accesskey'] . '" ' : '') . '/><label for="bypass_trash">' . $aFormElements['bypass_trash']['value'] . '</label>&nbsp;';
             }
             if (isset($aFormElements['undeleteButton'])) {
-                echo '<input type="submit" name="undeleteButton" value="' . $aFormElements['undeleteButton']['value'] . '" class="message_control_button" />&nbsp;';
+                echo '<input type="submit" name="undeleteButton" value="' . $aFormElements['undeleteButton']['value'] . '" class="message_control_button" ' . ($aFormElements['undeleteButton']['accesskey'] != 'NONE' ? 'accesskey="' . $aFormElements['undeleteButton']['accesskey'] . '" ' : '') . '/>&nbsp;';
             }
 ?>
 
@@ -120,15 +138,15 @@ extract($t);
         if (isset($aFormElements['moveButton']) || isset($aFormElements['copyButton'])) {
 ?>
               <td class="message_control_move">
-                    <select name="targetMailbox">
+                    <select name="targetMailbox"<?php if ($aFormElements['targetMailbox']['accesskey'] != 'NONE') echo ' accesskey="' . $aFormElements['targetMailbox']['accesskey'] . '"'; ?>>
                        <?php echo $aFormElements['targetMailbox']['options_list'];?>
                     </select>
 <?php
             if (isset($aFormElements['moveButton'])) {
-                echo '<input type="submit" name="moveButton" value="' . $aFormElements['moveButton']['value'] . '" class="message_control_button" />';
+                echo '<input type="submit" name="moveButton" value="' . $aFormElements['moveButton']['value'] . '" class="message_control_button" ' . ($aFormElements['moveButton']['accesskey'] != 'NONE' ? 'accesskey="' . $aFormElements['moveButton']['accesskey'] . '" ' : '') . '/>';
             }
             if (isset($aFormElements['copyButton'])) {
-                echo '<input type="submit" name="copyButton" value="' . $aFormElements['copyButton']['value'] . '" class="message_control_button" />';
+                echo '<input type="submit" name="copyButton" value="' . $aFormElements['copyButton']['value'] . '" class="message_control_button" ' . ($aFormElements['copyButton']['accesskey'] != 'NONE' ? 'accesskey="' . $aFormElements['copyButton']['accesskey'] . '" ' : '') . '/>';
             }
 ?>