Renamed eFormFiller.sh to formfiller.sh and updated formfiller config

2 files changed, 21 insertions, 30 deletions

diff --git a/examples/config/config b/examples/config/config
index dffdea7..9e5ee55 100644
--- a/examples/config/config
+++ b/examples/config/config
@@ -321,24 +321,15 @@ set follow_hint_keys = 0123456789
 @cbind  fl*  = script @scripts_dir/follow.js '@follow_hint_keys %s'
 
 # --- Form filler binds ---
-# this script allows you to configure (per domain) values to fill in form
-# fields (eg login information) and to fill in these values automatically
-set formfiller = spawn @scripts_dir/formfiller
-@cbind  za  = @{formfiller}.sh
-@cbind  ze  = @{formfiller}.sh edit
-@cbind  zn  = @{formfiller}.sh new
-@cbind  zl  = @{formfiller}.sh load
-# Or the more advanced implementation using perl: (could not get this to run - Dieter)
-@cbind  LL  = @{formfiller}.pl load
-@cbind  LN  = @{formfiller}.pl new
-@cbind  LE  = @{formfiller}.pl edit
-# One more implementation, that allows to save multiple profiles for each form
+# This script allows you to configure (per domain) values to fill in form
+# fields (eg login information) and to fill in these values automatically.
+# This implementation allows you to save multiple profiles for each form
 # (think about multiple accounts on some website).
-set eFormFiller = spawn @scripts_dir/eFormFiller.sh
-@cbind  ZA  = @eFormFiller add
-@cbind  ZE  = @eFormFiller edit
-@cbind  ZN  = @eFormFiller new
-@cbind  ZL  = @eFormFiller load
+set formfiller = spawn @scripts_dir/formfiller.sh
+@cbind  za  = @formfiller add
+@cbind  ze  = @formfiller edit
+@cbind  zn  = @formfiller new
+@cbind  zl  = @formfiller load
 
 # --- Examples ---
 # Example showing how to use uzbl's fifo to execute a command.
diff --git a/examples/data/scripts/eFormFiller.sh b/examples/data/scripts/formfiller.sh
index c7c286e..1408006 100755
--- a/examples/data/scripts/eFormFiller.sh
+++ b/examples/data/scripts/formfiller.sh
@@ -18,9 +18,9 @@
 
 # config dmenu colors and prompt
 NB="#0f0f0f"
-NF="#4e7093" 
-SB="#003d7c" 
-SF="#3a9bff" 
+NF="#4e7093"
+SB="#003d7c"
+SF="#3a9bff"
 
 if [ "`dmenu --help 2>&1| grep lines`x" != "x" ]
 then
@@ -45,19 +45,19 @@ if [ -z ${editor} ]; then
     fi
 fi
 
-config=$1; 
+config=$1;
 shift
-pid=$1;    
+pid=$1;
 shift
-xid=$1;    
+xid=$1;
 shift
-fifo=$1;   
+fifo=$1;
 shift
-socket=$1; 
+socket=$1;
 shift
-url=$1;    
+url=$1;
 shift
-title=$1;  
+title=$1;
 shift
 action=$1
 
@@ -124,7 +124,7 @@ else
             echo "!profile=NAME_THIS_PROFILE$RANDOM" >> $keydir/$domain
         fi
         #
-        # 2. and 3. line (tr -d and sed) are because, on gmail login for example, 
+        # 2. and 3. line (tr -d and sed) are because, on gmail login for example,
         # <input > tag is splited into lines
         # ex:
         # <input name="Email"
@@ -133,8 +133,8 @@ else
         # So, tr removes all new lines, and sed inserts new line after each >
         # Next sed selects only <input> tags and only with type == "text" or == "password"
         # If type is first and name is second, then another sed will change their order
-        # so the last sed will make output 
-        #       text_from_the_name_attr(text or password): 
+        # so the last sed will make output
+        #       text_from_the_name_attr(text or password):
         #
         #       login(text):
         #       passwd(password):