]> Pileus Git - vpaste/blobdiff - index.cgi
projects / vpaste / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix some bugs
[vpaste] / index.cgi
diff --git a/index.cgi b/index.cgi
index f70abc72105569c80d916e67421d7e5ef098f7fa..295f031c0f0c6f93a8c45b2a0d68d069e2999428 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -41,13 +41,31 @@ function header {
        echo
 }
 
+# List previous pastes
+function do_cmd {
+header text/plain
+case "$1" in
+head)
+       for i in $(ls -t db/*); do 
+               basename $i
+               basename $i | sed 's/./-/g'
+               sed '1,/^$/d; /^\s*$/d' $i | sed -n '1,5s/\(.\{0,60\}\).*/\1/p'
+               echo
+       done
+       ;;
+ls)
+       ls -t db | column
+       ;;
+esac
+}
+
 # Format a file for viewing 
 function do_print {
        if [ -f "./$1" ]; then
                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
@@ -69,7 +87,8 @@ function do_print {
                HOME=/home/andy \
                screen -D -m 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'     \
@@ -98,17 +117,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
 )
@@ -122,6 +163,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; }
@@ -191,8 +234,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>
 
@@ -203,7 +248,10 @@ cat - <<EOF
                        echo -n "<a href='$upload'>text</a> "
                        echo -n "<a href='$upload?'>rainbow</a>"
                        echo "</li>"
-               done)</ul>
+               done)
+               </ul>
+               <p><a href="ls">list all</a></p>
+               <p><a href="head">sample all</a></p>
        </body>
 </html>
 EOF
@@ -214,7 +262,11 @@ url="http://$HTTP_HOST${REQUEST_URI/\?*}"
 pathinfo="${REQUEST_URI/*\/}"
 pathinfo="${pathinfo/\?*}"
 
-if [ "$pathinfo" ]; then
+if [ "$pathinfo" = ls ]; then
+       do_cmd ls
+elif [ "$pathinfo" = head ]; then
+       do_cmd head
+elif [ "$pathinfo" ]; then
        do_print "$pathinfo"
 elif [ "$CONTENT_TYPE" ]; then
        do_upload "${CONTENT_TYPE/*boundary\=/}"
Vim based pastebin