add taylanub's formfiller as-is

2 files changed, 205 insertions, 191 deletions

diff --git a/examples/data/scripts/formfiller.js b/examples/data/scripts/formfiller.js
new file mode 100644
index 0000000..abf0162
--- /dev/null
+++ b/examples/data/scripts/formfiller.js
@@ -0,0 +1,67 @@
+uzbl.formfiller = {
+
+    dump: function() {
+        var rv = '';
+        var allFrames = new Array(window);
+        for ( f=0; f<window.frames.length; ++f ) {
+            allFrames.push(window.frames[f]);
+        }
+        for ( j=0; j<allFrames.length; ++j ) {
+            try {
+                var xp_res = allFrames[j].document.evaluate(
+                    '//input', allFrames[j].document.documentElement, null, XPathResult.ANY_TYPE,null
+                );
+                var input;
+                while ( input = xp_res.iterateNext() ) {
+                    var type = (input.type?input.type:text);
+                    if ( type == 'text' || type == 'password' || type == 'search' ) {
+                        rv += '%' + escape(input.name) + '(' + type + '):' + input.value + '\n';
+                    }
+                    else if ( type == 'checkbox' || type == 'radio' ) {
+                        rv += '%' + escape(input.name) + '(' + type + '){' + escape(input.value) + '}:' + (input.checked?'1':'0') + '\n';
+                    }
+                }
+                xp_res = allFrames[j].document.evaluate(
+                    '//textarea', allFrames[j].document.documentElement, null, XPathResult.ANY_TYPE,null
+                );
+                var input;
+                while ( input = xp_res.iterateNext() ) {
+                    rv += '%' + escape(input.name) + '(textarea):\n' + input.value.replace(/\n%/g,"\n\\%") + '\n%\n';
+                }
+            }
+            catch (err) { }
+        }
+        return 'formfillerstart\n' + rv + '%!end';
+    }
+
+    ,
+
+    insert: function(fname, ftype, fvalue, fchecked) {
+        fname = unescape(fname);
+        var allFrames = new Array(window);
+        for ( f=0; f<window.frames.length; ++f ) {
+            allFrames.push(window.frames[f]);
+        }
+        for ( j=0; j<allFrames.length; ++j ) {
+            try {
+                if ( ftype == 'text' || ftype == 'password' || ftype == 'search' || ftype == 'textarea' ) {
+                    allFrames[j].document.getElementsByName(fname)[0].value = fvalue;
+                }
+                else if ( ftype == 'checkbox' ) {
+                    allFrames[j].document.getElementsByName(fname)[0].checked = fchecked;
+                }
+                else if ( ftype == 'radio' ) {
+                    fvalue = unescape(fvalue);
+                    var radios = allFrames[j].document.getElementsByName(fname);
+                    for ( r=0; r<radios.length; ++r ) {
+                        if ( radios[r].value == fvalue ) {
+                            radios[r].checked = fchecked;
+                        }
+                    }
+                }
+            }
+            catch (err) { }
+        }
+    }
+
+}
diff --git a/examples/data/scripts/formfiller.sh b/examples/data/scripts/formfiller.sh
index c6822e6..9b35fbe 100755..100644
--- a/examples/data/scripts/formfiller.sh
+++ b/examples/data/scripts/formfiller.sh
@@ -1,202 +1,149 @@
 #!/bin/sh
 #
-# Enhanced html form (eg for logins) filler (and manager) for uzbl.
-#
-# uses settings files like: $UZBL_FORMS_DIR/<domain>
-# files contain lines like: !profile=<profile_name>
-#                           <fieldname>(fieldtype): <value>
-# profile_name should be replaced with a name that will tell sth about that
-#       profile
-# fieldtype can be checkbox, text or password, textarea - only for information
-#                               pupropse (auto-generated) - don't change that
-#
-# Texteares: for textareas edited text can be now splitted into more lines.
-#       If there will be text, that doesn't match key line:
-#                    <fieldname>(fieldtype):<value>
-#       then it will be considered as a multiline for the first field above it
-#       Keep in mind, that if you make more than one line for fileds like input
-#       text fields, then all lines will be inserted into as one line
-#
-# Checkboxes/radio-buttons: to uncheck it type on of the following after the
-#       colon:
-#           no
-#           off
-#           0
-#           unchecked
-#           false
-#       or leave it blank, even without spaces
-#       otherwise it will be considered as checked
-#
-# user arg 1:
-# edit: force editing the file (falls back to new if not found)
-# new:  start with a new file.
-# load: try to load from file into form
-# add: try to add another profile to an existing file
-# once: edit form using external editor
-#
-# something else (or empty): if file not available: new, otherwise load.
+# action
+# new:  add new profile template (creates file if not found), then edit
+# edit: edit file (fall back to 'new' if file not found)
+# load: load from file
+# once: use temporary file to edit form once
+# (empty): if file not available, new; otherwise, load
 #
 
