]> Pileus Git - vpaste/blobdiff - index.cgi
xhtml validation
[vpaste] / index.cgi
index 1c26eff2b717d5acb7aec2a8493337b4b48e37ec..d5a86cbd35998c670fb369d2406b084237e50d78 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -30,8 +30,9 @@ function cut_file {
                st==2  {print \$0};
                /$1--/ {st=0};
                /^\\r$/ && st==1 {st=2};
-       " | head -c -2
+       " | head -c -2 | head -c $((128*1024))
        # Remove trailing ^M's that come with CGI
+       # Limit size to 128K
 }
 
 # Print out a generic header
@@ -59,16 +60,15 @@ function do_print {
                # Create a temp file with the provided modeline
                output="$(mktemp)"
                tmp="$(mktemp)"
-               cat  "$input" >> "$tmp"
-               get_modeline  >> "$tmp"
+               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
                #   term=xterm-256color in vimrc
                HOME=/home/andy \
-               screen -D -m ex -u vimrc \
-                       '+$d|'$trim     \
+               screen -D -m ex -Z -u vimrc \
+                       '+2d|'$trim     \
                        '+%s/\r//g'     \
                        '+TOhtml'       \
                        "+sav! $output" \
@@ -88,7 +88,7 @@ function do_print {
 # Upload handler
 function do_upload {
        output="$(mktemp db/XXXXX)"
-       uri="$SCRIPT_URI$(basename "$output")${QUERY_STRING:+"?"}"
+       uri="$url$(basename "$output")${QUERY_STRING:+"?"}"
        (get_modeline; cut_file "$1") > "$output"
        echo "Status: 302 Found"
        echo "Location: $uri"
@@ -102,25 +102,29 @@ filetypes=$(
        ls /usr/share/vim/vim{72,files}/syntax/ /home/andy/.vim/after/syntax/ |
        sed -n 's/.vim$//p' | sort | uniq
 )
-uploads=$(ls -t db | head -n 5 | sed "s!^!$SCRIPT_URI!")
+uploads=$(ls -t db | head -n 5 | sed "s!^!$url!")
 
 header text/html
 cat - <<EOF
-<html>
+<!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>
-               <style>
-               * { margin:0; padding:0; }
-               body { margin:1em; }
-               h4 { margin:1em 0 0 0; }
-               p,ul,dl,dd,pre,blockquote { margin:0 0 0 2em; }
-               dt { font-weight:bold; padding:0.5em 0 0 0; }
-               blockquote { width:50em; font-size:small; }
+               <title>vpaste.net - Vim based pastebin</title>
+               <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
+               <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; }
                </style>
        </head>
        <body>
                <form id="form" method="post" action="?" enctype="multipart/form-data">
-               <textarea name="text" style="width:100%; height:20em;"></textarea>
-               <br>
+               <div style="margin:0 0 1.5em 0;">
+               <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>
@@ -129,18 +133,23 @@ cat - <<EOF
                        echo "<option>$ft</option>"
                done)
                </select>
-               <input type="submit" value="Paste">
+               <input type="submit" value="Paste" />
+               </div>
                </form>
-               <br>
 
                <h4>NAME</h4>
-               <p>vpaste: Vim enabled pastebin</p>
+               <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 'x=<-' $SCRIPT_URI[?option=value,..]</pre>
+               <br />
+               <pre> &lt;command&gt; | curl -F 'x=&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>DESCRIPTION</h4>
                <p>Add <b>?[option[=value],..]</b> to make your text a rainbow.</p>
@@ -162,16 +171,17 @@ cat - <<EOF
 
                <h4>SOURCE</h4>
                <ul>
-               <li><a href="vpaste?ft=sh">vpaste</a>
+               <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><a href="2html-et.patch?ft=diff">2html-et.patch</a>
+                   <a href="htaccess?ft=apache">htaccess</a></li>
+               <li><a href="2html-et.patch?ft=diff">2html-et.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 uri in ${uploads[@]}; do
-                       echo "<li><a href='$uri'>$uri</a>"
+                       echo "<li><a href='$uri'>$uri</a></li>"
                done)</ul>
        </body>
 </html>
@@ -179,7 +189,9 @@ EOF
 }
 
 # Main
-pathinfo="${SCRIPT_URL/*vpaste\/}"
+url="http://$HTTP_HOST/$SCRIPT_URI"
+pathinfo="${REQUEST_URI/*\/}"
+pathinfo="${pathinfo/\?*}"
 
 if [ "$pathinfo" ]; then
        do_print "$pathinfo"