X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=blobdiff_plain;f=geekigeeki.py;h=79960d45422760c24f867238426ee76b8a905af4;hp=01027ee23b69b7da0a60f32c2925ab4f04dcfb1c;hb=HEAD;hpb=4d8eca8c234926b3770f3fc4d150128ad18cea87

diff --git a/geekigeeki.py b/geekigeeki.py
index 01027ee..79960d4 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -1,47 +1,44 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
-# Copyright 1999, 2000 Martin Pool <mbp@humbug.org.au>
-# Copyright 2002 Gerardo Poggiali
-# Copyright 2007, 2008, 2009 Bernie Innocenti <bernie@codewiz.org>
+# Copyright (C) 1999, 2000 Martin Pool <mbp@humbug.org.au>
+# Copyright (C) 2002 Gerardo Poggiali
+# Copyright (C) 2007, 2008, 2009, 2010, 2011 Bernie 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
-# 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
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
+# 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.
+# You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 __version__ = '4.0-' + '$Id$'[4:11]
 
-from time import clock
+from time import clock, localtime, gmtime, strftime
 start_time = clock()
 title_done = False
 
 import cgi, sys, os, re, errno, stat, glob
 
-image_ext = 'png|gif|jpg|jpeg|bmp|ico'
-video_ext = "ogg|ogv|oga" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt
-image_re = re.compile(r".*\.(" + image_ext + "|" +  video_ext + ")", re.IGNORECASE)
-video_re = re.compile(r".*\.(" + video_ext + ")", re.IGNORECASE)
+image_ext = 'png|gif|jpg|jpeg|svg|bmp|ico'
+video_ext = 'avi|webm|mkv|ogv'
+image_re = re.compile(r".*\.(" + image_ext + ")$", re.IGNORECASE)
+video_re = re.compile(r".*\.(" + video_ext + ")$", re.IGNORECASE)
 # FIXME: we accept stuff like foo/../bar and we shouldn't
-file_re  = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)")
-url_re   = re.compile(r"[a-z]{3,8}://[^\s'\"]+\S")
+file_re  = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/ ]*)$")
+url_re   = re.compile(r"[a-z]{3,8}://[^\s'\"]+\S$")
 ext_re   = re.compile(r"\.([^\./]+)$")
 
-# CGI stuff ---------------------------------------------------------
 def config_get(key, default=None):
     return globals().get(key, default)
 
 def script_name():
     return os.environ.get('SCRIPT_NAME', '')
 
+#TODO: move post-edit hook into wiki, then kill this
+def script_path():
+    return os.path.split(os.environ.get('SCRIPT_FILENAME', ''))[0]
+
 def query_string():
     path_info = os.environ.get('PATH_INFO', '')
     if len(path_info) and path_info[0] == '/':
@@ -49,8 +46,9 @@ def query_string():
     else:
         return os.environ.get('QUERY_STRING', '') or 'FrontPage'
 
-def privileged_path():
-    return config_get('privileged_url') or script_name()
+def is_privileged():
+    purl = config_get('privileged_url')
+    return (purl is not None) and os.environ.get('SCRIPT_URI', '').startswith(purl)
 
 def remote_user():
     user = os.environ.get('REMOTE_USER', '')
@@ -74,7 +72,7 @@ def is_external_url(pathname):
 def relative_url(pathname, privileged=False):
     if not is_external_url(pathname):
         if privileged:
-            url = privileged_path()
+            url = config_get('privileged_url') or script_name()
         else:
             url = script_name()
         pathname = url + '/' + pathname
@@ -107,9 +105,15 @@ def url_args(kvargs):
         return '?' + '&amp;'.join(argv)
     return ''
 
-# Formatting stuff --------------------------------------------------
-def emit_header(mime_type="text/html"):
-    print("Content-type: " + mime_type + "; charset=utf-8\n")
+def emit_header(mtime=None, mime_type="text/html"):
+    if mtime:
+        # Prevent caching when the wiki engine gets updated
+        mtime = max(mtime, os.stat(__file__).st_mtime)
+        print("Last-Modified: " + strftime("%a, %d %b %Y %H:%M:%S GMT", gmtime(mtime)))
+    else:
+        print("Cache-Control: must-revalidate, max-age=0")
+    print("Content-type: " + mime_type + "; charset=utf-8")
+    print('')
 
 def send_guru(msg_text, msg_type):
     if not msg_text: return
