X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=a6158a3122b41b184930bf0255664a428851858d;hb=fef72da7c35a10fc92c098a9287683e9d71bea1d;hp=190964478d979134e3c699776a5656923f0ed183;hpb=01057766514a73e0df07470e71c94b0508b2e5bf;p=geekigeeki.git

diff --git a/geekigeeki.py b/geekigeeki.py
index 1909644..a6158a3 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -1,10 +1,9 @@
-#! /usr/bin/env python
-"""Quick-quick implementation of WikiWikiWeb in Python
-"""
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
 #
-# Copyright (C) 1999, 2000 Martin Pool <mbp@humbug.org.au>
-# This version includes additional changes by Gerardo Poggiali (2002)
-# This version includes additional changes by Bernardo Innocenti (2007)
+# Copyright 1999, 2000 Martin Pool <mbp@humbug.org.au>
+# Copyright 2002 Gerardo Poggiali
+# Copyright 2007, 2008 Bernardo Innocenti <bernie@codewiz.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,15 +18,19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = '$Revision: 1.63+gerry+bernie $'[11:-2];
+__version__ = '$Id$'[4:12]
 
-import cgi, sys, string, os, re, errno, time, stat
+from time import clock
+start_time = clock()
+
+import cgi, sys, os, re, errno, stat
 from os import path, environ
 
 # Regular expression defining a WikiWord
 # (but this definition is also assumed in other places)
-file_re = re.compile(r"^\b([A-Za-z0-9_\.\-]+)\b$")
-word_re = re.compile(r"^\b([A-Z][a-z]+){2,}\b$")
+word_re = re.compile(r"^\b((([A-Z][a-z]+){2,}/)*([A-Z][a-z]+){2,})\b$")
+# FIXME: we accept stuff like foo/../bar and we shouldn't
+file_re = re.compile(r"^\b([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)\b$")
 img_re = re.compile(r"^.*\.(png|gif|jpg|jpeg)$", re.IGNORECASE)
 url_re = re.compile(r"^[a-z]{3,8}://[^\s'\"]+\S$")
 
@@ -36,11 +39,17 @@ title_done = False
 
 # CGI stuff ---------------------------------------------------------
 
-def get_scriptname():
+def script_name():
     return environ.get('SCRIPT_NAME', '')
 
+def privileged_path():
+    return privileged_url or script_name()
+
 def remote_user():
-    return environ.get('REMOTE_USER', 'AnonymousCoward')
+    user = environ.get('REMOTE_USER', '')
+    if user is None or user == '' or user == 'anonymous':
+        user = 'AnonymousCoward'
+    return user
 
 def remote_host():
     return environ.get('REMOTE_ADDR', '')
@@ -49,25 +58,33 @@ def get_hostname(addr):
     try:
         from socket import gethostbyaddr
         return gethostbyaddr(addr)[0] + ' (' + addr + ')'
-    except:
-        return addr;
+    except Exception, er:
+        return addr
+
+def relative_url(pathname, privileged=False):
+    if not (url_re.match(pathname) or pathname.startswith('/')):
+        if privileged:
+            url = privileged_path()
+        else:
+            url = script_name()
+        pathname = url + '/' + pathname
+    return pathname
 
 # Formatting stuff --------------------------------------------------
 
-def emit_header(type="text/html"):
-    print "Content-type: " + type + "; charset=utf-8"
-    print
+def emit_header(mime_type="text/html"):
+    print "Content-type: " + mime_type + "; charset=utf-8\n"
 
-def send_guru(msg, msg_type):
-    if msg is None or len(msg) == 0: return
+def send_guru(msg_text, msg_type):
+    if not msg_text: return
     print '<pre id="guru" onclick="this.style.display = \'none\'" class="' + msg_type + '">'
     if msg_type == 'error':
         print '    Software Failure.  Press left mouse button to continue.\n'
-    print msg
+    print msg_text
     if msg_type == 'error':
         print '      Guru Meditation #DEADBEEF.ABADC0DE'
     print '</pre>'
-    # FIXME: This simple JS code is harder to pass than ACID 3.0 
+    # FIXME: This little JS snippet is harder to pass than ACID 3.0 
     print """
     <script language="JavaScript" type="text/javascript">
         var guru = document.getElementById('guru');
@@ -90,75 +107,77 @@ def send_guru(msg, msg_type):
         }
     </script>"""
 
