X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=geekigeeki.py;h=624a8c72abd7e6b644fc8762d589334d0f357395;hb=74ea71bcbb270f0114dd4946c831dc0d76983958;hp=8c9fe64f7bf37cfd82261ac492957b5149e4ac13;hpb=96e9789ac9ff9770e7c605555948f23b8ba48b83;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index 8c9fe64..624a8c7 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -1,16 +1,16 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
-# Copyright 1999, 2000 Martin Pool
-# Copyright 2002 Gerardo Poggiali
-# Copyright 2007, 2008, 2009 Bernie Innocenti
+# Copyright (C) 1999, 2000 Martin Pool
+# Copyright (C) 2002 Gerardo Poggiali
+# Copyright (C) 2007, 2008, 2009 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
-# 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 General Public License along with this program.
-# If not, see .
+# 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 .
__version__ = '4.0-' + '$Id$'[4:11]
@@ -22,11 +22,11 @@ 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_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_\.\-/]*)")
-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 ---------------------------------------------------------
@@ -36,6 +36,7 @@ def config_get(key, default=None):
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]
@@ -46,8 +47,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', '')
@@ -71,7 +73,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
@@ -118,21 +120,18 @@ def send_guru(msg_text, msg_type):
print(cgi.escape(msg_text))
if msg_type == 'error':
print '\n Guru Meditation #DEADBEEF.ABADC0DE'
- print('' \
+ 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
- # Head
+ # HEAD
emit_header(mtime)
- print('')
- print('')
-
+ print('\n')
print("%s: %s" % (config_get('site_name', "Unconfigured Wiki"), text))
- print(' ')
+ print(' ')
if not name:
print(' ')
@@ -143,7 +142,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
rel, href = link
print(' ' % (rel, relative_url(href)))
- editable = name and writable and config_get('privileged_url') is not None
+ editable = name and writable and is_privileged()
if editable:
print(' ' \
% relative_url('?a=edit&q=' + name, privileged=True))
@@ -155,7 +154,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
print('')
- # Body
+ # BODY
if editable:
print('')
else:
@@ -164,8 +163,11 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
title_done = True
send_guru(msg_text, msg_type)
- # Navbar
- print('
')
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:
text = humanlink(dest)
elif image_re.match(text):
- text = ''
+ text = ''
link_class = kvargs.get('class', kvargs.get('cssclass', None))
if not link_class:
@@ -305,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)
@@ -345,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("")
-
def _macro_ELAPSED_TIME(*args, **kvargs):
return "%03f" % (clock() - start_time)
@@ -386,7 +379,6 @@ class WikiFormatter:
",,": ["sub", False],
"''": ["em", False], # LEGACY
"'''": ["b", False], # LEGACY
- "``": ["tt", False], # LEGACY
}
def _b_repl(self, word):
@@ -550,7 +542,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-- | \^\^ | ,, | ''' | '' | `` )
+ (?P \*\* | // | \#\# | __ | --\b | \b-- | \^\^ | ,, | ''' | '' )
| (?P \={2,6})
| (?P \\\\)
| (?P ^-{3,})
@@ -612,8 +604,8 @@ class WikiFormatter:
print('
')
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(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('')
@@ -622,8 +614,8 @@ class WikiFormatter:
print('
')
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'
@@ -666,19 +658,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', '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__:
@@ -694,7 +687,7 @@ class Page:
#print "bernie: pragmas[" + m.group(1) + "] = " + m.group(2) + " \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):
@@ -721,6 +714,17 @@ class Page:
def can_read(self):
return self.can("read", True)
+ def send_footer(mtime=None, footer="sys/footer"):
+ if config_get('debug_cgi', False):
+ cgi.print_arguments()
+ cgi.print_form(form)
+ cgi.print_environ()
+ if footer != "off":
+ link_inline(footer, kvargs = {
+ 'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%a %d %b %Y %I:%M %p'), localtime(mtime))
+ })
+ print("