@@ -119,92 +123,24 @@ def send_guru(msg_text, msg_type):
     print(cgi.escape(msg_text))
     if msg_type == 'error':
         print '\n           Guru Meditation #DEADBEEF.ABADC0DE'
-    print('</pre><script language="JavaScript" type="text/javascript" src="%s" defer="defer"></script>' \
+    print('</pre><script type="text/javascript" src="%s" defer="defer"></script>' \
         % relative_url('sys/GuruMeditation.js'))
 
-def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False):
-    global title_done
-    if title_done: return
-
-    # Head
-    emit_header()
-    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">')
-
-    print("<head><title>%s: %s</title>" % (config_get('site_name', "Unconfigured Wiki"), text))
-    print(' <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />')
-    if not name:
-        print(' <meta name="robots" content="noindex,nofollow" />')
-
-    for http_equiv, content in config_get('meta_urls', {}):
-        print(' <meta http-equiv="%s" content="%s" />' % (http_equiv, relative_url(content)))
-
-    for link in config_get('link_urls', {}):
-        rel, href = link
-        print(' <link rel="%s" href="%s" />' % (rel, relative_url(href)))
-
-    editable = name and writable and config_get('privileged_url') is not None
-    if editable:
-        print(' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
-            % (privileged_path() + '?a=edit&q=' + name))
-
-    history = config_get('history_url')
-    if history is not None:
-        print(' <link rel="alternate" type="application/rss+xml" title="RSS" href="%s" />' \
-            % relative_url(history + '?a=rss'))
-
-    print('</head>')
-
-    # Body
-    if editable:
-        print('<body ondblclick="location.href=\'' + privileged_path() + '?a=edit&q=' + name + '\'">')
-    else:
-        print('<body>')
-
-    title_done = True
-    send_guru(msg_text, msg_type)
-
-    # Navbar
-    print('<div class="nav">')
-    print link_tag('FrontPage', config_get('site_icon', 'Home'), cssclass='navlink')
-    if name:
-        print('  <b>' + link_tag('?fullsearch=' + name, text, cssclass='navlink') + '</b> ')
-    else:
-        print('  <b>' + text + '</b> ')
-    print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink'))
-    if history:
-        print(' | <a href="' + relative_url(history) + '" class="navlink">Recent Changes</a>')
-        if name:
-            print(' | <a href="' + relative_url(history + '?a=history;f=' + name) + '" class="navlink">Page History</a>')
-
-    if name:
-        print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink'))
-        if config_get('privileged_url') is not None:
-            if writable:
-                print(' | ' + link_tag('?a=edit&q=' + name, 'Edit', cssclass='navlink', privileged=True))
-            else:
-                print(' | ' + link_tag(name, 'Login', cssclass='navlink', privileged=True))
-
-    else:
-        print(' | <i>Immutable Page</i>')
-
-    user = remote_user()
-    if user != 'AnonymousCoward':
-        print(' | <span class="login"><i><b>' + link_tag('User/' + user, user) + '</b></i></span>')
-
-    print('<hr /></div>')
-
-def send_httperror(status="403 Not Found", query=""):
+def send_httperror(status="404 Not Found", query="", trace=False):
     print("Status: %s" % status)
-    send_title(None, msg_text=("%s: on query '%s'" % (status, query)))
-    send_footer()
+    msg_text = "%s: on query '%s'" % (status, query)
+    if trace:
+        import traceback
+        msg_text += '\n\n' + traceback.format_exc()
+    page = Page()
+    page.send_title(msg_text=msg_text)
+    page.send_footer()
 
 def link_tag(dest, text=None, privileged=False, **kvargs):
     if text is None:
         text = humanlink(dest)
     elif image_re.match(text):
-        text = '<img border="0" src="' + relative_url(text) + '" alt="' + text + '" />'
+        text = '<img style="border: 0" src="' + relative_url(text) + '" alt="' + text + '" />'
 
     link_class = kvargs.get('class', kvargs.get('cssclass', None))
     if not link_class:
@@ -216,9 +152,9 @@ def link_tag(dest, text=None, privileged=False, **kvargs):
             text = config_get('nonexist_pfx', '') + text
             link_class = 'nonexistent'
 
-    # Prevent crawlers from following links potentially added by spammers or to generated pages
+    # Prevent crawlers from following links potentially added by spammers and to autogenerated pages
     nofollow = ''
-    if link_class == 'external' or link_class == 'navlink':
+    if link_class in ('external', 'navlink', 'nonexistent'):
         nofollow = 'rel="nofollow" '
 
     return '<a class="%s" %shref="%s">%s</a>' % (link_class, nofollow, relative_url(dest, privileged=privileged), text)
@@ -227,29 +163,34 @@ def link_inline(name, descr=None, kvargs={}):
     if not descr: descr = humanlink(name)
     url = relative_url(name)
     if video_re.match(name):
-        return '<video controls="1" src="%s">Your browser does not support HTML5 video</video>' % url
+        args = ''
+        if 'maxwidth' in kvargs:
+            args += 'width=' + kvargs['maxwidth']
+        return '<video controls="1" src="%s" %s/>' % (url, args)
     elif image_re.match(name):
         return '<a href="%s"><img border="0" src="%s" alt="%s" /></a>' % (url, url + url_args(kvargs), descr)
     elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page
-        return Page(name).send_naked(kvargs)
+        Page(name).send_naked(kvargs) # FIXME: we should return the page as a string rather than print it
+        return ''
     else:
         return '<iframe width="100%%" scrolling="auto" frameborder="0" src="%s"><a href="%s">%s</a></iframe>' \
             % (url, url, name)
 
 def link_inline_glob(pattern, descr=None, kvargs={}):
-    s = ''
-    for name in glob.glob(pattern):
-        s += link_inline(name, descr, kvargs)
-    return s
-
-# Search ---------------------------------------------------
+    if not url_re.match(pattern) and bool(set(pattern) & set('?*[')):
+        s = ''
+        for name in sorted(glob.glob(pattern), reverse=bool(int(kvargs.get('reverse', '0'))) ):
+            s += link_inline(name, descr, kvargs)
+        return s
+    else:
+        return link_inline(pattern, descr, kvargs)
 
-def print_search_stats(hits, searched):
-    print("<p>%d hits out of %d pages searched.</p>" % (hits, searched))
+def search_stats(hits, searched):
+    return "%d hits out of %d pages searched.\n" % (hits, searched)
 
 def handle_fullsearch(query, form):
     needle = form['q'].value
-    send_title(None, 'Full text search for "' + needle + '"')
+    Page().send_title(text='Full text search for "' + needle + '"')
 
     needle_re = re.compile(needle, re.IGNORECASE)
     hits = []
@@ -260,59 +201,50 @@ def handle_fullsearch(query, form):
         if count:
             hits.append((count, page_name))
 
-    # The default comparison for tuples compares elements in order,
-    # so this sorts by number of hits
+    # The default comparison for tuples compares elements in order, so this sorts by number of hits
     hits.sort()
     hits.reverse()
 
-    print("<ul>")
+    out = ''
     for (count, page_name) in hits:
-        print('<li><p>' + link_tag(page_name))
-        print(' . . . . ' + `count`)
-        print(['match', 'matches'][count != 1])
-        print('</p></li>')
-    print("</ul>")
+        out += ' * [[' + page_name + ']] . . . ' + str(count) + ' ' + ['match', 'matches'][count != 1] + '\n'
 
-    print_search_stats(len(hits), len(all_pages))
+    out += search_stats(len(hits), len(all_pages))
+    WikiFormatter(out).print_html()
 
 def handle_titlesearch(query, form):
     needle = form['q'].value
-    send_title(None, 'Title search for "' + needle + '"')
+    Page().send_title(text='Title search for "' + needle + '"')
 
     needle_re = re.compile(needle, re.IGNORECASE)
     all_pages = page_list()
     hits = list(filter(needle_re.search, all_pages))
 
-    print("<ul>")
+    out = ''
     for filename in hits:
-        print('<li><p>' + link_tag(filename) + "</p></li>")
-    print("</ul>")
+        out += ' * [[' + filename + ']]\n'
 
-    print_search_stats(len(hits), len(all_pages))
+    out += search_stats(len(hits), len(all_pages))
+    WikiFormatter(out).print_html()
 
 def handle_raw(pagename, form):
-    if not file_re.match(pagename):
-        send_httperror("403 Forbidden", pagename)
-        return
-
     Page(pagename).send_raw()
 
-def handle_edit(pagename, form):
-    if not file_re.match(pagename):
-        send_httperror("403 Forbidden", pagename)
-        return
+def handle_atom(pagename, form):
+    Page(pagename).send_atom()
 
-    pg = Page(form['q'].value)
+def handle_edit(pagename, form):
+    pg  = Page(pagename)
     if 'save' in form:
         if form['file'].value:
             pg.save(form['file'].file.read(), form['changelog'].value)
         else:
             pg.save(form['savetext'].value.replace('\r\n', '\n'), form['changelog'].value)
-        pg.format()
+        pg.send()
     elif 'cancel' in form:
         pg.msg_text = 'Editing canceled'
         pg.msg_type = 'notice'
-        pg.format()
+        pg.send()
     else: # preview or edit
         text = None
         if 'preview' in form:
@@ -320,16 +252,13 @@ def handle_edit(pagename, form):
         pg.send_editor(text)
 
 def handle_get(pagename, form):
-        if file_re.match(pagename):
-            # FIMXE: this is all bullshit, MimeTypes bases its guess on the extension!
-            from mimetypes import MimeTypes
-            mimetype, encoding = MimeTypes().guess_type(pagename)
-            if mimetype:
-                Page(pagename).send_raw(mimetype=mimetype, args=form)
-            else:
-                Page(pagename).format()
-        else:
-            send_httperror("403 Forbidden", pagename)
+    if not ext_re.search(pagename): # FIXME: no extension guesses a wiki page
+        Page(pagename).send()
+    else:
+        # FIMXE: this is all bullshit, MimeTypes bases its guess on the extension!
+        from mimetypes import MimeTypes
+        mimetype, encoding = MimeTypes().guess_type(pagename)
+        Page(pagename).send_raw(mimetype=mimetype, args=form)
 
 # Used by sys/macros/WordIndex and sys/macros/TitleIndex
 def make_index_key():
@@ -342,14 +271,6 @@ def page_list(dirname=None, search_re=None):
         search_re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$")
     return sorted(filter(search_re.match, os.listdir(dirname or '.')))
 
-def send_footer(mod_string=None):
-    if config_get('debug_cgi', False):
-        cgi.print_arguments()
-        cgi.print_form(form)
-        cgi.print_environ()
-    link_inline("sys/footer", kvargs = { 'LAST_MODIFIED': mod_string })
-    print("</body></html>")
-
 def _macro_ELAPSED_TIME(*args, **kvargs):
     return "%03f" % (clock() - start_time)
 
@@ -357,18 +278,14 @@ def _macro_VERSION(*args, **kvargs):
     return __version__
 
 class WikiFormatter:
-    """Object that turns Wiki markup into HTML.
-
-    All formatting commands can be parsed one line at a time, though
-    some state is carried over between lines.
-    """
+    """Object that turns Wiki markup into HTML."""
     def __init__(self, raw, kvargs=None):
         self.raw = raw
         self.kvargs = kvargs or {}
         self.h_level = 0
         self.in_pre = self.in_html = self.in_table = self.in_li = False
         self.in_header = True
-        self.list_indents = []
+        self.list_indents = [] # a list of pairs (indent_level, list_type) to track nested lists
         self.tr_cnt = 0
         self.styles = {
             #wiki   html   enabled?
@@ -381,7 +298,6 @@ class WikiFormatter:
             ",,":  ["sub", False],
             "''":  ["em",  False], # LEGACY
             "'''": ["b",   False], # LEGACY
-            "``":  ["tt",  False], # LEGACY
         }
 
     def _b_repl(self, word):
@@ -393,33 +309,38 @@ class WikiFormatter:
         return '&mdash;'
 
     def _tit_repl(self, word):
+        link = permalink(self.line)
         if self.h_level:
