#!/usr/bin/python
# -*- coding: utf-8 -*-
#
-# Copyright 1999, 2000 Martin Pool <mbp@humbug.org.au>
-# Copyright 2002 Gerardo Poggiali
-# Copyright 2007, 2008, 2009 Bernie Innocenti <bernie@codewiz.org>
+# Copyright (C) 1999, 2000 Martin Pool <mbp@humbug.org.au>
+# Copyright (C) 2002 Gerardo Poggiali
+# Copyright (C) 2007, 2008, 2009 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
-# 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 <http://www.gnu.org/licenses/>.
+# 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 <http://www.gnu.org/licenses/>.
__version__ = '4.0-' + '$Id$'[4:11]
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 ---------------------------------------------------------
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]
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', '')
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
global title_done
if title_done: return
- # Head
+ # HEAD
emit_header(mtime)
- print('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"')
- print(' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">')
- print('<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">')
-
+ print('<!doctype html>\n<html lang="en">')
print("<head><title>%s: %s</title>" % (config_get('site_name', "Unconfigured Wiki"), text))
- print(' <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />')
+ print(' <meta charset="UTF-8">')
if not name:
print(' <meta name="robots" content="noindex,nofollow" />')
rel, href = link
print(' <link rel="%s" href="%s" />' % (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(' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
% relative_url('?a=edit&q=' + name, privileged=True))
print('</head>')
- # Body
+ # BODY
if editable:
print('<body ondblclick="location.href=\'' + relative_url('?a=edit&q=' + name, privileged=True) + '\'">')
else:
title_done = True
send_guru(msg_text, msg_type)
- # Navbar
- print('<div class="nav">')
+ # NAVBAR
+ print('<nav><div class="nav">')
print link_tag('FrontPage', config_get('site_icon', 'Home'), cssclass='navlink')
if name:
print(' <b>' + link_tag('?fullsearch=' + name, text, cssclass='navlink') + '</b> ')
if user != 'AnonymousCoward':
print(' | <span class="login"><i><b>' + link_tag('User/' + user, user) + '</b></i></span>')
- print('<hr /></div>')
+ print('<hr /></div></nav>')
def send_httperror(status="403 Not Found", query=""):
print("Status: %s" % status)
if text is None:
text = humanlink(dest)
elif image_re.match(text):
- text = '<img border="0" src="' + relative_url(text) + '" alt="' + text + '" />'
+ text = '<img style="border: 0" src="' + relative_url(text) + '" alt="' + text + '" />'
link_class = kvargs.get('class', kvargs.get('cssclass', None))
if not link_class:
self.h_level = 0
self.in_pre = self.in_html = self.in_table = self.in_li = False
self.in_header = True
- self.list_indents = []
+ self.list_indents = [] # a list of pairs (indent_level, list_type) to track nested lists
self.tr_cnt = 0
self.styles = {
#wiki html enabled?
",,": ["sub", False],
"''": ["em", False], # LEGACY
"'''": ["b", False], # LEGACY
- "``": ["tt", False], # LEGACY
}
def _b_repl(self, word):
return '<br />'
def _rule_repl(self, word):
- return self._undent() + '\n<hr size="%d" noshade="noshade" />\n' % (len(word) - 2)
+ return '\n<hr size="%d" noshade="noshade" />\n' % (len(word) - 2)
def _macro_repl(self, word):
try:
return ''
def _indent_level(self):
- return len(self.list_indents) and self.list_indents[-1]
+ return len(self.list_indents) and self.list_indents[-1][0]
- def _indent_to(self, new_level):
+ def _indent_to(self, new_level, list_type=''):
if self._indent_level() == new_level:
return ''
s = '</p>'
while self._indent_level() > new_level:
- del(self.list_indents[-1])
if self.in_li:
s += '</li>'
self.in_li = False # FIXME
- s += '</ul>\n'
+ s += '</' + self.list_indents[-1][1] + '>\n'
+ del(self.list_indents[-1])
+
+ list_type = ('ul', 'ol')[list_type == '#']
while self._indent_level() < new_level:
- self.list_indents.append(new_level)
- s += '<ul>\n'
+ self.list_indents.append((new_level, list_type))
+ s += '<' + list_type + '>\n'
s += '<p>'
return s
- def _undent(self):
- res = '</p>'
- res += '</ul>' * len(self.list_indents)
- res += '<p>'
- self.list_indents = []
- return res
-
def replace(self, match):
for rule, hit in list(match.groupdict().items()):
if hit:
scan_re = re.compile(r"""(?:
# Styles and formatting ("--" must cling to a word to disambiguate it from the dash)
- (?P<b> \*\* | // | \#\# | __ | --\b | \b-- | \^\^ | ,, | ''' | '' | `` )
+ (?P<b> \*\* | // | \#\# | __ | --\b | \b-- | \^\^ | ,, | ''' | '' )
| (?P<tit> \={2,6})
| (?P<br> \\\\)
| (?P<rule> ^-{3,})
| (?P<ent>[<>&])"
)""", re.VERBOSE)
blank_re = re.compile(r"^\s*$")
- indent_re = re.compile(r"^\s*")
+ indent_re = re.compile(r"^(\s*)(\*|\#|)")
tr_re = re.compile(r"^\s*\|\|")
eol_re = re.compile(r"\r?\n")
# For each line, we scan through looking for magic strings, outputting verbatim any intervening text
print('</p><p>')
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(0))))
+ 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('</pre>')
if self.in_table: print('</tbody></table><p>')
- print(self._undent())
+ print(self._indent_to(0))
print('</p></div>')
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'
#print "bernie: pragmas[" + m.group(1) + "] = " + m.group(2) + "<br>\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):
def save(self, newdata, changelog):
if not self.can_write():
- self.msg_text = 'Write access denied by ACLs'
- self.msg_type = 'error'
+ self.msg_text = 'Write access denied by Access Control List'
+ return
+ if not is_privileged():
+ self.msg_text = 'Unauthenticated access denied'
return
self._write_file(newdata)
projects / geekigeeki.git / blobdiff