-DMENU_ARGS="-i"
-DMENU_SCHEMA="formfiller"
-DMENU_LINES="3"
-DMENU_PROMPT="Choose profile"
-DMENU_OPTIONS="vertical resize"
+action=$1
+shift $#
+
+keydir=$HOME/etc/uzbl/dforms
+
+mkdir -p "$keydir" || exit
+
+Ed () { "${VTERM:-xterm}" -e "${VISUAL:-${EDITOR:-vi}}" "$@"; }
+
+Dmenu ()
+{
+    dmenu -p "choose profile" \
+        ${DMENU_FONT+-fn "$DMENU_FONT"} \
+        -nb "#0f0f0f" -nf "#4e7093" -sb "#003d7c" -sf "#3a9bff" \
+        -l 4 \
+        "$@"
+}
+
+domain=${UZBL_URI#*://}
+domain=${domain%%/*}
+
+test "$domain" || exit
+
+file=$keydir/$domain
+
+GenForm ()
+{
+    echo 'js uzbl.formfiller.dump();' \
+    | socat - unix-connect:"$UZBL_SOCKET" \
+    | awk '
+        /^formfillerstart$/ {
+            while (getline) {
+                if ( /^%!end/ ) exit
+                print
+            }
+        }
+    '
+}
+
+GetOption ()
+    if [ $(grep -c '^!profile' "$1") -gt 1 ]
+    then sed -n 's/^!profile=//p' "$1" | Dmenu
+    else sed -n 's/^!profile=//p' "$1"
+    fi
+
+ParseProfile ()
+{
+    sed "/^>/d; /^!profile=$1$/,/^!/!d; /^!/d"
+}
+
+ParseFields ()
+{
+    awk '/^%/ {
+
+        sub ( /%/, "" )
+
+        split( $0, parts, /\(|\)|\{|\}/ )
+
+        field = $0
+        sub ( /[^:]*:/, "", field )
+
+        if ( parts[2] ~ /(text|password|search)/ )
+            printf( "js uzbl.formfiller.insert(\"%s\",\"%s\",\"%s\",0);\n",
+                    parts[1], parts[2], field )
+
+        else if ( parts[2] ~ /(checkbox|radio)/ )
+            printf( "js uzbl.formfiller.insert(\"%s\",\"%s\",\"%s\",%s);\n",
+                    parts[1], parts[2], parts[3], field )
+
+        else if ( parts[2] == "textarea" ) {
+            field = ""
+            while (getline) {
+                if ( /^%/ ) break
+                sub ( /^\\/, "" )
+                gsub ( /"/, "\\\"" )
+                gsub ( /\\/, "\\\\" )
+                field = field $0 "\\n"
+            }
+            printf( "js uzbl.formfiller.insert(\"%s\",\"%s\",\"%s\",0);\n",
+                parts[1], parts[2], field )
+        }
+
+    }'
+}
+
+New ()
+{
+    { echo '!profile=NAME_THIS_PROFILE'
+      GenForm | sed 's/^!/\\!/'
+      echo '!'
+    } >> "$file"
+    chmod 600 "$file"
+    Ed "$file"
+}
+
+Edit ()
+    if [ -e "$file" ]
+    then Ed "$file"
+    else New
+    fi
 
-. $UZBL_UTIL_DIR/dmenu.sh
-. $UZBL_UTIL_DIR/editor.sh
-. $UZBL_UTIL_DIR/uzbl-dir.sh
+Load ()
+{
+    test -e "$file" || exit
 
-RAND=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c 1-5)
-MODELINE="> vim:ft=formfiller"
+    option=$(GetOption "$file")
 
-[ -d "$(dirname $UZBL_FORMS_DIR)" ] || exit 1
-[ -d $UZBL_FORMS_DIR ] || mkdir $UZBL_FORMS_DIR || exit 1
+    case $option in *[!a-zA-Z0-9_-]*) exit 1; esac
 
-action=$1
+    ParseProfile $option < "$file" \
+    | ParseFields \
+    | sed 's/@/\\@/' \
+    > "$UZBL_FIFO"
+}
 
-domain=$(echo $UZBL_URI | sed 's/\(http\|https\):\/\/\([^\/]\+\)\/.*/\2/')
-
-if [ "$action" != 'edit' -a  "$action" != 'new' -a "$action" != 'load' -a "$action" != 'add' -a "$action" != 'once' ]; then
-    action="new"
-    [ -e "$UZBL_FORMS_DIR/$domain" ] && action="load"
-elif [ "$action" = 'edit' ] && [ ! -e "$UZBL_FORMS_DIR/$domain" ]; then
-    action="new"
-fi
-
-dumpFunction="function dump() { \
-    var rv=''; \
-    var allFrames = new Array(window); \
-    for(f=0;f<window.frames.length;f=f+1) { \
-        allFrames.push(window.frames[f]); \
-    } \
-    for(j=0;j<allFrames.length;j=j+1) { \
-        try { \
-            var xp_res=allFrames[j].document.evaluate('//input', allFrames[j].document.documentElement, null, XPathResult.ANY_TYPE,null); \
-            var input; \
-            while(input=xp_res.iterateNext()) { \
-                var type=(input.type?input.type:text); \
-                if(type == 'text' || type == 'password' || type == 'search') { \
-                    rv += input.name + '(' + type + '):' + input.value + '\\\\n'; \
-                } \
-                else if(type == 'checkbox' || type == 'radio') { \
-                    rv += input.name + '{' + input.value + '}(' + type + '):' + (input.checked?'ON':'OFF') + '\\\\n'; \
-                } \
-            }  \
-            xp_res=allFrames[j].document.evaluate('//textarea', allFrames[j].document.documentElement, null, XPathResult.ANY_TYPE,null); \
-            var input; \
-            while(input=xp_res.iterateNext()) { \
-                rv += input.name + '(textarea):' + input.value + '\\\\n'; \
-            } \
-        } \
-        catch(err) { } \
-    } \
-    return rv; \
-}; "
-
-insertFunction="function insert(fname, ftype, fvalue, fchecked) { \
-    var allFrames = new Array(window); \
-    for(f=0;f<window.frames.length;f=f+1) { \
-        allFrames.push(window.frames[f]); \
-    }  \
-    for(j=0;j<allFrames.length;j=j+1) { \
-        try { \
-            if(ftype == 'text' || ftype == 'password' || ftype == 'search' || ftype == 'textarea') { \
-                allFrames[j].document.getElementsByName(fname)[0].value = fvalue; \
-            } \
-            else if(ftype == 'checkbox') { \
-                allFrames[j].document.getElementsByName(fname)[0].checked = fchecked;\
-            } \
-            else if(ftype == 'radio') { \
-                var radios = allFrames[j].document.getElementsByName(fname); \
-                for(r=0;r<radios.length;r+=1) { \
-                    if(radios[r].value == fvalue) { \
-                        radios[r].checked = fchecked; \
-                    } \
-                } \
-            } \
-        } \
-        catch(err) { } \
-    } \
-}; "
-
-if [ "$action" = 'load' ]; then
-    [ -e $UZBL_FORMS_DIR/$domain ] || exit 2
-    if [ $(cat $UZBL_FORMS_DIR/$domain | grep "!profile" | wc -l) -gt 1 ]; then
-        menu=$(cat $UZBL_FORMS_DIR/$domain | \
-              sed -n 's/^!profile=\([^[:blank:]]\+\)/\1/p')
-        option=$(printf "$menu" | $DMENU)
-    fi
+Once ()
+{
+    tmpfile=/tmp/${0##*/}-$$-tmpfile
+    trap 'rm -f "$tmpfile"' EXIT
 
-    # Remove comments
-    sed '/^>/d' -i $tmpfile
-
-    sed 's/^\([^{]\+\){\([^}]*\)}(\(radio\|checkbox\)):\(off\|no\|false\|unchecked\|0\|$\)/\1{\2}(\3):0/I;s/^\([^{]\+\){\([^}]*\)}(\(radio\|checkbox\)):[^0]\+/\1{\2}(\3):1/I' -i $UZBL_FORMS_DIR/$domain
-    fields=$(cat $UZBL_FORMS_DIR/$domain | \
-        sed -n "/^!profile=${option}/,/^!profile=/p" | \
-        sed '/^!profile=/d' | \
-        sed 's/^\([^(]\+(\)\(radio\|checkbox\|text\|search\|textarea\|password\)):/%{>\1\2):<}%/' | \
-        sed 's/^\(.\+\)$/<{br}>\1/' | \
-        tr -d '\n' | \
-        sed 's/<{br}>%{>\([^(]\+(\)\(radio\|checkbox\|text\|search\|textarea\|password\)):<}%/\\n\1\2):/g')
-    printf '%s\n' "${fields}" | \
-        sed -n -e "s/\([^(]\+\)(\(password\|text\|search\|textarea\)\+):[ ]*\(.\+\)/js $insertFunction; insert('\1', '\2', '\3', 0);/p" | \
-        sed -e 's/@/\\@/g;s/<{br}>/\\\\n/g' | socat - unix-connect:$UZBL_SOCKET
-    printf '%s\n' "${fields}" | \
-        sed -n -e "s/\([^{]\+\){\([^}]*\)}(\(radio\|checkbox\)):[ ]*\(.\+\)/js $insertFunction; insert('\1', '\3', '\2', \4);/p" | \
-        sed -e 's/@/\\@/g' | socat - unix-connect:$UZBL_SOCKET
-elif [ "$action" = "once" ]; then
-    tmpfile=$(mktemp)
-    printf 'js %s dump(); \n' "$dumpFunction" | \
-        socat - unix-connect:$UZBL_SOCKET | \
-        sed -n '/^[^(]\+([^)]\+):/p' > $tmpfile
-    echo "$MODELINE" >> $tmpfile
-    $UZBL_EDITOR $tmpfile
-
-    [ -e $tmpfile ] || exit 2
-
-    # Remove comments
-    sed '/^>/d' -i $tmpfile
-
-    sed 's/^\([^{]\+\){\([^}]*\)}(\(radio\|checkbox\)):\(off\|no\|false\|unchecked\|0\|$\)/\1{\2}(\3):0/I;s/^\([^{]\+\){\([^}]*\)}(\(radio\|checkbox\)):[^0]\+/\1{\2}(\3):1/I' -i $tmpfile
-    fields=$(cat $tmpfile | \
-        sed 's/^\([^(]\+(\)\(radio\|checkbox\|text\|search\|textarea\|password\)):/%{>\1\2):<}%/' | \
-        sed 's/^\(.\+\)$/<{br}>\1/' | \
-        tr -d '\n' | \
-        sed 's/<{br}>%{>\([^(]\+(\)\(radio\|checkbox\|text\|search\|textarea\|password\)):<}%/\\n\1\2):/g')
-    printf '%s\n' "${fields}" | \
-        sed -n -e "s/\([^(]\+\)(\(password\|text\|search\|textarea\)\+):[ ]*\(.\+\)/js $insertFunction; insert('\1', '\2', '\3', 0);/p" | \
-        sed -e 's/@/\\@/g;s/<{br}>/\\\\n/g' | socat - unix-connect:$UZBL_SOCKET
-    printf '%s\n' "${fields}" | \
-        sed -n -e "s/\([^{]\+\){\([^}]*\)}(\(radio\|checkbox\)):[ ]*\(.\+\)/js $insertFunction; insert('\1', '\3', '\2', \4);/p" | \
-        sed -e 's/@/\\@/g' | socat - unix-connect:$UZBL_SOCKET
-    rm -f $tmpfile
-else
-    if [ "$action" = 'new' -o "$action" = 'add' ]; then
-        [ "$action" = 'new' ] && echo "$MODELINE" > $UZBL_FORMS_DIR/$domain
-        echo "!profile=NAME_THIS_PROFILE$RAND" >> $UZBL_FORMS_DIR/$domain
-        #
-        # 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"
-        #        type="text"
-        #        value="">
-        # 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):
-        #
-        #       login(text):
-        #       passwd(password):
-        #
-        printf 'js %s dump(); \n' "$dumpFunction" | \
-            socat - unix-connect:$UZBL_SOCKET | \
-            sed -n '/^[^(]\+([^)]\+):/p' >> $UZBL_FORMS_DIR/$domain
-    fi
-    [ -e "$UZBL_FORMS_DIR/$domain" ] || exit 3 #this should never happen, but you never know.
-    $UZBL_EDITOR "$UZBL_FORMS_DIR/$domain" #TODO: if user aborts save in editor, the file is already overwritten
-fi
+    GenForm > "$tmpfile"
+    chmod 600 "$tmpfile"
+
+    Ed "$tmpfile"
+
+    test -e "$tmpfile" &&
+    ParseFields < "$tmpfile" \
+    | sed 's/@/\\@' \
+    > "$UZBL_FIFO"
+}
 
-# vim:fileencoding=utf-8:sw=4
+case $action in
+    new) New; Load ;;
+    edit) Edit; Load ;;
+    load) Load ;;
+    once) Once ;;
+    '') if [ -e "$file" ]; then Load; else New; Load; fi ;;
+    *) exit 1
+esac