update 2html

[vpaste] / index.cgi

diff --git a/index.cgi b/index.cgi
index 76915a726450c7f7cfa001e7dcb98140849d4619..6209b0fe3b69e3bdfabd0ae0e231daf791a8929e 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -47,7 +47,7 @@ function do_print {
                input="$1"
        elif [ -f "db/$1" ]; then
                input="db/$1"
-               trim='1d' # sed command to remove cruft
+               trim='1,/^$/d' # sed command to remove cruft
        else
                echo "Status: 404 Not Found"
                header text/plain
@@ -63,11 +63,11 @@ function do_print {
                sed "1a$(get_modeline)" "$input" > "$tmp"
 
                # - I have some plugins in ~/.vim
-               # - Run ex in screen to trick it into thinking that it
+               # - Run ex in a pty to trick it into thinking that it
                #   has a real terminal, note that we also have to set
                #   term=xterm-256color in vimrc
                HOME=/home/andy \
-               screen -D -m ex -nXZ -i NONE -u vimrc \
+               /home/andy/bin/pty ex -nXZ -i NONE -u vimrc \
                        '+set bexpr= fde= fdt= fex= inde= inex= key= pa= pexpr' \
                        '+set iconstring= ruf= stl= tal=' \
                        "+set titlestring=$1\ -\ vpaste.net" \
@@ -77,7 +77,7 @@ function do_print {
                        '+TOhtml'       \
                        "+sav! $output" \
                        '+qall!'        \
-                       "$tmp"
+                       "$tmp" </dev/null >/dev/null 2>&1
 
                header text/html
                cat "$output" 
@@ -99,17 +99,39 @@ function do_upload {
        fi
        output="$(mktemp db/XXXXX)"
        uri="$url$(basename "$output")${QUERY_STRING:+"?"}"
-       (get_modeline; echo "$text") > "$output"
-       echo "Status: 302 Found"
-       echo "Location: $uri"
-       header text/plain
-       echo "$uri"
+
+       # Format, spam check, and save message
+       (
+               get_modeline
+               echo "Date: $(date -R)"
+               echo "From: $REMOTE_ADDR"
+               echo
+               echo "$text"
+       ) | HOME=/home/vpaste spamc -E > "$output"
+
+       # Test for spam
+       if [ "$?" -ne 0 ]; then
+               # Report spam
+               header text/plain
+               echo "Your post has been marked as spam!"
+               echo "Spam test results are as folllows.. "
+               echo
+               cat "$output"
+               mv  "$output" spam
+       else
+               # Redirect user
+               echo "Status: 302 Found"
+               echo "Location: $uri"
+               header text/plain
+               echo "$uri"
+       fi
+       
 }
 
 # Default index page
 function do_help {
 filetypes=$(
-       ls /usr/share/vim/vim*/syntax/ /home/andy/.vim/after/syntax/ |
+       ls /usr/share/vim/vim*/syntax/ /home/andy/.vim/syntax/ |
        sed -n '/^\(syntax\|manual\|synload\|2html\|colortest\|hitest\).vim$/d; s/.vim$//p' |
        sort | uniq
 )