-def send_title(name, text="Limbo", msg=None, msg_type = 'error'):
+def send_title(name, text="Limbo", msg_text=None, msg_type='error'):
     global title_done
     if title_done: return
 
     # Head
     emit_header()
-    print """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-"""
+    print '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'
+    print '  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
+    print '<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">'
+
+    site_name = globals().get('site_name', 'Unconfigured Site')
     print "<head><title>%s: %s</title>" % (site_name, text)
-    print ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'
+    print ' <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />'
     if not name:
-        print '  <meta name="robots" content="noindex,nofollow">'
-    if css_url:
-        print ' <link rel="stylesheet" type="text/css" href="%s" />' % css_url
+        print ' <meta name="robots" content="noindex,nofollow" />'
+    for css in css_url:
+        print ' <link rel="stylesheet" type="text/css" href="%s" />' % relative_url(css)
     print '</head>'
 
     # Body
-    if name and allow_edit:
-        print '<body ondblclick="location.href=\'?edit=' + name + '\'">'
+    if name and privileged_url is not None:
+        print '<body ondblclick="location.href=\'' + privileged_path() + '?edit=' + name + '\'">'
     else:
         print '<body>'
 
-    send_guru(msg, msg_type)
+    title_done = True
+    send_guru(msg_text, msg_type)
 
     # Navbar
-    print '<div class="navigator">'
-    print '  <b>' + site_name + ': '
+    print '<div class="nav">'
+    print '  <b>' + site_name + ': ',
     if name:
-        print link_tag('?fullsearch=' + name, text) + '</b> '
+        print link_tag('?fullsearch=' + name, text, 'navlink') + '</b> '
     else:
         print text + '</b> '
     print ' | ' + link_tag('FrontPage', 'Front Page', 'navlink')
     print ' | ' + link_tag('FindPage', 'Find Page', 'navlink')
-    print ' | <a href="/wikigit/wiki.git" class="navlink">Recent Changes</a>'
+    if 'history_url' in globals():
+        print ' | <a href="' + history_url + '" class="navlink">Recent Changes</a>'
+        if name:
+            print ' | <a href="' + history_url + '?a=history;f=' + name + '" class="navlink">Page History</a>'
 
     if name:
-        print ' | <a href="/wikigit/wiki.git?a=history;f=' + name + '" class="navlink">Page History</a>'
         print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink')
-        if allow_edit:
-            print ' | ' + link_tag('?edit=' + name, 'Edit Page', 'navlink')
+        if privileged_url is not None:
+            print ' | ' + link_tag('?edit=' + name, 'Edit Page', 'navlink', privileged=True)
     else:
         print ' | <i>Immutable Page</i>'
 
     user = remote_user()
     if user != 'AnonymousCoward':
-        print ' | <i>logged in as <b>' + cgi.escape(user) + '</b></i>'
-
-    print '</div>'
-    title_done = True
+        print ' | <span class="login"><i>logged in as <b>' + cgi.escape(user) + '</b></i></span>'
 
+    print '<hr /></div>'
 
-def link_tag(params, text=None, ss_class=None):
+def link_tag(params, text=None, ss_class=None, privileged=False):
     if text is None:
         text = params # default
     classattr = ''
-    # Prevent crawlers from following links to generated pages
-    # and links added by potential spammers
-    if ss_class == 'external' or ss_class == 'navlink':
-        classattr += 'rel="nofollow" '
     if ss_class:
         classattr += 'class="%s" ' % ss_class
-    return '<a %shref="%s/%s">%s</a>' % (classattr, get_scriptname(),
-                                         params, text)
+        # Prevent crawlers from following links potentially added by spammers or to generated pages
+        if ss_class == 'external' or ss_class == 'navlink':
+            classattr += 'rel="nofollow" '
+    elif url_re.match(params):
+        classattr += 'rel="nofollow" '
+    return '<a %shref="%s">%s</a>' % (classattr, relative_url(params, privileged=privileged), text)
 
 # Search ---------------------------------------------------
 
-def do_fullsearch(needle):
+def handle_fullsearch(needle):
     send_title(None, 'Full text search for "%s"' % (needle))
 
     needle_re = re.compile(needle, re.IGNORECASE)
@@ -179,14 +198,13 @@ def do_fullsearch(needle):
     for (count, page_name) in hits:
         print '<li><p>' + Page(page_name).link_to()
         print ' . . . . ' + `count`
-        print ['match', 'matches'][count <> 1]
+        print ['match', 'matches'][count != 1]
         print '</p></li>'
     print "</ul>"
 
     print_search_stats(len(hits), len(all_pages))
 
