X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=00d74ceddf409a7ec29a2c79e80a5f74ffdb3773;hb=397c50a4c4301742ea3fad1dd0f30d596f071bd3;hp=a5ba6a2d388565ae9ac3f5dff29ca48f8126fb50;hpb=49c44a83e5e434114dd90c1672579cf66ee46e86;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index a5ba6a2..00d74ce 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -25,7 +25,7 @@ video_ext = "ogg|ogv|oga" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|a image_re = re.compile(r".*\.(" + image_ext + "|" + video_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_\.\-/]*)$") +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"\.([^\./]+)$") @@ -123,7 +123,7 @@ def send_guru(msg_text, msg_type): print('' \ % relative_url('sys/GuruMeditation.js')) -def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False, mtime=None): +def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False, mtime=None, navbar="on"): global title_done if title_done: return @@ -163,6 +163,9 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal title_done = True send_guru(msg_text, msg_type) + if navbar != "on": + return + # NAVBAR print('') print link_tag('FrontPage', config_get('site_icon', 'Home'), cssclass='navlink') @@ -195,8 +198,9 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal def send_httperror(status="403 Not Found", query=""): print("Status: %s" % status) + page = Page() send_title(None, msg_text=("%s: on query '%s'" % (status, query))) - send_footer() + page.send_footer() def link_tag(dest, text=None, privileged=False, **kvargs): if text is None: @@ -304,7 +308,7 @@ def handle_edit(pagename, form): send_httperror("403 Forbidden", pagename) return - pg = Page(form['q'].value) + pg = Page(form['q'].value) if 'save' in form: if form['file'].value: pg.save(form['file'].file.read(), form['changelog'].value) @@ -344,16 +348,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(mtime=None): - if config_get('debug_cgi', False): - cgi.print_arguments() - cgi.print_form(form) - cgi.print_environ() - link_inline("sys/footer", kvargs = { - 'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%a %d %b %Y %I:%M %p'), localtime(mtime)) - }) - print("