#
# Copyright (C) 1999, 2000 Martin Pool <mbp@humbug.org.au>
# Copyright (C) 2002 Gerardo Poggiali
-# Copyright (C) 2007, 2008, 2009, 2010 Bernie Innocenti <bernie@codewiz.org>
+# Copyright (C) 2007, 2008, 2009, 2010, 2011 Bernie Innocenti <bernie@codewiz.org>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
import cgi, sys, os, re, errno, stat, glob
image_ext = 'png|gif|jpg|jpeg|bmp|ico'
- video_ext = "ogg|ogv|oga|webm" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt
+ video_ext = "ogg|ogv|oga|webm" # Not supported by Firefox 3.6: 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)
# FIXME: we accept stuff like foo/../bar and we shouldn't
# Prevent caching when the wiki engine gets updated
mtime = max(mtime, os.stat(__file__).st_mtime)
print("Last-Modified: " + strftime("%a, %d %b %Y %H:%M:%S GMT", gmtime(mtime)))
- if mime_type:
- print("Content-type: " + mime_type + "; charset=utf-8")
+ else:
+ print("Cache-Control: must-revalidate, max-age=0")
+ print("Content-type: " + mime_type + "; charset=utf-8")
print('')
def send_guru(msg_text, msg_type):
print('</pre><script type="text/javascript" src="%s" defer="defer"></script>' \
% relative_url('sys/GuruMeditation.js'))
-def send_httperror(status="403 Not Found", query="", trace=False):
+def send_httperror(status="404 Not Found", query="", trace=False):
print("Status: %s" % status)
msg_text = "%s: on query '%s'" % (status, query)
if trace:
text = config_get('nonexist_pfx', '') + text
link_class = 'nonexistent'
- # Prevent crawlers from following links potentially added by spammers or to generated pages
+ # Prevent crawlers from following links potentially added by spammers and to autogenerated pages
nofollow = ''
- if link_class == 'external' or link_class == 'navlink':
+ if link_class in ('external', 'navlink', 'nonexistent'):
nofollow = 'rel="nofollow" '
return '<a class="%s" %shref="%s">%s</a>' % (link_class, nofollow, relative_url(dest, privileged=privileged), text)
Page(pagename).send_atom()
def handle_edit(pagename, form):
- pg = Page(form['q'].value)
+ pg = Page(pagename)
if 'save' in form:
if form['file'].value:
pg.save(form['file'].file.read(), form['changelog'].value)
return '—'
def _tit_repl(self, word):
+ link = permalink(self.line)
if self.h_level:
- result = '</h%d><p>\n' % self.h_level
+ result = '<a class="heading" href="#%s">¶</a></h%d><p>\n' % (link, self.h_level)
self.h_level = 0
else:
self.h_level = len(word) - 1
- link = permalink(self.line)
- result = '\n</p><h%d id="%s"><a class="heading" href="#%s">¶</a> ' % (self.h_level, link, link)
+ result = '\n</p><h%d id="%s">' % (self.h_level, link)
return result
def _br_repl(self, word):
| (?P<hurl> \[\[[^\]]+\]\])
# Inline HTML
- | (?P<html> <(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])\b )
- | (?P<htmle> ( /\s*> | </(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])> ) )
+ | (?P<html> <(br|hr|small|div|span|form|iframe|input|textarea|a|img|h[1-5])\b )
+ | (?P<htmle> ( /\s*> | </(br|hr|small|div|span|form|iframe|input|textarea|a|img|h[1-5])> ) )
| (?P<ent> [<>&] )
# Auto links (LEGACY)
| (?P<tr> ^\s*\|\|(=|)\s*)
| (?P<tre> \s*\|\|(=|)\s*$)
| (?P<td> \s*\|\|(=|)\s*)
-
- # TODO: highlight search words (look at referrer)
)""", re.VERBOSE)
pre_re = re.compile("""(?:
(?P<pre>\s*\}\}\})
return True
return False
- def get_raw_body(self, default=None):
+ def get_raw_body(self):
try:
return open(self._filename(), 'rb').read()
except IOError, err:
if err.errno == errno.ENOENT:
- if default is None:
- default = '//[[?a=edit&q=%s|Describe %s]]//' % (self.page_name, self.page_name)
- return default
+ return ''
if err.errno == errno.EISDIR:
return self.format_dir()
raise err
if title_done: return
# HEAD
- emit_header(self._mtime())
+ emit_header(name and self._mtime())
print('<!doctype html>\n<html lang="en">')
print("<head><title>%s: %s</title>" % (config_get('site_name', "Unconfigured Wiki"), text))
- print(' <meta charset="UTF-8">')
+ print(' <meta charset="utf-8">')
if not name:
print(' <meta name="robots" content="noindex,nofollow" />')
editable = name and self.can_write() and is_privileged()
if editable:
print(' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
- % relative_url('?a=edit&q=' + name, privileged=True))
+ % relative_url(name + '?a=edit', privileged=True))
- history = config_get('history_url')
- if history is not None:
- print(' <link rel="alternate" type="application/rss+xml" title="RSS" href="%s" />' \
- % relative_url(history + '?a=rss'))
+ print(' <link rel="alternate" type="application/atom+xml" title="Atom feed" href="%s" />' \
+ % relative_url(name + '?a=atom'))
print('</head>')
# BODY
if editable:
- print('<body ondblclick="location.href=\'' + relative_url('?a=edit&q=' + name, privileged=True) + '\'">')
+ print('<body ondblclick="location.href=\'' + relative_url(name + '?a=edit', privileged=True) + '\'">')
else:
print('<body>')
else:
print(' <b>' + text + '</b> ')
print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink'))
+ history = config_get('history_url')
if history:
print(' | <a href="' + relative_url(history) + '" class="navlink">Recent Changes</a>')
if name:
print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink'))
if config_get('privileged_url') is not None:
if self.can_write():
- print(' | ' + link_tag('?a=edit&q=' + name, 'Edit', cssclass='navlink', privileged=True))
+ print(' | ' + link_tag(name + '?a=edit', 'Edit', cssclass='navlink', privileged=True))
else:
- print(' | ' + link_tag(name, 'Login', cssclass='navlink', privileged=True))
+ print(' | ' + link_tag(name, 'Login', cssclass='login', privileged=True))
user = remote_user()
if user != 'AnonymousCoward':
- print(' | <span class="login"><i><b>' + link_tag('User/' + user, user) + '</b></i></span>')
+ print(' | ' + link_tag('user/' + user, user, cssclass='login'))
print('<hr /></div></nav>')
link_inline(footer, kvargs = {
'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%Y-%m-%dT%I:%M:%S%p'), localtime(self._mtime()))
})
- print("</body></html>")
+ print('</body></html>')
def send_naked(self, kvargs=None):
if self.can_read():
- WikiFormatter(self.get_raw_body(), kvargs).print_html()
+ body = self.get_raw_body()
+ if not body:
+ body = "//[[%s?a=edit|Describe %s]]//" % (self.page_name, self.page_name)
+ WikiFormatter(body, kvargs).print_html()
else:
- send_guru("Read access denied by ACLs", "notice")
+ send_guru('Read access denied by ACLs', 'notice')
def send(self):
#css foo.css
return
if preview is None:
- preview = self.get_raw_body(default='')
+ preview = self.get_raw_body()
link_inline("sys/EditPage", kvargs = {
'EDIT_BODY': cgi.escape(preview),
if 'maxwidth' in args:
import subprocess
sys.stdout.flush()
- subprocess.check_call(['gm', 'convert', self._filename(),
+ subprocess.check_call(['convert', self._filename(),
+ '-auto-orient', '-orient', 'TopLeft',
'-scale', args['maxwidth'].value + ' >', '-'])
else:
body = self.get_raw_body()
projects / geekigeeki.git / commitdiff