-            result = '</h%d><p>\n' % self.h_level
+            result = '<a class="heading" href="#%s">¶</a></h%d><p>\n' % (link, self.h_level)
             self.h_level = 0
         else:
             self.h_level = len(word) - 1
-            link = permalink(self.line)
-            result = '\n</p><h%d id="%s"><a class="heading" href="#%s">¶</a> ' % (self.h_level, link, link)
+            result = '\n</p><h%d id="%s">' % (self.h_level, link)
         return result
 
     def _br_repl(self, word):
         return '<br />'
 
     def _rule_repl(self, word):
-        return self._undent() + '\n<hr size="%d" noshade="noshade" />\n' % (len(word) - 2)
+        return '\n<hr size="%d" noshade="noshade" />\n' % (len(word) - 2)
 
     def _macro_repl(self, word):
         try:
-            args, kvargs = parse_args(word)
+            args, macro_kvargs = parse_args(word)
+            # Is this a parameter given to the current page?
             if args[0] in self.kvargs:
                 return self.kvargs[args[0]]
+            # Is this an internal macro?
             macro = globals().get('_macro_' + args[0])
             if not macro:
+                # Can we load (and cache) an external macro?
                 exec(open("sys/macros/" + args[0] + ".py").read(), globals())
                 macro = globals().get('_macro_' + args[0])
-            return macro(*args, **kvargs)
+            # Invoke macro passing both macro args augmented by page args
+            macro_kvargs.update(self.kvargs)
+            return macro(*args, **macro_kvargs)
         except Exception, e:
-            msg = cgi.escape(word) + ": " + cgi.escape(e.message)
+            msg = cgi.escape(word) + ": " + cgi.escape(str(e))
             if not self.in_html:
                 msg = '<strong class="error">' + msg + '</strong>'
             return msg
@@ -513,31 +434,26 @@ class WikiFormatter:
         return ''
 
     def _indent_level(self):
-        return len(self.list_indents) and self.list_indents[-1]
+        return len(self.list_indents) and self.list_indents[-1][0]
 
-    def _indent_to(self, new_level):
+    def _indent_to(self, new_level, list_type=''):
         if self._indent_level() == new_level:
             return ''
         s = '</p>'
         while self._indent_level() > new_level:
-            del(self.list_indents[-1])
             if self.in_li:
                 s += '</li>'
                 self.in_li = False # FIXME
-            s += '</ul>\n'
+            s += '</' + self.list_indents[-1][1] + '>\n'
+            del(self.list_indents[-1])
+
+        list_type = ('ul', 'ol')[list_type == '#']
         while self._indent_level() < new_level:
-            self.list_indents.append(new_level)
-            s += '<ul>\n'
+            self.list_indents.append((new_level, list_type))
+            s += '<' + list_type + '>\n'
         s += '<p>'
         return s
 
-    def _undent(self):
-        res = '</p>'
-        res += '</ul>' * len(self.list_indents)
-        res += '<p>'
-        self.list_indents = []
-        return res
-
     def replace(self, match):
         for rule, hit in list(match.groupdict().items()):
             if hit:
@@ -550,7 +466,7 @@ class WikiFormatter:
 
         scan_re = re.compile(r"""(?:
             # Styles and formatting ("--" must cling to a word to disambiguate it from the dash)
-              (?P<b>     \*\* | // | \#\# | __ | --\b | \b-- | \^\^ | ,, | ''' | '' | `` )
+              (?P<b>     \*\* | // | \#\# | __ | --\b | \b-- | \^\^ | ,, | ''' | '' )
             | (?P<tit>   \={2,6})
             | (?P<br>    \\\\)
             | (?P<rule>  ^-{3,})
@@ -558,12 +474,12 @@ class WikiFormatter:
             | (?P<glyph> --)
 
             # Links
-            | (?P<macro> \<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>)
-            | (?P<hurl>  \[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])
+            | (?P<macro> \<\<[^\>]+\>\>)
+            | (?P<hurl>  \[\[[^\]]+\]\])
 
             # Inline HTML
-            | (?P<html>             <(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])\b )
-            | (?P<htmle> ( /\s*> | </(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])> ) )
+            | (?P<html>             <(br|hr|small|div|span|form|iframe|input|textarea|a|img|h[1-5])\b )
+            | (?P<htmle> ( /\s*> | </(br|hr|small|div|span|form|iframe|input|textarea|a|img|h[1-5])> ) )
             | (?P<ent>   [<>&] )
 
             # Auto links (LEGACY)
@@ -575,21 +491,19 @@ class WikiFormatter:
             # Lists, divs, spans and inline objects
             | (?P<li>    ^\s+[\*\#]\s+)
             | (?P<pre>   \{\{\{|\s*\}\}\})
-            | (?P<inl>   \{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})
+            | (?P<inl>   \{\{[^\}]+\}\})
 
             # Tables
             | (?P<tr>    ^\s*\|\|(=|)\s*)
             | (?P<tre>   \s*\|\|(=|)\s*$)
             | (?P<td>    \s*\|\|(=|)\s*)
-
-            # TODO: highlight search words (look at referrer)
           )""", re.VERBOSE)
         pre_re = re.compile("""(?:
               (?P<pre>\s*\}\}\})
             | (?P<ent>[<>&])"
             )""", re.VERBOSE)
         blank_re = re.compile(r"^\s*$")
-        indent_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 each line, we scan through looking for magic strings, outputting verbatim any intervening text
@@ -612,20 +526,27 @@ class WikiFormatter:
                     print('</p><p>')
                 else:
                     indent = indent_re.match(self.line)
-                    #3.0: print(self._indent_to(len(indent.group(0))), end=' ')
-                    print(self._indent_to(len(indent.group(0))))
+                    print(self._indent_to(len(indent.group(1)), indent.group(2)))
+                    # Stand back! Here we apply the monster regex that does all the parsing
                     print(re.sub(scan_re, self.replace, self.line))
 
         if self.in_pre: print('</pre>')
         if self.in_table: print('</tbody></table><p>')
-        print(self._undent())
+        print(self._indent_to(0))
         print('</p></div>')
 
+class HttpException(Exception):
+    def __init__(self, error, query):
+        self.error = error
+        self.query = query
+
 class Page:
-    def __init__(self, page_name):
-        self.page_name = page_name
+    def __init__(self, page_name="Limbo"):
+        self.page_name = page_name.rstrip('/');
         self.msg_text = ''
         self.msg_type = 'error'
+        if not file_re.match(self.page_name):
+            raise HttpException("403 Forbidden", self.page_name)
 
     def split_title(self):
         # look for the end of words and the start of a new word and insert a space there
@@ -637,23 +558,25 @@ class Page:
     def _tmp_filename(self):
         return self.page_name + '.tmp' + str(os.getpid()) + '#'
 
-    def exists(self):
+    def _mtime(self):
         try:
-            os.stat(self._filename())
-            return True
+            return os.stat(self._filename()).st_mtime
         except OSError, err:
             if err.errno == errno.ENOENT:
-                return False
+                return None
             raise err
 
-    def get_raw_body(self, default=None):
+    def exists(self):
+        if self._mtime():
+            return True
+        return False
+
+    def get_raw_body(self):
         try:
             return open(self._filename(), 'rb').read()
         except IOError, err:
             if err.errno == errno.ENOENT:
-                if default is None:
-                    default = '//[[?a=edit&q=%s|Describe %s]]//' % (self.page_name, self.page_name)
-                return default
+                return ''
             if err.errno == errno.EISDIR:
                 return self.format_dir()
             raise err
@@ -662,19 +585,20 @@ class Page:
         out = '== '
         pathname = ''
         for dirname in self.page_name.strip('/').split('/'):
-            pathname = (pathname + '/' + dirname) if pathname else dirname
+            pathname = (pathname and pathname + '/' ) + dirname
             out += '[[' + pathname + '|' + dirname + ']]/'
         out += ' ==\n'
- 
+        images_out = '\n'
+
         for filename in page_list(self._filename(), file_re):
-            if image_re.match(filename):
-                maxwidth = config_get(image_maxwidth, '')
+            if image_re.match(filename) or video_re.match(filename):
+                maxwidth = config_get('image_maxwidth', '400')
                 if maxwidth:
                     maxwidth = ' | maxwidth=' + str(maxwidth)