-
-def do_titlesearch(needle):
+def handle_titlesearch(needle):
     # TODO: check needle is legal -- but probably we can just accept any RE
     send_title(None, "Title search for \"" + needle + '"')
 
@@ -201,70 +219,65 @@ def do_titlesearch(needle):
 
     print_search_stats(len(hits), len(all_pages))
 
-
 def print_search_stats(hits, searched):
     print "<p>%d hits out of %d pages searched.</p>" % (hits, searched)
 
-def do_edit(pagename):
-    Page(pagename).send_editor()
-
-def do_raw(pagename):
+def handle_raw(pagename):
     Page(pagename).send_raw()
 
-def do_savepage(pagename):
-    if not allow_edit:
-        raise 'editing disallowed for ' + pagename
-
-    global form
+def handle_edit(pagename):
     pg = Page(pagename)
-    if 'preview' in form:
-        pg.send_editor(form['savetext'].value)
-    elif 'save' in form:
-        pg.save_text(form['savetext'].value)
+    if 'save' in form:
+        if form['file'].value:
+            pg.save(form['file'].file.read())
+        else:
+            pg.save(form['savetext'].value.replace('\r\n', '\n'))
         pg.send_page()
     elif 'cancel' in form:
-        pg.msg = 'Editing cancelled'
+        pg.msg_text = 'Editing canceled'
         pg.msg_type = 'notice'
         pg.send_page()
-    else:
-        raise 'What did you press?'
+    else: # preview or edit
+        text = None
+        if 'preview' in form:
+            text = form['savetext'].value
+        pg.send_editor(text)
 
 def make_index_key():
