Updated 'action' to be 'smaction' so that plugins can modify the action of

forms.  This was suggested for the gpg plugin, but might be useful elsewhere.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5391 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/compose.php b/src/compose.php
index d4a669d8f72e702e19d7fe339388370864d25b17..5211cf68c9d5c6d3f12c22574bf29c743187d608 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -46,7 +46,7 @@ sqgetGlobalVar('composesession',    $composesession,    SQ_SESSION);
 sqgetGlobalVar('compose_messages',  $compose_messages,  SQ_SESSION);
 
 /** SESSION/POST/GET VARS */
 sqgetGlobalVar('compose_messages',  $compose_messages,  SQ_SESSION);
 
 /** SESSION/POST/GET VARS */

-sqgetGlobalVar('action',$action);
+sqgetGlobalVar('smaction',$action);

 sqgetGlobalVar('session',$session);
 sqgetGlobalVar('mailbox',$mailbox);
 if(!sqgetGlobalVar('identity',$identity)) {
 sqgetGlobalVar('session',$session);
 sqgetGlobalVar('mailbox',$mailbox);
 if(!sqgetGlobalVar('identity',$identity)) {


@@ -1105,7 +1105,7 @@ function showInputForm ($session, $values=false) {
 
     echo '</TABLE>' . "\n" .
          '<input type="hidden" name="username" value="'. $username . "\">\n" .
 
     echo '</TABLE>' . "\n" .
          '<input type="hidden" name="username" value="'. $username . "\">\n" .

-         '<input type=hidden name=action value="' . $action . "\">\n" .
+         '<input type=hidden name=smaction value="' . $action . "\">\n" .

          '<INPUT TYPE=hidden NAME=mailbox VALUE="' . htmlspecialchars($mailbox) .
          "\">\n";
     /*
          '<INPUT TYPE=hidden NAME=mailbox VALUE="' . htmlspecialchars($mailbox) .
          "\">\n";
     /*

diff --git a/src/read_body.php b/src/read_body.php
index f5e79510457b7a65fc9c83c3f535cdf64e1bc9a5..3838988c724cedd2141b497c5486bbe6849fb6fe 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -506,10 +506,10 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
                             (isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:'');
 
     if (($mailbox == $draft_folder) && ($save_as_draft)) {
                             (isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:'');
 
     if (($mailbox == $draft_folder) && ($save_as_draft)) {

-        $comp_alt_uri = $comp_uri . '&action=draft';
+        $comp_alt_uri = $comp_uri . '&smaction=draft';

         $comp_alt_string = _("Resume Draft");
     } else if (handleAsSent($mailbox)) {
         $comp_alt_string = _("Resume Draft");
     } else if (handleAsSent($mailbox)) {

-        $comp_alt_uri = $comp_uri . '&action=edit_as_new';
+        $comp_alt_uri = $comp_uri . '&smaction=edit_as_new';

         $comp_alt_string = _("Edit Message as New");
     }
     if (isset($comp_alt_uri)) {
         $comp_alt_string = _("Edit Message as New");
     }
     if (isset($comp_alt_uri)) {


@@ -581,20 +581,20 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
 
     $s .= '</small></td>' . "\n" . 
           html_tag( 'td', '', 'right', '', 'width="33%" nowrap' ) . '<small>';
 
     $s .= '</small></td>' . "\n" . 
           html_tag( 'td', '', 'right', '', 'width="33%" nowrap' ) . '<small>';

-    $comp_action_uri = $comp_uri . '&amp;action=forward';
+    $comp_action_uri = $comp_uri . '&amp;smaction=forward';

     $s .= makeComposeLink($comp_action_uri, _("Forward"));
 
     if ($enable_forward_as_attachment) {
     $s .= makeComposeLink($comp_action_uri, _("Forward"));
 
     if ($enable_forward_as_attachment) {

-        $comp_action_uri = $comp_uri . '&amp;action=forward_as_attachment';
+        $comp_action_uri = $comp_uri . '&amp;smaction=forward_as_attachment';

         $s .= $topbar_delimiter;
         $s .= makeComposeLink($comp_action_uri, _("Forward as Attachment"));
     }
 
         $s .= $topbar_delimiter;
         $s .= makeComposeLink($comp_action_uri, _("Forward as Attachment"));
     }
 

-    $comp_action_uri = $comp_uri . '&amp;action=reply';
+    $comp_action_uri = $comp_uri . '&amp;smaction=reply';

     $s .= $topbar_delimiter;
     $s .= makeComposeLink($comp_action_uri, _("Reply"));
 
     $s .= $topbar_delimiter;
     $s .= makeComposeLink($comp_action_uri, _("Reply"));
 

-    $comp_action_uri = $comp_uri . '&amp;action=reply_all';
+    $comp_action_uri = $comp_uri . '&amp;smaction=reply_all';

     $s .= $topbar_delimiter;
     $s .= makeComposeLink($comp_action_uri, _("Reply All"));
     $s .= '</small></td></tr></table>';
     $s .= $topbar_delimiter;
     $s .= makeComposeLink($comp_action_uri, _("Reply All"));
     $s .= '</small></td></tr></table>';