X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=3b66445ab80b4665304db00481b344b31b4376e1;hb=ec3e42d01c1a77dff06032e35983b0e9933302c8;hp=b34f152188b0544747471a796258d521f9eb0aba;hpb=014d5c705784bfe7b47731ad5cc50568fc5e63cf;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index b34f152..3b66445 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -28,8 +28,9 @@ 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,}/)*([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$")
@@ -69,8 +70,10 @@ def relative_url(pathname, privileged=False):
pathname = url + '/' + pathname
return pathname
-# Formatting stuff --------------------------------------------------
+def permalink(s):
+ return re.sub(' ', '-', re.sub('[^a-z0-9_ ]', '', s.lower()).strip())
+# Formatting stuff --------------------------------------------------
def emit_header(mime_type="text/html"):
print "Content-type: " + mime_type + "; charset=utf-8\n"
@@ -136,14 +139,13 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error'):
# Navbar
print '
'
- print '
' + site_name + ': ',
if name:
- print link_tag('?fullsearch=' + name, text, 'navlink') + ' '
+ print '
' + link_tag('?fullsearch=' + name, text, 'navlink') + ' '
else:
- print text + ' '
+ print '
' + text + ' '
print ' | ' + link_tag('FrontPage', 'Front Page', 'navlink')
print ' | ' + link_tag('FindPage', 'Find Page', 'navlink')
- if globals().has_key('history_url'):
+ if 'history_url' in globals():
print ' |
Recent Changes'
if name:
print ' |
Page History'
@@ -176,7 +178,7 @@ def link_tag(params, text=None, ss_class=None, privileged=False):
# 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)
@@ -203,7 +205,7 @@ def do_fullsearch(needle):
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 + '"')
@@ -221,22 +223,26 @@ def do_titlesearch(needle):
def print_search_stats(hits, searched):
print "
%d hits out of %d pages searched.
" % (hits, searched)
-def do_raw(pagename):
+def handle_raw(pagename):
Page(pagename).send_raw()
-def do_edit(pagename):
+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_text = 'Editing canceled'
pg.msg_type = 'notice'
pg.send_page()
- else:
- pg.send_editor()
+ else: # preview or edit
+ text = None
+ if 'preview' in form:
+ text = form['savetext'].value
+ pg.send_editor(text)
def make_index_key():
links = map(lambda ch: '
%s' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz')
@@ -248,7 +254,7 @@ def page_list():
def send_footer(name, mod_string=None):
if globals().get('debug_cgi', False):
cgi.print_arguments()
- cgi.print_form(cgi.FieldStorage())
+ cgi.print_form(form)
cgi.print_environ()
print '