-                out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth + ' | class=thumbleft}}\n'
+                images_out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth + ' | class=thumbleft}}\n'
             else:
                 out += ' * [[' + self.page_name + '/' + filename + ']]\n'
-        return out
+        return out + images_out
 
     def pragmas(self):
         if not '_pragmas' in self.__dict__:
@@ -690,7 +614,7 @@ class Page:
                     #print "bernie: pragmas[" + m.group(1) + "] = " + m.group(2) + "<br>\n"
             except IOError, err:
                 if err.errno != errno.ENOENT and err.errno != errno.EISDIR:
-                    raise er
+                    raise err
         return self._pragmas
 
     def pragma(self, name, default):
@@ -717,42 +641,129 @@ class Page:
     def can_read(self):
         return self.can("read", True)
 
+    def send_title(self, name=None, text="Limbo", msg_text=None, msg_type='error'):
+        global title_done
+        if title_done: return
+
+        # HEAD
+        emit_header(name and self._mtime())
+        print('<!doctype html>\n<html lang="en">')
+        print("<head><title>%s: %s</title>" % (config_get('site_name', "Unconfigured Wiki"), text))
+        print(' <meta charset="utf-8">')
+        print(' <meta name="viewport" content="width=device-width, initial-scale=1.0">')
+        if not name:
+            print(' <meta name="robots" content="noindex,nofollow" />')
+
+        for http_equiv, content in config_get('meta_urls', {}):
+            print(' <meta http-equiv="%s" content="%s" />' % (http_equiv, relative_url(content)))
+
+        for link in config_get('link_urls', {}):
+            rel, href = link
+            print(' <link rel="%s" href="%s" />' % (rel, relative_url(href)))
+
+        editable = name and self.can_write() and is_privileged()
+        if editable:
+            print(' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
+                % relative_url(name + '?a=edit', privileged=True))
+
+        if name:
+            print(' <link rel="alternate" type="application/atom+xml" title="Atom feed" href="%s" />' \
+                % relative_url(name + '?a=atom'))
+
+        print('</head>')
+
+        # BODY
+        if editable:
+            print('<body ondblclick="location.href=\'' + relative_url(name + '?a=edit', privileged=True) + '\'">')
+        else:
+            print('<body>')
+
+        title_done = True
+        send_guru(msg_text, msg_type)
+
+        if self.pragma("navbar", "on") != "on":
+            return
+
+        # NAVBAR
+        print('<nav><div class="nav">')
+        print link_tag('FrontPage', config_get('site_icon', 'Home'), cssclass='navlink')
+        if name:
+            print('  <b>' + link_tag('?a=titlesearch&q=' + name, text, cssclass='navlink') + '</b> ')
+        else:
+            print('  <b>' + text + '</b> ')
+        print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink'))
+        history = config_get('history_url')
+        if history:
+            print(' | <a href="' + relative_url(history) + '" class="navlink">Recent Changes</a>')
+            if name:
+                print(' | <a href="' + relative_url(history + '?a=history;f=' + name) + '" class="navlink">Page History</a>')
+
+        if name:
+            print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink'))
+            if config_get('privileged_url') is not None:
+                if self.can_write():
+                    print(' | ' + link_tag(name + '?a=edit', 'Edit', cssclass='navlink', privileged=True))
+                else:
+                    print(' | ' + link_tag(name, 'Login', cssclass='login', privileged=True))
+
+        user = remote_user()
+        if user != 'AnonymousCoward':
+            print(' | ' + link_tag('user/' + user, user, cssclass='login'))
+
+        print('<hr /></div></nav>')
+
+    def send_footer(self):
+        if config_get('debug_cgi', False):
+            cgi.print_arguments()
+            cgi.print_form(form)
+            cgi.print_environ()
+        footer = self.pragma("footer", "sys/footer")
+        if footer != "off":
+            link_inline(footer, kvargs = {
+                'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%Y-%m-%dT%I:%M:%S%p'), localtime(self._mtime()))
+            })
+        print('</body></html>')
+
     def send_naked(self, kvargs=None):
         if self.can_read():
