X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=0ff2e7a007527f0d2fa2ce9e9212ceffd839e88e;hb=559fd0250c8103477eaaad02b38c2ccfdbdda9f7;hp=84f1db5f3a0305e5f9ef8a39ca101335b75356f6;hpb=cb4160fc9e77f9fe29bca28ed504ca38dac94089;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index 84f1db5..0ff2e7a 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
@@ -23,15 +23,16 @@ __version__ = '$Id$'[4:12]
from time import clock
start_time = clock()
-import cgi, sys, string, os, re, errno, stat
-from os import path, environ
+import cgi, sys, os, re, errno, stat
# 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$")
-img_re = re.compile(r"^.*\.(png|gif|jpg|jpeg)$", re.IGNORECASE)
+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|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
@@ -39,52 +40,53 @@ title_done = False
# CGI stuff ---------------------------------------------------------
def script_name():
- return environ.get('SCRIPT_NAME', '')
+ return os.environ.get('SCRIPT_NAME', '')
def privileged_path():
return privileged_url or script_name()
def remote_user():
- user = environ.get('REMOTE_USER', '')
+ user = os.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', '')
+ return os.environ.get('REMOTE_ADDR', '')
def get_hostname(addr):
try:
from socket import gethostbyaddr
return gethostbyaddr(addr)[0] + ' (' + addr + ')'
- except:
+ except Exception:
return addr
-def relative_url(path, privileged=False):
- if not (url_re.match(path) or path.startswith('/')):
+def relative_url(pathname, privileged=False):
+ if not (url_re.match(pathname) or pathname.startswith('/')):
if privileged:
url = privileged_path()
else:
url = script_name()
- path = url + '/' + path
- return path
+ pathname = url + '/' + pathname
+ return pathname
-# Formatting stuff --------------------------------------------------
+def permalink(s):
+ return re.sub(' ', '-', re.sub('[^a-z0-9_ ]', '', s.lower()).strip())
-def emit_header(type="text/html"):
- print "Content-type: " + type + "; charset=utf-8"
- print
+# Formatting stuff --------------------------------------------------
+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 msg == '': return
+def send_guru(msg_text, msg_type):
+ if not msg_text: return
print '
'
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 '\n Guru Meditation #DEADBEEF.ABADC0DE'
print '
'
- # FIXME: This simple JS snippet is harder to pass than ACID 3.0
+ # FIXME: This little JS snippet is harder to pass than ACID 3.0
print """
"""
-def send_title(name, text="Limbo", msg=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
@@ -117,42 +119,59 @@ def send_title(name, text="Limbo", msg=None, msg_type='error'):
print ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
print ''
- site_name = globals().get('site_name', 'Unconfigured Site')
print "%s: %s" % (site_name, text)
print ' '
if not name:
print ' '
- for css in css_url:
- print ' ' % relative_url(css)
+
+ for meta in meta_urls:
+ http_equiv, content = meta
+ print ' ' % (http_equiv, relative_url(content))
+
+ 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 ''
title_done = True
- send_guru(msg, msg_type)
+ send_guru(msg_text, msg_type)
# Navbar
print '