replace reserved word 'action' with 'encaction'

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

diff --git a/plugins/squirrelspell/js/crypto_settings.js b/plugins/squirrelspell/js/crypto_settings.js
index f5dfd2fede057a46d320ecb413a5608d7ce16566..a60696e8911071fdc8f2fbf9b5fec9b03d53d588 100644 (file)
--- a/plugins/squirrelspell/js/crypto_settings.js
+++ b/plugins/squirrelspell/js/crypto_settings.js
@@ -4,7 +4,7 @@
  * Some client-side checks. Nothing fancy.
  *
  * @author Konstantin Riabitsev <icon at duke.edu>
- * @copyright &copy; 2001-2006 The SquirrelMail Project Team
+ * @copyright &copy; 2001-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  */
@@ -18,9 +18,9 @@ function checkMe(){
     alert (ui_makesel);
     return false;
   }
-  if (document.forms[0].action.value=="encrypt")
+  if (document.forms[0].encaction.value=="encrypt")
     cmsg=ui_encrypt;
-  if (document.forms[0].action.value=="decrypt")
+  if (document.forms[0].encaction.value=="decrypt")
     cmsg=ui_decrypt;
   return confirm(cmsg);
-}
\ No newline at end of file
+}

diff --git a/plugins/squirrelspell/modules/crypto.mod b/plugins/squirrelspell/modules/crypto.mod
index 4d2078e61f01995795f9f4e5e14fc7187bc59daf..cbee73a04732362482e02617cdee141503be1d3d 100644 (file)
--- a/plugins/squirrelspell/modules/crypto.mod
+++ b/plugins/squirrelspell/modules/crypto.mod
@@ -23,7 +23,7 @@ global $SQSPELL_CRYPTO;
 
 $langs=sqspell_getSettings();
 
-if (! sqgetGlobalVar('action', $crypt_action, SQ_POST)) {
+if (! sqgetGlobalVar('encaction', $crypt_action, SQ_POST)) {
     $crypt_action = 'noaction';
 }
 

diff --git a/plugins/squirrelspell/modules/enc_setup.mod b/plugins/squirrelspell/modules/enc_setup.mod
index 8805a8b157437b5e9de0716bd9f96731e750e4bd..09b6c7b9ceffa2bef37b5ba4bec51b29d150b742 100644 (file)
--- a/plugins/squirrelspell/modules/enc_setup.mod
+++ b/plugins/squirrelspell/modules/enc_setup.mod
@@ -60,7 +60,7 @@ if ($crypted){
         . '</p>'
         . '<form method="post" onsubmit="return checkMe()">'
         . '<input type="hidden" name="MOD" value="crypto" />'
-        . '<p align="center"><input type="checkbox" name="action" '
+        . '<p align="center"><input type="checkbox" name="encaction" '
         . 'value="decrypt" id="action_decrypt" /> <label for="action_decrypt">'
         . _("Please decrypt my personal dictionary and store it in a clear-text format." )
         . '</label></p>'
@@ -85,7 +85,7 @@ if ($crypted){
         . '</p>'
         . '<form method="post" onsubmit="return checkMe()">'
         . '<input type="hidden" name="MOD" value="crypto" />'
-        . '<p align="center"><input type="checkbox" name="action" '
+        . '<p align="center"><input type="checkbox" name="encaction" '
         . 'value="encrypt" id="action_encrypt" /> <label for="action_encrypt">'
         . _("Please encrypt my personal dictionary and store it in an encrypted format.")
         . '</label></p>'