#
# Copyright 1999, 2000 Martin Pool <mbp@humbug.org.au>
# Copyright 2002 Gerardo Poggiali
-# Copyright 2007, 2008 Bernardo Innocenti <bernie@codewiz.org>
+# Copyright 2007, 2008 Bernie Innocenti <bernie@codewiz.org>
#
# 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
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
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 '</pre>'
# FIXME: This little JS snippet is harder to pass than ACID 3.0
print """
}
</script>"""
-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
print ' <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />'
if not name:
print ' <meta name="robots" content="noindex,nofollow" />'
- for css in css_url:
- print ' <link rel="stylesheet" type="text/css" href="%s" />' % relative_url(css)
+
+ for link in link_urls:
+ rel, href = link
+ print ' <link rel="%s" href="%s" />' % (rel, relative_url(href))
+
+ if name and writable and privileged_url is not None:
+ print ' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
+ % (privileged_path() + '?edit=' + name)
+
+ if history_url is not None:
+ print ' <link rel="alternate" type="application/rss+xml" title="RSS" href="%s" />' \
+ % relative_url(history_url + '?a=rss')
+
print '</head>'
# Body
- if name and privileged_url is not None:
+ if name and writable and privileged_url is not None:
print '<body ondblclick="location.href=\'' + privileged_path() + '?edit=' + name + '\'">'
else:
print '<body>'
print ' <b>' + link_tag('?fullsearch=' + name, text, 'navlink') + '</b> '
else:
print ' <b>' + text + '</b> '
- 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 ' | <a href="' + history_url + '" class="navlink">Recent Changes</a>'
+ print ' | <a href="' + relative_url(history_url) + '" class="navlink">Recent Changes</a>'
if name:
- print ' | <a href="' + history_url + '?a=history;f=' + name + '" class="navlink">Page History</a>'
+ print ' | <a href="' + relative_url(history_url + '?a=history;f=' + name) + '" class="navlink">Page History</a>'
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 ' | <i>Immutable Page</i>'
print '<hr /></div>'
+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
print "<p>%d hits out of %d pages searched.</p>" % (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.save(form['savetext'].value.replace('\r\n', '\n'), form['changelog'].value)
pg.format()
elif 'cancel' in form:
pg.msg_text = 'Editing canceled'
links = map(lambda ch: '<a href="#%s">%s</a>' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz')
return '<p><center>'+ ' | '.join(links) + '</center></p>'
-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 '<div id="footer"><hr />'
- print ('<p class="copyright"><span class="benchmark">generated in %0.3fs</span>' +
- ' by <a href="http://www.codewiz.org/wiki/GeekiGeeki">GeekiGeeki</a>' +
- ' version %s</p>') % (clock() - start_time, __version__)
+ print '''
+<div id="footer"><hr />
+<p class="copyright">
+<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img class="license" alt="Creative Commons License" src="http://i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a>
+<span class="benchmark">generated in %0.3fs</span> by <a href="http://www.codewiz.org/wiki/GeekiGeeki">GeekiGeeki</a> version %s
+</p>
+''' % (clock() - start_time, __version__)
if mod_string:
print '<p class="modified">last modified %s</p>' % mod_string
print '</div></body></html>'
-class PageFormatter:
+class WikiFormatter:
"""Object that turns Wiki markup into HTML.
All formatting commands can be parsed one line at a time, though
macro = globals().get('_macro_' + name)
if not macro:
- execfile("macros/" + name + ".py", globals())
+ try:
+ execfile("macros/" + name + ".py", globals())
+ except IOError, er:
+ if er.errno == errno.ENOENT:
+ pass
macro = globals().get('_macro_' + name)
if macro:
return macro(argv)
return '<strong class="error"><<' + '|'.join(argv) + '>></strong>'
def _hurl_repl(self, word):
- m = re.compile("\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\]").match(word)
+ m = link_re.match(word)
+ name = m.group(1)
+ descr = m.group(2)
+ if descr is None:
+ descr = name
+ elif img_re.match(m.group(2)):
+ descr = '<img border="0" src="' + descr + '" />'
+
+ return link_tag(name, descr, 'wikilink')
+
+ def _inl_repl(self, word):
+ m = link_re.match(word)
name = m.group(1)
descr = m.group(2) or name
+ name = relative_url(name)
+ argv = descr.split('|')
+ descr = argv.pop(0)
- if img_re.match(name):
- name = relative_url(name)
- # The "extthumb" nonsense works around a limitation of the HTML block model
- return '<div class="extthumb"><div class="thumb"><a href="%s"><img border="0" src="%s" alt="%s" /></a><div class="caption">%s</div></div></div>' % (name, name, descr, descr)
+ if argv:
+ args = '?' + '&'.join(argv)
else:
- if img_re.match(descr):
- descr = '<img border="0" src="' + descr + '" />'
+ args = ''
- return link_tag(name, descr, 'wikilink')
+ if descr:
+ # The "extthumb" nonsense works around a limitation of the HTML block model
+ return '<div class="extthumb"><div class="thumb"><a href="%s"><img border="0" src="%s" alt="%s" /></a><div class="caption">%s</div></div></div>' \
+ % (name, name + args, descr, descr)
+ else:
+ return '<a href="%s"><img border="0" src="%s" /></a>' % (name, name + args)
def _email_repl(self, word):
return '<a href="mailto:%s">%s</a>' % (word, word)
+ r"|(?P<hurl>\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
# Inline HTML
- + r"|(?P<html><(/|)(br|hr|div|form|iframe|input|span))"
+ + r"|(?P<html><(/|)(br|hr|div|span|form|iframe|input|textarea|a))"
+ r"|(?P<ent>[<>&])"
- # Auto links
- + r"|(?P<img>\b[a-zA-Z0-9_-]+\.(png|gif|jpg|jpeg|bmp))" # LEGACY
- + r"|(?P<word>\b(?:[A-Z][a-z]+){2,}\b)" # LEGACY
- + r"|(?P<url>(http|https|ftp|mailto)\:[^\s'\"]+\S)" # LEGACY
- + r"|(?P<email>[-\w._+]+\@[\w.-]+)" # LEGACY
+ # Auto links (LEGACY)
+ + r"|(?P<img>\b[a-zA-Z0-9_/-]+\.(png|gif|jpg|jpeg|bmp|ico))"
+ + r"|(?P<word>\b(?:[A-Z][a-z]+){2,}\b)"
+ + r"|(?P<url>(http|https|ftp|mailto)\:[^\s'\"]+\S)"
+ + r"|(?P<email>[-\w._+]+\@[\w.-]+)"
# Lists, divs, spans
+ r"|(?P<li>^\s+[\*#] +)"
+ r"|(?P<pre>\{\{\{|\s*\}\}\})"
- + r"|(?P<inl>\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})" #TODO
+ + r"|(?P<inl>\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})"
# Tables
+ r"|(?P<tr>^\s*\|\|(=|)\s*)"
# look for the end of words and the start of a new word and insert a space there
return re.sub('([a-z])([A-Z])', r'\1 \2', self.page_name)
- def _text_filename(self):
+ def _filename(self):
return path.join(data_dir, self.page_name)
def _tmp_filename(self):
def exists(self):
try:
- os.stat(self._text_filename())
+ os.stat(self._filename())
return True
except OSError, er:
if er.errno == errno.ENOENT:
def get_raw_body(self):
try:
- return open(self._text_filename(), 'rb').read()
+ return open(self._filename(), 'rb').read()
except IOError, er:
if er.errno == errno.ENOENT:
return '' # just doesn't exist, use default
if er.errno == errno.EISDIR:
- return 'DIR'
+ return self.format_dir()
raise er
+ def format_dir(self):
+ out = '== '
+ path = ''
+ for dir in self.page_name.split('/'):
+ path = (path + '/' + dir) if path else dir
+ out += '[[' + path + '|' + dir + ']]/'
+ out += ' ==\n'
+
+ for file in page_list(self._filename(), file_re):
+ if img_re.match(file):
+ if image_maxwidth:
+ maxwidth_arg = '|maxwidth=' + str(image_maxwidth)
+ out += '{{' + self.page_name + '/' + file + '|' + file + maxwidth_arg + '}}\n'
+ else:
+ out += ' * [[' + self.page_name + '/' + file + ']]\n'
+ return out
def get_attrs(self):
if 'attrs' in self.__dict__:
return self.attrs
self.attrs = {}
try:
- file = open(self._text_filename(), 'rt')
+ file = open(self._filename(), 'rt')
attr_re = re.compile(r"^#(\S*)(.*)$")
for line in file:
m = attr_re.match(line)
self.attrs[m.group(1)] = m.group(2).strip()
#print "bernie: attrs[" + m.group(1) + "] = " + m.group(2) + "<br>\n"
except IOError, er:
- if er.errno != errno.ENOENT:
+ if er.errno != errno.ENOENT and er.errno != errno.EISDIR:
raise er
return self.attrs
def send_naked(self):
if self.can_read():
- PageFormatter(self.get_raw_body()).print_html()
+ WikiFormatter(self.get_raw_body()).print_html()
else:
send_guru("Read access denied by ACLs", "notice")
def format(self):
- page_name = None
- if self.can_write():
- page_name = self.page_name
-
- #css foo.css bar.css
- global css_url
- css_url = self.get_attr("css", "").split() + css_url
-
- send_title(page_name, self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type)
+ #css foo.css
+ value = self.get_attr("css", None)
+ if value:
+ global link_urls
+ link_urls += [ [ "stylesheet", value ] ]
+
+ send_title(self.page_name, self.split_title(),
+ msg_text=self.msg_text, msg_type=self.msg_type, writable=self.can_write())
self.send_naked()
- send_footer(page_name, self._last_modified())
+ send_footer(self.page_name, self._last_modified())
def _last_modified(self):
try:
from time import localtime, strftime
- modtime = localtime(os.stat(self._text_filename())[stat.ST_MTIME])
+ modtime = localtime(os.stat(self._filename())[stat.ST_MTIME])
except OSError, er:
if er.errno != errno.ENOENT:
raise er
+ ' for ' + cgi.escape(remote_user())
+ ' from ' + cgi.escape(get_hostname(remote_host()))
+ '</b></p>')
- print '<div class="editor"><form method="post" enctype="multipart/form-data" action="%s">' % relative_url(self.page_name)
+ print '<div class="editor"><form name="editform" method="post" enctype="multipart/form-data" action="%s">' % relative_url(self.page_name)
print '<input type="hidden" name="edit" value="%s">' % (self.page_name)
- print '<textarea wrap="off" spellcheck="true" id="editor" name="savetext" rows="17" cols="100">%s</textarea>' % (preview or self.get_raw_body())
- print 'Or upload a file: <input type="file" name="file" value="%s" />' % file
+ print '<input type="input" id="editor" name="changelog" value="Edit page %s" accesskey="c" /><br />' % (self.page_name)
+ print '<textarea wrap="off" spellcheck="true" id="editor" name="savetext" rows="17" cols="100" accesskey="e">%s</textarea>' % cgi.escape(preview or self.get_raw_body())
+ print '<label for="file" accesskey="u">Or Upload a file:</label> <input type="file" name="file" value="%s" />' % file
print """
<br />
- <input type="submit" name="save" value="Save" />
- <input type="submit" name="preview" value="Preview" />
+ <input type="submit" name="save" value="Save" accesskey="s">
+ <input type="submit" name="preview" value="Preview" accesskey="p" />
<input type="reset" value="Reset" />
<input type="submit" name="cancel" value="Cancel" />
<br />
- </form></div>"""
+ </form></div>
+ <script language="javascript">
+ <!--
+ document.editform.savetext.focus()
+ //-->
+ </script>
+ """
print "<p>" + Page('EditingTips').link_to() + "</p>"
if preview:
print "<div class='preview'>"
- PageFormatter(preview).print_html()
+ WikiFormatter(preview).print_html()
print "</div>"
send_footer(self.page_name)
else:
send_title(None, msg_text='Read access denied by ACLs', msg_type='notice')
+ def send_image(self, mimetype, args=[]):
+ if 'maxwidth' in args:
+ import subprocess
+ emit_header(mimetype)
+ sys.stdout.flush()
+ subprocess.check_call(['gm', 'convert', self._filename(),
+ '-scale', args['maxwidth'].value + ' >', '-'])
+ else:
+ self.send_raw(mimetype)
+
def _write_file(self, data):
tmp_filename = self._tmp_filename()
open(tmp_filename, 'wb').write(data)
- name = self._text_filename()
+ name = self._filename()
if os.name == 'nt':
# Bad Bill! POSIX rename ought to replace. :-(
try:
if er.errno != errno.ENOENT: raise er
os.rename(tmp_filename, name)
- def save(self, newdata):
+ def save(self, newdata, changelog):
if not self.can_write():
self.msg_text = 'Write access denied by ACLs'
self.msg_type = 'error'
cmd = ( post_edit_hook
+ " '" + data_dir + '/' + self.page_name
+ "' '" + remote_user()
- + "' '" + remote_host() + "'"
+ + "' '" + remote_host()
+ + "' '" + changelog + "'"
)
out = os.popen(cmd)
output = out.read()
else:
from mimetypes import MimeTypes
type, encoding = MimeTypes().guess_type(query)
- type = type or 'text/plain'
- Page(query).send_raw(mimetype=type)
+ #type = type or 'text/plain'
+ #Page(query).send_raw(mimetype=type)
+ if type:
+ if type.startswith('image/'):
+ Page(query).send_image(mimetype=type,args=form)
+ else:
+ Page(query).send_raw(mimetype=type)
+ else:
+ Page(query).format()
else:
- print "Status: 404 Not Found"
- send_title(None, msg_text='Can\'t work out query: ' + query)
- send_footer(None)
+ send_httperror("403 Forbidden", query)
except Exception:
import traceback
msg_text = traceback.format_exc()