-            WikiFormatter(self.get_raw_body(), kvargs).print_html()
+            body = self.get_raw_body()
+            if not body:
+                body = "//[[%s?a=edit|Describe %s]]//" % (self.page_name, self.page_name)
+            WikiFormatter(body, kvargs).print_html()
         else:
-            send_guru("Read access denied by ACLs", "notice")
+            send_guru('Read access denied by ACLs', 'notice')
 
-    def format(self):
+    def send(self):
         #css foo.css
         value = self.pragma("css", None)
         if value:
             global link_urls
             link_urls += [ [ "stylesheet", value ] ]
 
-        send_title(self.page_name, self.split_title(),
-            msg_text=self.msg_text, msg_type=self.msg_type, writable=self.can_write())
+        self.send_title(name=self.page_name, text=self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type)
         self.send_naked()
-        send_footer(self._last_modified())
+        self.send_footer()
 
-    def _last_modified(self):
-        try:
-            from time import localtime, strftime
-            modtime = localtime(os.stat(self._filename())[stat.ST_MTIME])
-        except OSError, err:
-            if err.errno != errno.ENOENT:
-                raise err
-            return None
-        return strftime(config_get(datetime_fmt, '%a %d %b %Y %I:%M %p'), modtime)
+    def send_atom(self):
+        emit_header(self._mtime(), 'application/atom+xml')
+        self.in_html = True
+        link_inline("sys/atom_header", kvargs = {
+            'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%a, %d %b %Y %I:%M:%S %p'), localtime(self._mtime()))
+        })
+        self.in_html = False
+        self.send_naked()
+        self.in_html = True
+        link_inline("sys/atom_footer")
+        self.in_html = False
 
     def send_editor(self, preview=None):
-        send_title(None, 'Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type)
+        self.send_title(text='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
 
         if preview is None:
-            preview = self.get_raw_body(default='')
+            preview = self.get_raw_body()
 
         link_inline("sys/EditPage", kvargs = {
             'EDIT_BODY': cgi.escape(preview),
@@ -763,22 +774,22 @@ class Page:
             print("<div class='preview'>")
             WikiFormatter(preview).print_html()
             print("</div>")
-        send_footer()
+        self.send_footer()
 
     def send_raw(self, mimetype='text/plain', args=[]):
         if not self.can_read():
-            send_title(None, msg_text='Read access denied by ACLs', msg_type='notice')
+            self.send_title(msg_text='Read access denied by ACLs', msg_type='notice')
             return
 
+        emit_header(self._mtime(), mimetype)
         if 'maxwidth' in args:
             import subprocess
-            emit_header(mimetype)
             sys.stdout.flush()
-            subprocess.check_call(['gm', 'convert', self._filename(),
+            subprocess.check_call(['convert', self._filename(),
+                '-auto-orient', '-orient', 'TopLeft',
                 '-scale', args['maxwidth'].value + ' >', '-'])
         else:
             body = self.get_raw_body()
-            emit_header(mimetype)
             print(body)
 
     def _write_file(self, data):
@@ -792,14 +803,16 @@ class Page:
             except OSError, err:
                 if err.errno != errno.ENOENT: raise err
         path = os.path.split(name)[0]
-        if not os.path.exists(path):
+        if path and not os.path.exists(path):
             os.makedirs(path)
         os.rename(tmp_filename, name)
 
     def save(self, newdata, changelog):
         if not self.can_write():
-            self.msg_text = 'Write access denied by ACLs'
-            self.msg_type = 'error'
+            self.msg_text = 'Write access denied by Access Control List'
+            return
+        if not is_privileged():
+            self.msg_text = 'Unauthenticated access denied'
             return
 
         self._write_file(newdata)
@@ -832,13 +845,9 @@ try:
     else:
         send_httperror("403 Forbidden", query_string())
 
+except HttpException, e:
+    send_httperror(e.error, query=e.query)
 except Exception:
-    import traceback
-    msg_text = traceback.format_exc()
-    if title_done:
-        send_guru(msg_text, "error")
-    else:
-        send_title(None, msg_text=msg_text)
-    send_footer()
+    send_httperror("500 Internal Server Error", query=query_string(), trace=True)
 
 sys.stdout.flush()