-    s = '<p><center>'
-    links = map(lambda ch: '<a href="#%s">%s</a>' % (ch, ch),
-                string.lowercase)
-    s = s + string.join(links, ' | ')
-    s = s + '</center></p>'
-    return s
-
+    links = map(lambda ch: '<a href="#%s">%s</a>' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz')
+    return '<p><center>'+ ' | '.join(links) + '</center></p>'
 
 def page_list():
-    return filter(word_re.match, os.listdir(text_dir))
-
+    return filter(word_re.match, os.listdir(data_dir))
 
 def send_footer(name, mod_string=None):
-    print '<div class="footer">'
+    if globals().get('debug_cgi', False):
+        cgi.print_arguments()
+        cgi.print_form(form)
+        cgi.print_environ()
+    print '<div id="footer"><hr />'
+    print ('<p class="copyright"><span class="benchmark">generated in %0.3fs</span>' +
+        ' by <a href="http://www.codewiz.org/wiki/GeekiGeeki">GeekiGeeki</a>' +
+        ' version %s</p>') % (clock() - start_time, __version__)
     if mod_string:
-        print "last modified %s" % mod_string
+        print '<p class="modified">last modified %s</p>' % mod_string
     print '</div></body></html>'
 
-
 # ----------------------------------------------------------
 # Macros
-def _macro_TitleSearch():
+def _macro_TitleSearch(*vargs):
     return _macro_search("titlesearch")
 
-def _macro_FullSearch():
+def _macro_FullSearch(*vargs):
     return _macro_search("fullsearch")
 
 def _macro_search(type):
-    if form.has_key('value'):
-        default = form["value"].value
-    else:
-        default = ''
-    return """<form method="get"><input name="%s" size="30" value="%s"><input type="submit" value="Go"></form>""" % (type, default)
+    default = ''
+    if 'value' in form:
+        default = form['value'].value
+    return """<form method="get"><input name="%s" size="30" value="%s" /><input type="submit" value="Search" /></form>""" % (type, default)
 
-def _macro_WordIndex():
+def _macro_WordIndex(*vargs):
     s = make_index_key()
     pages = list(page_list())
     map = {}
@@ -281,8 +294,8 @@ def _macro_WordIndex():
     last_letter = None
     # set title
     for word in all_words:
-        letter = string.lower(word[0])
-        if letter <> last_letter:
+        letter = word[0].lower()
+        if letter != last_letter:
             s = s + '; <a name="%s"><h3>%s</h3></a>' % (letter, letter)
             last_letter = letter
 
@@ -297,19 +310,19 @@ def _macro_WordIndex():
     return s
 
 
-def _macro_TitleIndex():
+def _macro_TitleIndex(*vargs):
     s = make_index_key()
     pages = list(page_list())
     pages.sort()
     current_letter = None
     for name in pages:
-        letter = string.lower(name[0])
-        if letter <> current_letter:
-            s = s + '<a name="%s"><h3>%s</h3></a>' % (letter, letter)
+        letter = name[0].lower()
+        if letter != current_letter:
+            s += '<a name="%s"><h3>%s</h3></a>' % (letter, letter)
             current_letter = letter
         else:
-            s = s + '<br />'
-        s = s + Page(name).link_to()
+            s += '<br />'
+        s += Page(name).link_to()
     return s
 
 
@@ -322,100 +335,122 @@ class PageFormatter:
     """
     def __init__(self, raw):
         self.raw = raw
-        self.is_em = self.is_b = 0
         self.h_level = 0
-        self.list_indents = []
-        self.in_pre = 0
-        self.in_var = 0
+        self.in_pre = self.in_table = False
         self.in_header = True
+        self.list_indents = []
+        self.tr_cnt = self.h_cnt = 0
+        self.styles = {
+            #wiki   html   enabled?
+            "//":  ["em",  False],
+            "''":  ["em",  False],
+            "**":  ["b",   False],
+            "'''": ["b",   False],
+            "##":  ["tt",  False],
+            "``":  ["tt",  False],
+            "__":  ["u",   False],
+            "^^":  ["sup", False],
+            ",,":  ["sub", False]
+        }
 
-    def _emph_repl(self, word):
-        if len(word) == 3:
-            self.is_b = not self.is_b
-            return ['</b>', '<b>'][self.is_b]
-        else:
-            self.is_em = not self.is_em
-            return ['</em>', '<em>'][self.is_em]
+    def _b_repl(self, word):
+        style = self.styles[word]
+        style[1] = not style[1]
+        return ['</', '<'][style[1]] + style[0] + '>'
 
     def _tit_repl(self, word):
         if self.h_level:
-            result = "</h%d>" % self.h_level
+            result = '</h%d>' % self.h_level
             self.h_level = 0
         else:
             self.h_level = len(word) - 1
-            result = "<h%d>" % self.h_level
-        return result;
+            self.h_cnt += 1
+            #abridged = re.sub('[^a-z_]', '', word.lower().replace(' ', '_'))
+            result = '<h%d id="%d"><a class="heading" href="#%d">¶</a> ' % (self.h_level, self.h_cnt, self.h_cnt)
+        return result
+
+    def _br_repl(self, word):
+        return '<br />'
 
     def _rule_repl(self, word):
-        s = self._undent()
-        if len(word) <= 3:
-            s = s + "\n<hr size='1' noshade=\"noshade\" />\n"
-        else:
-            s = s + "\n<hr size='%d' noshade=\"noshade\" />\n" % (len(word) - 2 )
-        return s
+        return self._undent() + '\n<hr size="%d" noshade="noshade" />\n' % (len(word) - 2)
 
     def _word_repl(self, word):
         return Page(word).link_to()
 
     def _img_repl(self, word):
-        return '<img border="0" src="%s/%s" />' % (get_scriptname(), word)
+        path = relative_url(word)
+        return '<a href="%s"><img border="0" src="%s" /></a>' % (path, path)
 
     def _url_repl(self, word):
         if img_re.match(word):
-            return '<img border="0" src="%s" />' % word
+            return '<a href="%s"><img border="0" src="%s" /></a>' % (word, word)
         else:
             return '<a href="%s" rel="nofollow" class="external">%s</a>' % (word, word)
 
     def _hurl_repl(self, word):
-        m = re.compile("\[\[(\S+)\ (.+)\]\]").match(word)
-        anchor = m.group(1)
-        descr = m.group(2)
-        if img_re.match(anchor):
-            return '<img border="0" src="%s" alt="%s" />' % (anchor, descr)
-        elif url_re.match(anchor):
-            return '<a href="%s" rel="nofollow" class="external">%s</a>' % (anchor, descr)
-        elif anchor.startswith('/'):
-            return '<a href="%s">%s</a>' % (anchor, descr)
+        m = re.compile("\[\[([^ \t\n\r\f\v\|]+)(?:\s*\|\s*([^\]]+)|)\]\]").match(word)
+        name = m.group(1)
+        descr = m.group(2) or name
+
+        macro = globals().get('_macro_' + name)
+        if macro:
+            return macro(name, descr)
+        elif img_re.match(name):
+            name = relative_url(name)
+            # The "extthumb" nonsense works around a limitation of the HTML block model
+            return '<div class="extthumb"><div class="thumb"><a href="%s"><img border="0" src="%s" alt="%s" /></a><div class="caption">%s</div></div></div>' % (name, name, descr, descr)
         else:
-            return link_tag(anchor, descr)
+            if img_re.match(descr):
+                descr = '<img border="0" src="' + descr + '" />'
+
+            return link_tag(name, descr, 'wikilink')
 
     def _email_repl(self, word):
         return '<a href="mailto:%s">%s</a>' % (word, word)
 
+    def _html_repl(self, word):
+        return word; # Pass through
 
     def _ent_repl(self, s):
         return {'&': '&amp;',
                 '<': '&lt;',
                 '>': '&gt;'}[s]
 
-
     def _li_repl(self, match):
         return '<li>'
 
-
     def _pre_repl(self, word):
         if word == '{{{' and not self.in_pre:
-            self.in_pre = 1
+            self.in_pre = True
             return '<pre>'
         elif self.in_pre:
-            self.in_pre = 0
+            self.in_pre = False
             return '</pre>'
-        else:
-            return ''
-
-    def _var_repl(self, word):
-        if word == '{{' and not self.in_var:
-            self.in_var = 1
-            return '<code>'
-        elif self.in_var:
-            self.in_var = 0
-            return '</code>'
-        else:
-            return ''
-    def _macro_repl(self, word):
-        macro_name = word[2:-2]
-        # TODO: Somehow get the default value into the search field
-        return apply(globals()['_macro_' + macro_name], ())
+        return ''
+
+    def _hi_repl(self, word):
+        return '<strong class="highlight ' + word + '">' + word + '</strong>'
+
+    def _tr_repl(self, word):
+        out = ''
+        if not self.in_table:
+            self.in_table = True
+            self.tr_cnt = 0
+            out = '</p><table><tbody>\n'
+        self.tr_cnt += 1
+        out = out + '<tr class="' + ['even', 'odd'][self.tr_cnt % 2] + '">'
+        return out + ['<td>', '<th>'][word.strip() == '||=']
+
+    def _td_repl(self, word):
+        if self.in_table:
+            return ['</td><td>', '</th><th>'][word.strip() == '||=']
+        return ''
+
+    def _tre_repl(self, word):
+        if self.in_table:
+            return ['</td></tr>', '</th></tr>'][word.strip() == '||=']
+        return ''
 
     def _indent_level(self):
         return len(self.list_indents) and self.list_indents[-1]
@@ -443,112 +478,125 @@ class PageFormatter:
     def replace(self, match):
         for type, hit in match.groupdict().items():
             if hit:
-                return apply(getattr(self, '_' + type + '_repl'), (hit,))
+                return getattr(self, '_' + type + '_repl')(hit)
         else:
             raise "Can't handle match " + `match`
 
     def print_html(self):
-        print "<div class='wiki'><p>"
+        print '<div class="wiki"><p>'
 
         # For each line, we scan through looking for magic
         # strings, outputting verbatim any intervening text
+        # TODO: highlight search words (look at referrer)
         scan_re = re.compile(
             r"(?:"
-            + r"(?P<emph>'{2,3})"
+            # Formatting
+            + r"(?P<b>\*\*|'''|//|''|##|``|__|\^\^|,,)"
             + r"|(?P<tit>\={2,6})"
+            + r"|(?P<br>\\\\)"
+            + r"|(?P<rule>^-{3,})"
+            + r"|(?P<html><(/|)(div|span|iframe)[^<>]*>)"
             + r"|(?P<ent>[<>&])"
+            + r"|(?P<hi>\b(FIXME|TODO|DONE)\b)"
+
+            # Links
             + r"|(?P<img>\b[a-zA-Z0-9_-]+\.(png|gif|jpg|jpeg|bmp))"
             + r"|(?P<word>\b(?:[A-Z][a-z]+){2,}\b)"
-            + r"|(?P<rule>^-{3,})"
-            + r"|(?P<hurl>\[\[\S+\s+.+\]\])"
-            + r"|(?P<url>(http|ftp|nntp|news|mailto)\:[^\s'\"]+\S)"
+            + r"|(?P<hurl>\[\[([^ \t\n\r\f\v\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
+            + r"|(?P<url>(http|https|ftp|mailto)\:[^\s'\"]+\S)"
             + r"|(?P<email>[-\w._+]+\@[\w.-]+)"
-            + r"|(?P<li>^\s+\*)"
-            + r"|(?P<pre>(\{\{\{|\s*\}\}\}))"
-            + r"|(?P<var>(\{\{|\}\}))"
-            + r"|(?P<macro>\[\[(TitleSearch|FullSearch|WordIndex|TitleIndex)\]\])"
+
+            # Lists, divs, spans
+            + r"|(?P<li>^\s+[\*#] +)"
+            + r"|(?P<pre>\{\{\{|\s*\}\}\})"
+
+            # Tables
+            + r"|(?P<tr>^\s*\|\|(=|)\s*)"
+            + r"|(?P<tre>\s*\|\|(=|)\s*$)"
+            + r"|(?P<td>\s*\|\|(=|)\s*)"
             + r")")
         pre_re = re.compile(
             r"(?:"
             + r"(?P<pre>\s*\}\}\})"
+            + r"|(?P<ent>[<>&])"
             + r")")
-        blank_re = re.compile("^\s*$")
-        indent_re = re.compile("^\s*")
-        eol_re = re.compile(r'\r?\n')
-        raw = string.expandtabs(self.raw)
-        for line in eol_re.split(raw):
+        blank_re = re.compile(r"^\s*$")
+        indent_re = re.compile(r"^\s*")
+        tr_re = re.compile(r"^\s*\|\|")
+        eol_re = re.compile(r"\r?\n")
+        for line in eol_re.split(self.raw.expandtabs()):
             # Skip ACLs
             if self.in_header:
                 if line.startswith('#'):
-                   continue
+                    continue
                 self.in_header = False
+
             if self.in_pre:
                 print re.sub(pre_re, self.replace, line)
             else:
-                # XXX: Should we check these conditions in this order?
+                if self.in_table and not tr_re.match(line):
+                    self.in_table = False
+                    print '</tbody></table><p>'
+
                 if blank_re.match(line):
                     print '</p><p>'
-                    continue
-                indent = indent_re.match(line)
-                print self._indent_to(len(indent.group(0)))
-                print re.sub(scan_re, self.replace, line)
+                else:
+                    indent = indent_re.match(line)
+                    print self._indent_to(len(indent.group(0)))
+                    print re.sub(scan_re, self.replace, line)
+
         if self.in_pre: print '</pre>'
+        if self.in_table: print '</tbody></table><p>'
         print self._undent()
-        print "</p></div>"
+        print '</p></div>'
 
 # ----------------------------------------------------------
 class Page:
     def __init__(self, page_name):
         self.page_name = page_name
-        self.msg = ''
+        self.msg_text = ''
         self.msg_type = 'error'
-        self.attrs = {}
 
     def split_title(self):
-        # look for the end of words and the start of a new word,
-        # and insert a space there
+        # look for the end of words and the start of a new word and insert a space there
         return re.sub('([a-z])([A-Z])', r'\1 \2', self.page_name)
 
     def _text_filename(self):
-        return path.join(text_dir, self.page_name)
+        return path.join(data_dir, self.page_name)
 
     def _tmp_filename(self):
-        return path.join(text_dir, ('#' + self.page_name + '.' + `os.getpid()` + '#'))
+        return path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#'))
 
     def exists(self):
         try:
             os.stat(self._text_filename())
-            return 1
+            return True
         except OSError, er:
             if er.errno == errno.ENOENT:
-                return 0
-            else:
-                raise er
+                return False
+            raise er
 
     def link_to(self):
         word = self.page_name
         if self.exists():
             return link_tag(word, word, 'wikilink')
         else:
-            if nonexist_qm:
-                return link_tag(word, '?', 'nonexistent') + word
-            else:
-                return link_tag(word, word, 'nonexistent')
-
+            return link_tag(word, nonexist_pfx + word, 'nonexistent')
 
     def get_raw_body(self):
         try:
-            return open(self._text_filename(), 'rt').read()
+            return open(self._text_filename(), 'rb').read()
         except IOError, er:
             if er.errno == errno.ENOENT:
-                # just doesn't exist, use default
-                return 'Describe %s here.' % self.page_name
-            else:
-                raise er
+                return '' # just doesn't exist, use default
+            if er.errno == errno.EISDIR:
+                return 'DIR'
+            raise er
 
     def get_attrs(self):
-        if self.attrs:
+        if 'attrs' in self.__dict__:
             return self.attrs
+        self.attrs = {}
         try:
             file = open(self._text_filename(), 'rt')
             attr_re = re.compile(r"^#(\S*)(.*)$")
@@ -563,46 +611,73 @@ class Page:
                 raise er
         return self.attrs
 
-    def can_edit(self):
-        attrs = self.get_attrs()
+    def get_attr(self, name, default):
+        return self.get_attrs().get(name, default)
+
+    def can(self, action, default=True):
         try:
-            # SomeUser:read,write All:read
-            acl = attrs["acl"]
+            #acl SomeUser:read,write All:read
+            acl = self.get_attr("acl", None)
             for rule in acl.split():
-                (user,perms) = acl.split(':')
+                (user, perms) = rule.split(':')
                 if user == remote_user() or user == "All":
-                    if 'write' in perms.split(','):
-                        return True
+                    return action in perms.split(',')
             return False
-        except:
-            pass
-        return True
+        except Exception, er:
+            if acl:
+                self.msg_text = 'Illegal acl line: ' + acl
+        return default
+
+    def can_write(self):
+        return self.can("write", True)
+
+    def can_read(self):
+        return self.can("read", True)
 
     def send_page(self):
         page_name = None
-        if self.can_edit():
+        if self.can_write():
             page_name = self.page_name
-        send_title(page_name, self.split_title(), msg=self.msg, msg_type=self.msg_type)
-        PageFormatter(self.get_raw_body()).print_html()
+
+        #css foo.css bar.css
+        global css_url
+        css_url = self.get_attr("css", "").split() + css_url
+
+        send_title(page_name, self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type)
+        if self.can_read():
+            PageFormatter(self.get_raw_body()).print_html()
+        else:
+            send_guru("Read access denied by ACLs", "notice")
         send_footer(page_name, self._last_modified())
 
     def _last_modified(self):
-        if not self.exists():
+        try:
+            from time import localtime, strftime
+            modtime = localtime(os.stat(self._text_filename())[stat.ST_MTIME])
+        except OSError, er:
+            if er.errno != errno.ENOENT:
+                raise er
             return None
-        from time import localtime, strftime
-        modtime = localtime(os.stat(self._text_filename())[stat.ST_MTIME])
         return strftime(datetime_fmt, modtime)
 
     def send_editor(self, preview=None):
-        send_title(None, 'Edit ' + self.split_title(), msg=self.msg, msg_type=self.msg_type)
+        send_title(None, 'Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type)
+        if not self.can_write():
+            send_guru("Write access denied by ACLs", "error")
+            return
+
+        file = ''
+        if 'file' in form:
+            file = form['file'].value
 
         print ('<p><b>Editing ' + self.page_name
             + ' for ' + cgi.escape(remote_user())
             + ' from ' + cgi.escape(get_hostname(remote_host()))
             + '</b></p>')
-        print '<div class="editor"><form method="post" action="%s/%s">' % (get_scriptname(), self.page_name)
-        print '<input type="hidden" name="savepage" value="%s">' % (self.page_name)
-        print """<textarea wrap="virtual" id="editor" name="savetext" rows="17" cols="80">%s</textarea>""" % (preview or self.get_raw_body())
+        print '<div class="editor"><form method="post" enctype="multipart/form-data" action="%s">' % relative_url(self.page_name)
+        print '<input type="hidden" name="edit" value="%s">' % (self.page_name)
+        print '<textarea wrap="off" spellcheck="true" id="editor" name="savetext" rows="17" cols="100">%s</textarea>' % (preview or self.get_raw_body())
+        print 'Or upload a file: <input type="file" name="file" value="%s" />' % file
         print """
             <br />
             <input type="submit" name="save" value="Save" />
@@ -616,77 +691,64 @@ class Page:
             print "<div class='preview'>"
             PageFormatter(preview).print_html()
             print "</div>"
+        send_footer(self.page_name)
 
-    def send_raw(self):
-        emit_header("text/plain")
-        print self.get_raw_body()
+    def send_raw(self, mimetype='text/plain'):
+        if self.can_read():
+            body = self.get_raw_body()
+            emit_header(mimetype)
+            print body
+        else:
+            send_title(None, msg_text='Read access denied by ACLs', msg_type='notice')
 
-    def _write_file(self, text):
+    def _write_file(self, data):
         tmp_filename = self._tmp_filename()
-        open(tmp_filename, 'wt').write(text.replace('\r\n', '\n'))
-        text = self._text_filename()
+        open(tmp_filename, 'wb').write(data)
+        name = self._text_filename()
         if os.name == 'nt':
             # Bad Bill!  POSIX rename ought to replace. :-(
             try:
-                os.remove(text)
+                os.remove(name)
             except OSError, er:
-                if er.errno <> errno.ENOENT: raise er
-        os.rename(tmp_filename, text)
+                if er.errno != errno.ENOENT: raise er
+        os.rename(tmp_filename, name)
 
-    def save_text(self, newtext):
-        self._write_file(newtext)
+    def save(self, newdata):
+        if not self.can_write():
+            self.msg_text = 'Write access denied by ACLs'
+            self.msg_type = 'error'
+            return
+
+        self._write_file(newdata)
         rc = 0
         if post_edit_hook:
             # FIXME: what's the std way to perform shell quoting in python?
             cmd = ( post_edit_hook
-                + " '" + text_dir + '/' + self.page_name
+                + " '" + data_dir + '/' + self.page_name
                 + "' '" + remote_user()
                 + "' '" + remote_host() + "'"
             )
             out = os.popen(cmd)
-            msg = out.read()
+            output = out.read()
             rc = out.close()
         if rc:
-            self.msg += "Post-editing hook returned %d.\n" % rc
-            self.msg += 'Command was: ' + cmd + '\n'
-            if msg:
-                self.msg += 'Output follows:\n' + msg
+            self.msg_text += "Post-editing hook returned %d.\n" % rc
+            self.msg_text += 'Command was: ' + cmd + '\n'
+            if output:
+                self.msg_text += 'Output follows:\n' + output
         else:
-            self.msg = 'Thankyou for your contribution.  Your attention to detail is appreciated.'
+            self.msg_text = 'Thank you for your contribution.  Your attention to detail is appreciated.'
             self.msg_type = 'success'
 
-def send_verbatim(filename, mime_type='application/octet-stream'):
-    pathname = path.join(text_dir, filename)
-    data = open(pathname, 'rb').read()
-    emit_header(mime_type)
-    sys.stdout.write(data)
-
-# ---------------------------------------------------------------
+# Main ---------------------------------------------------------------
 try:
-    # Configuration values
-    data_dir = '/home/bernie/public_html/wiki'
-    text_dir = path.join(data_dir, 'text')
-    allow_edit = True # Is it possible to edit pages?
-    site_name = 'codewiz.org'
-    changed_time_fmt = '[%I:%M %p] '
-    date_fmt = '%a %d %b %Y'
-    datetime_fmt = '%a %d %b %Y %I:%M %p'
-    show_hosts = True                       # show hostnames?
-    css_url = '../wikidata/geekigeeki.css'  # optional stylesheet link
-    nonexist_qm = False                     # show '?' for nonexistent?
-    post_edit_hook = './post_edit_hook.sh'
-
+    execfile("geekigeeki.conf.py")
     form = cgi.FieldStorage()
 
-    handlers = { 'fullsearch':  do_fullsearch,
-                 'titlesearch': do_titlesearch,
-                 'edit':        do_edit,
-                 'raw':         do_raw,
-                 'savepage':    do_savepage }
-
-    for cmd in handlers.keys():
-        if form.has_key(cmd):
-            apply(handlers[cmd], (form[cmd].value,))
+    for cmd in form:
+        handler = globals().get('handle_' + cmd)
+        if handler:
+            handler(form[cmd].value)
             break
     else:
         path_info = environ.get('PATH_INFO', '')
@@ -698,20 +760,22 @@ try:
         if file_re.match(query):
             if word_re.match(query):
                 Page(query).send_page()
-            elif img_re.match(query):
-                send_verbatim(query, 'image/jpeg')
             else:
-                send_verbatim(query)
+                from mimetypes import MimeTypes
+                type, encoding = MimeTypes().guess_type(query)
+                type = type or 'text/plain'
+                Page(query).send_raw(mimetype=type)
         else:
-            # TODO: return 404?
-            send_title(None, msg='Can\'t work out query: ' + query)
-except:
+            print "Status: 404 Not Found"
+            send_title(None, msg_text='Can\'t work out query: ' + query)
+            send_footer(None)
+except Exception:
     import traceback
-    msg=traceback.format_exc()
+    msg_text = traceback.format_exc()
     if title_done:
-        send_guru(msg, "error")
+        send_guru(msg_text, "error")
     else:
-        send_title(None, msg=msg)
+        send_title(None, msg_text=msg_text)
     send_footer(None)
 
 sys.stdout.flush()