]> Pileus Git - vpaste/commitdiff
Use syntax highlighting by default
authorAndy Spencer <andy753421@gmail.com>
Wed, 17 Aug 2011 05:42:47 +0000 (05:42 +0000)
committerAndy Spencer <andy753421@gmail.com>
Wed, 17 Aug 2011 05:42:47 +0000 (05:42 +0000)
Also some formatting updates

index.cgi

index f1b8b15c0a99533fa6fcc59dde43912448c9f1ed..d4b3b54a994aaa82badeefbc560ddeb4cf254d1b 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 # Copyright (C) 2009-2011 Andy Spencer
-# 
+#
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU Affero General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option) any
 # later version.
-# 
+#
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 # FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
 
 # Remove url codings from stdin
 function get_modeline {
-       modeline=$(
-               echo "$QUERY_STRING" |
-               sed -e 's/%\([0-9A-F][0-9A-F]\)/\\\\\x\1/g; s/[,&]/ /g' |
-               xargs echo -e
-       )
-       echo "vim: $modeline"
+       echo "$QUERY_STRING" |
+       sed -e 's/%\([0-9A-F][0-9A-F]\)/\\\\\x\1/g; s/[,&]/ /g' |
+       xargs echo -e
 }
 
 # Extract an uploaded file from standard input
