From a74cc55f6dac70af277001c2371f3a4ac941b554 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@vimperator.org>
Date: Thu, 24 Sep 2009 12:08:47 +0200
Subject: [PATCH] * Ask for permission when editing external password fields. *
 Bump maxVersion to 3.6b1

---
 common/content/editor.js | 14 +++++++++-----
 muttator/Donors          |  1 +
 vimperator/Donors        |  1 +
 vimperator/install.rdf   |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/common/content/editor.js b/common/content/editor.js
index 1b242968..31bdfd2f 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -885,7 +885,7 @@ function Editor() //{{{
         },
 
         // TODO: clean up with 2 functions for textboxes and currentEditor?
-        editFieldExternally: function ()
+        editFieldExternally: function (forceEditing)
         {
             if (!options["editor"])
                 return false;
@@ -894,11 +894,15 @@ function Editor() //{{{
             if (!(config.isComposeWindow))
                 textBox = liberator.focus;
 
-            if (textBox.type == "password")
+            if (!forceEditing && textBox && textBox.type == "password")
             {
-                liberator.beep();
-                liberator.echoerr("Cannot edit password fields");
-                return false;
+                commandline.input("Editing a password field externally will reveal the password. Would you like to continue? (yes/[no]): ",
+                    function (resp)
+                    {
+                        if (resp && resp.match(/^y(es)?$/i))
+                            return editor.editFieldExternally(true);
+                    });
+                    return;
             }
 
             let text = ""; // XXX
diff --git a/muttator/Donors b/muttator/Donors
index 38f782d7..9b41e8c0 100644
--- a/muttator/Donors
+++ b/muttator/Donors
@@ -1,2 +1,3 @@
 2009:
+* Andreas Nerf (biggest Muttator donor so far! thanks a lot)
 * Kirill Korotaev
diff --git a/vimperator/Donors b/vimperator/Donors
index 2c73a05c..9f9c7186 100644
--- a/vimperator/Donors
+++ b/vimperator/Donors
@@ -2,6 +2,7 @@ Continuous donations:
 * Daniel Bainton (web hosting)
 
 2009:
+* Oliver Schaefer (2nd donation this year, and largest one in 2009! - Thanks!)
 * James Davis
 * Gregg Archer
 * James Henderson
diff --git a/vimperator/install.rdf b/vimperator/install.rdf
index 3d44a2b1..b9a16d2f 100644
--- a/vimperator/install.rdf
+++ b/vimperator/install.rdf
@@ -19,7 +19,7 @@
             <Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
                 <em:minVersion>3.5</em:minVersion>
-                <em:maxVersion>3.6a2pre</em:maxVersion>
+                <em:maxVersion>3.6b1pre</em:maxVersion>
             </Description>
         </em:targetApplication>
     </Description>