]> Pileus Git - vpaste/blobdiff - index.cgi
update 2html
[vpaste] / index.cgi
index 3ed58033ad097eba58bbb9b88d7ae4a5adf19853..6209b0fe3b69e3bdfabd0ae0e231daf791a8929e 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -12,7 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-# Remove url codings form stdin
+# Remove url codings from stdin
 function get_modeline {
        modeline=$(
                echo "$QUERY_STRING" | 
@@ -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,20 +63,21 @@ 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
-               #   has a real terminal, not that we also have to set
+               # - 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= titlestring=' \
+                       '+set iconstring= ruf= stl= tal=' \
+                       "+set titlestring=$1\ -\ vpaste.net" \
                        '+set noml'     \
                        '+2d|'$trim     \
-                       '+%s/\r//g'     \
+                       '+%s/\r//g'     \
                        '+TOhtml'       \
                        "+sav! $output" \
                        '+qall!'        \
-                       "$tmp"
+                       "$tmp" </dev/null >/dev/null 2>&1
 
                header text/html
                cat "$output" 
@@ -90,19 +91,47 @@ function do_print {
 
 # Upload handler
 function do_upload {
+       text=$(cut_file "$1")
+       if [ -z "$text" ]; then
+               header text/plain
+               echo "No text pasted"
+               exit
+       fi
        output="$(mktemp db/XXXXX)"
        uri="$url$(basename "$output")${QUERY_STRING:+"?"}"
-       (get_modeline; cut_file "$1") > "$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
 )
@@ -116,6 +145,8 @@ cat - <<EOF
        <head>
                <title>vpaste.net - Vim based pastebin</title>
                <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
+               <meta name="description" content="vpaste: Vim based pastebin" />
+               <meta name="keywords" content="vpaste,paste,pastebin,vim" />
                <style type="text/css">
                        * { margin:0; padding:0; }
                        body { margin:1em; }
@@ -185,8 +216,10 @@ cat - <<EOF
                <li><a href="vpaste?ft=sh">vpaste</a></li>
                <li><a href="index.cgi?ft=sh">index.cgi</a>
                    <a href="vimrc?ft=vim">vimrc</a>
-                   <a href="htaccess?ft=apache">htaccess</a></li>
-               <li><a href="2html-et.patch?ft=diff">2html-et.patch</a></li>
+                   <a href="htaccess?ft=apache">htaccess</a>
+                   <a href="robots.txt?ft=robots">robots.txt</a>
+                   <a href="sitemap.xml?ft=xml">sitemap.xml</a></li>
+               <li><a href="2html.patch?ft=diff">2html.patch</a></li>
                <li><a href="https://lug.rose-hulman.edu/svn/misc/trunk/htdocs/vpaste/">Subversion</a></li>
                </ul>