-#   $2 is the name of the input to extract
+#   $1 is the name of the input to extract
 function cut_file {
        bnd="${CONTENT_TYPE/*boundary\=/}"
        awk -v "want=$1" -v "bnd=$bnd" '
@@ -50,22 +47,32 @@ function header {
        echo
 }
 
+# Print plain message and exit
+function message {
+       while [ "$1" == '-h' ]; do
+               shift; echo $1; shift
+       done
+       header text/plain
+       echo "$*"
+       exit
+}
+
 # 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
+       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
@@ -76,18 +83,16 @@ function do_print {
                input="db/$1"
                trim='1,/^$/d' # sed command to remove cruft
        else
-               echo "Status: 404 Not Found"
-               header text/plain
-               echo "File '$1' not found"
-               return
+               message -h 'Status: 404 Not Found' \
+                       "File '$1' not found"
        fi
 
-
-       if [[ "$REQUEST_URI" == *'?'* ]]; then
+       if [[ "$HTTP_ACCEPT"  == *'html'* &&
+             "$QUERY_STRING" !=  'raw'* ]]; then
                # Create a temp file with the provided modeline
                output="$(mktemp)"
                tmp="$(mktemp)"
-               sed "\$a$(get_modeline)" "$input" > "$tmp"
+               sed "\$avim: $(get_modeline)" "$input" > "$tmp"
 
                # - I have some plugins in ~/.vim
                # - Run ex in screen to trick it into thinking that it
@@ -121,160 +126,139 @@ function do_upload {
        body=$(cat -)
        spam=$(echo -n "$body" | cut_file "ignoreme")
        text=$(echo -n "$body" | cut_file "(text|x)")
-       if [ ! -z "$spam" ]; then
-               header text/plain
-               echo "Spam check.."
-               exit
-       fi
-       if [ -z "$text" ]; then
-               header text/plain
-               echo "No text pasted"
-               exit
-       fi
+       [ ! -z "$spam" ] && message "Spam check.."
+       [   -z "$text" ] && message "No text pasted"
+
+       # Format and save message
        output="$(mktemp db/XXXXX)"
-       uri="$url$(basename "$output")${QUERY_STRING:+"?"}"
+       cat >"$output" <<-EOF
+               vim: $(get_modeline)
+               Date: $(date -R)
+               From: $REMOTE_ADDR
 
-       # 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"
+               $text
+       EOF
 
-       # 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
+       # Redirect user
+       uri="$SCRIPT_URI$(basename "$output")"
+       message -h 'Status: 302 Found' \
+               -h "Location: $uri"    \
+               "$uri"
 }
 
 # Default index page
 function do_help {
-filetypes=$(
-       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
-)
-uploads=$(ls -t db | head -n 5)
+       filetypes=$(
+               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
+       )
+       uploads=$(ls -t db | head -n 5)
 
-header text/html
-cat - <<EOF
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-       <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; }
-                       h4 { margin:1em 0 0 0; }
-                       blockquote,dd,dl,p,pre,ul { margin:0 0 0 2em; }
-                       dt { font-weight:bold; padding:0.5em 0 0 0; }
-                       blockquote { width:50em; font-size:small; }
-                       span { font-family:monospace; }
-               </style>
-       </head>
-       <body>
-               <form id="form" method="post" action="?" enctype="multipart/form-data">
-               <div style="margin:0 0 1.5em 0;">
-               <input style="display:none" type="text" name="ignoreme" value="">
-               <textarea name="text" cols="80" rows="25" style="width:100%; height:20em;"></textarea>
-               <select onchange="document.getElementById('form').action =
-                       document.location + '?ft=' + this.value;">
-               <option value="" selected="selected" disabled="disabled">Filetype</option>
-               <option value="">None</option>
-               $(for ft in $filetypes; do
-                       echo "<option>$ft</option>"
-               done)
-               </select>
-               <input type="submit" value="Paste" />
-               </div>
-               </form>
+       header text/html
+       cat <<-EOF
+       <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+       <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+           <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; }
+                   h4 { margin:1em 0 0 0; }
+                   blockquote,dd,dl,p,pre,ul { margin:0 0 0 2em; }
+                   dt { font-weight:bold; padding:0.5em 0 0 0; }
+                   blockquote { width:50em; font-size:small; }
+                   span { font-family:monospace; }
+               </style>
+           </head>
+           <body>
+               <form id="form" method="post" action="?" enctype="multipart/form-data">
+               <div style="margin:0 0 1.5em 0;">
+               <input style="display:none" type="text" name="ignoreme" value="">
+               <textarea name="text" cols="80" rows="25" style="width:100%; height:20em;"></textarea>
+               <select onchange="document.getElementById('form').action =
+                   document.location + '?ft=' + this.value;">
+               <option value="" selected="selected" disabled="disabled">Filetype</option>
+               <option value="">None</option>
+               $(for ft in $filetypes; do
+                   echo "<option>$ft</option>"
+               done)
+               </select>
+               <input type="submit" value="Paste" />
+               </div>
+               </form>
 
-               <h4>NAME</h4>
-               <p>vpaste: Vim based pastebin</p>
+               <h4>NAME</h4>
+               <p>vpaste: Vim based pastebin</p>
 
-               <h4>SYNOPSIS</h4>
-               <div>
-               <pre> vpaste file [option=value,..]</pre>
-               <pre> &lt;command&gt; | vpaste [option=value,..]</pre>
-               <br />
-               <pre> &lt;command&gt; | curl -F 'text=&lt;-' $url[?option=value,..]</pre>
-               <br />
-               <pre> :map vp :exec "w !vpaste ft=".&amp;ft&lt;CR&gt;</pre>
-               <pre> :vmap vp &lt;ESC&gt;:exec "'&lt;,'&gt;w !vpaste ft=".&amp;ft&lt;CR&gt;</pre>
-               </div>
+               <h4>SYNOPSIS</h4>
+               <div>
+               <pre> vpaste file [option=value,..]</pre>
+               <pre> &lt;command&gt; | vpaste [option=value,..]</pre>
+               <br />
+               <pre> &lt;command&gt; | curl -F 'text=&lt;-' $SCRIPT_URI[?option=value,..]</pre>
+               <br />
+               <pre> :map vp :exec "w !vpaste ft=".&amp;ft&lt;CR&gt;</pre>
+               <pre> :vmap vp &lt;ESC&gt;:exec "'&lt;,'&gt;w !vpaste ft=".&amp;ft&lt;CR&gt;</pre>
+               </div>
 
-               <h4>DESCRIPTION</h4>
-               <p>Add <b>?[option[=value],..]</b> to make your text a rainbow.</p>
-               <p>Options specified when uploading are used as defaults.</p>
+               <h4>DESCRIPTION</h4>
+               <p>Add <b>?[option[=value],..]</b> to make your text a rainbow.</p>
+               <p>Options specified when uploading are used as defaults.</p>
 
-               <h4>OPTIONS</h4>
-               <dl>
-               <dt>ft, filetype={filetype}</dt>
-               <dd>A filetype to use for highlighting, see above menu for supported types</dd>
-               <dt>bg, background={light|dark}</dt>
-               <dd>Background color to use for the page</dd>
-               <dt>et, expandtab</dt>
-               <dd>Expand tabs to spaces</dd>
-               <dt>ts, tabstop=[N]</dt>
-               <dd>Number of spaces to use for tabs when <b>et</b> is set</dd>
-               <dt>...</dt>
-               <dd>See :help modeline for more information</dd>
-               </dl>
+               <h4>OPTIONS</h4>
+               <dl>
+               <dt>ft, filetype={filetype}</dt>
+               <dd>A filetype to use for highlighting, see above menu for supported types</dd>
+               <dt>bg, background={light|dark}</dt>
+               <dd>Background color to use for the page</dd>
+               <dt>et, expandtab</dt>
+               <dd>Expand tabs to spaces</dd>
+               <dt>ts, tabstop=[N]</dt>
+               <dd>Number of spaces to use for tabs when <b>et</b> is set</dd>
+               <dt>...</dt>
+               <dd>See :help modeline for more information</dd>
+               </dl>
 
-               <h4>BUGS</h4>
-               <ul>
-               <li>Using strange filetypes (ft=2html) may result in strange output.</li>
-               <li><a href="mailto:andy753421@gmail.com?subject=vpaste bug">Other?</a></li>
-               </ul>
+               <h4>BUGS</h4>
+               <ul>
+               <li>Using strange filetypes (ft=2html) may result in strange output.</li>
+               <li><a href="mailto:andy753421@gmail.com?subject=vpaste bug">Other?</a></li>
+               </ul>
 
-               <h4>SOURCE</h4>
-               <ul>
-               <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>
-                   <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>
+               <h4>SOURCE</h4>
+               <ul>
+               <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>
+                   <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>
 
-               <h4>LATEST UPLOADS</h4>
-               <ul>$(for upload in ${uploads[@]}; do
-                       echo -n "<li>"
-                       echo -n "<span>$upload</span> "
-                       echo -n "<a href='$upload'>text</a> "
-                       echo -n "<a href='$upload?'>rainbow</a>"
-                       echo "</li>"
-               done)
-               </ul>
-               <p><a href="ls">list all</a></p>
-               <p><a href="head">sample all</a></p>
-       </body>
-</html>
-EOF
+               <h4>LATEST UPLOADS</h4>
+               <ul>$(for upload in ${uploads[@]}; do
+                   echo -n "<li>"
+                   echo -n "<span>$upload</span> "
+                   echo -n "<a href='$upload?raw'>text</a> "
+                   echo -n "<a href='$upload'>rainbow</a>"
+                   echo "</li>"
+               done)
+               </ul>
+               <p><a href="ls">list all</a></p>
+               <p><a href="head">sample all</a></p>
+           </body>
+       </html>
+       EOF
 }
 
 # Main
-url="http://$HTTP_HOST${REQUEST_URI/\?*}"
 pathinfo="${REQUEST_URI/*\/}"
 pathinfo="${pathinfo/\?*}"