X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=a7e99ed10121c9af816cfc76eddc0707edeeec94;hb=152bbe08d73f7ffa9b8fa9f5a841ac643f3d75a5;hp=ca59dcc8a150d690b92ca4c1f43ff68b25e15666;hpb=4b7dd02a651033602a4e092a981a973dd20573e7;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index ca59dcc..a7e99ed 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -3,7 +3,7 @@
#
# Copyright 1999, 2000 Martin Pool
# Copyright 2002 Gerardo Poggiali
-# Copyright 2007, 2008 Bernardo Innocenti
+# Copyright 2007, 2008 Bernie Innocenti
#
# 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
@@ -31,8 +31,9 @@ from os import path, environ
word_re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){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)
+img_re = re.compile(r"^.*\.(png|gif|jpg|jpeg|bmp|ico)$", re.IGNORECASE)
url_re = re.compile(r"^[a-z]{3,8}://[^\s'\"]+\S$")
+link_re = re.compile("(?:\[\[|{{)([^\s\|]+)(?:\s*\|\s*([^\]]+)|)(?:\]\]|}})")
title_done = False
@@ -84,7 +85,7 @@ def send_guru(msg_text, msg_type):
print ' Software Failure. Press left mouse button to continue.\n'
print msg_text
if msg_type == 'error':
- print ' Guru Meditation #DEADBEEF.ABADC0DE'
+ print '\n Guru Meditation #DEADBEEF.ABADC0DE'
print ''
# FIXME: This little JS snippet is harder to pass than ACID 3.0
print """
@@ -109,7 +110,7 @@ def send_guru(msg_text, msg_type):
}
"""
-def send_title(name, text="Limbo", msg_text=None, msg_type='error'):
+def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False):
global title_done
if title_done: return
@@ -124,12 +125,23 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error'):
print ' '
if not name:
print ' '
- for css in css_url:
- print ' ' % relative_url(css)
+
+ for link in link_urls:
+ rel, href = link
+ print ' ' % (rel, relative_url(href))
+
+ if name and writable and privileged_url is not None:
+ print ' ' \
+ % (privileged_path() + '?edit=' + name)
+
+ if history_url is not None:
+ print ' ' \
+ % relative_url(history_url + '?a=rss')
+
print ''
# Body
- if name and privileged_url is not None:
+ if name and writable and privileged_url is not None:
print ''
else:
print ''
@@ -143,17 +155,21 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error'):
print ' ' + link_tag('?fullsearch=' + name, text, 'navlink') + ' '
else:
print ' ' + text + ' '
- print ' | ' + link_tag('FrontPage', 'Front Page', 'navlink')
+ print ' | ' + link_tag('FrontPage', 'Home', 'navlink')
print ' | ' + link_tag('FindPage', 'Find Page', 'navlink')
if 'history_url' in globals():
- print ' | Recent Changes'
+ print ' | Recent Changes'
if name:
- print ' | Page History'
+ print ' | Page History'
if name:
print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink')
if privileged_url is not None:
- print ' | ' + link_tag('?edit=' + name, 'Edit Page', 'navlink', privileged=True)
+ if writable:
+ print ' | ' + link_tag('?edit=' + name, 'Edit', 'navlink', privileged=True)
+ else:
+ print ' | ' + link_tag(name, 'Login', 'navlink', privileged=True)
+
else:
print ' | Immutable Page'
@@ -163,6 +179,11 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error'):
print '
'
+def send_httperror(status="403 Not Found", query=""):
+ print "Status: %s" % status
+ send_title(None, msg_text=("%s: on query '%s'" % (status, query)))
+ send_footer(None)
+
def link_tag(params, text=None, ss_class=None, privileged=False):
if text is None:
text = params # default
@@ -224,20 +245,28 @@ def print_search_stats(hits, searched):
print "%d hits out of %d pages searched.
" % (hits, searched)
def handle_raw(pagename):
+ if not file_re.match(pagename):
+ send_httperror("403 Forbidden", pagename)
+ return
+
Page(pagename).send_raw()
def handle_edit(pagename):
+ if not file_re.match(pagename):
+ send_httperror("403 Forbidden", pagename)
+ return
+
pg = Page(pagename)
if 'save' in form:
if form['file'].value:
- pg.save(form['file'].file.read())
+ pg.save(form['file'].file.read(), form['changelog'].value)
else:
- pg.save(form['savetext'].value.replace('\r\n', '\n'))
- pg.send_page()
+ pg.save(form['savetext'].value.replace('\r\n', '\n'), form['changelog'].value)
+ pg.format()
elif 'cancel' in form:
pg.msg_text = 'Editing canceled'
pg.msg_type = 'notice'
- pg.send_page()
+ pg.format()
else: # preview or edit
text = None
if 'preview' in form:
@@ -248,78 +277,26 @@ def make_index_key():
links = map(lambda ch: '%s' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz')
return ''+ ' | '.join(links) + '
'
-def page_list():
- return filter(word_re.match, os.listdir(data_dir))
+def page_list(dir = None, re = word_re):
+ return sorted(filter(re.match, os.listdir(dir or data_dir)))
def send_footer(name, mod_string=None):
if globals().get('debug_cgi', False):
cgi.print_arguments()
cgi.print_form(form)
cgi.print_environ()
- print '