%s: %s

') - print link_tag('FrontPage', config_get('site_icon', 'Home'), cssclass='navlink') - if name: - print(' ' + link_tag('?fullsearch=' + name, text, cssclass='navlink') + ' ') - else: - print(' ' + text + ' ') - print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink')) - if history: - print(' | Recent Changes') - if name: - print(' | Page History') - - if name: - print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink')) - if config_get('privileged_url') is not None: - if writable: - print(' | ' + link_tag('?a=edit&q=' + name, 'Edit', cssclass='navlink', privileged=True)) - else: - print(' | ' + link_tag(name, 'Login', cssclass='navlink', privileged=True)) - - else: - print(' | Immutable Page') - - user = remote_user() - if user != 'AnonymousCoward': - print(' | ') - - print('

\{\{\{|\s*\}\}\}) - | (?P \{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\}) + | (?P \{\{[^\}]+\}\}) # Tables | (?P ^\s*\|\|(=|)\s*) | (?P \s*\|\|(=|)\s*$) | (?P \s*\|\|(=|)\s*) - - # TODO: highlight search words (look at referrer) )""", re.VERBOSE) pre_re = re.compile("""(?: (?P

\s*\}\}\})
@@ -614,8 +526,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('

') @@ -623,11 +535,18 @@ class WikiFormatter: print(self._indent_to(0)) print('

') +class HttpException(Exception): + def __init__(self, error, query): + self.error = error + self.query = query + 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' + if not file_re.match(self.page_name): + raise HttpException("403 Forbidden", self.page_name) def split_title(self): # look for the end of words and the start of a new word and insert a space there @@ -652,14 +571,12 @@ class Page: 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 @@ -668,19 +585,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): + if image_re.match(filename) or video_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__: @@ -723,32 +641,129 @@ class Page: def can_read(self): return self.can("read", True) + def send_title(self, name=None, text="Limbo", msg_text=None, msg_type='error'): + global title_done + if title_done: return + + # HEAD + emit_header(name and self._mtime()) + print('\n') + print("%s: %s" % (config_get('site_name', "Unconfigured Wiki"), text)) + print(' ') + print(' ') + if not name: + print(' ') + + for http_equiv, content in config_get('meta_urls', {}): + print(' ' % (http_equiv, relative_url(content))) + + for link in config_get('link_urls', {}): + rel, href = link + print(' ' % (rel, relative_url(href))) + + editable = name and self.can_write() and is_privileged() + if editable: + print(' ' \ + % relative_url(name + '?a=edit', privileged=True)) + + if name: + print(' ' \ + % relative_url(name + '?a=atom')) + + print('') + + # BODY + if editable: + print('') + else: + print('') + + title_done = True + send_guru(msg_text, msg_type) + + if self.pragma("navbar", "on") != "on": + return + + # NAVBAR + print('

') + print link_tag('FrontPage', config_get('site_icon', 'Home'), cssclass='navlink') + if name: + print(' ' + link_tag('?a=titlesearch&q=' + name, text, cssclass='navlink') + ' ') + else: + print(' ' + text + ' ') + print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink')) + history = config_get('history_url') + if history: + print(' | Recent Changes') + if name: + print(' | Page History') + + 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(name + '?a=edit', 'Edit', cssclass='navlink', privileged=True)) + else: + print(' | ' + link_tag(name, 'Login', cssclass='login', privileged=True)) + + user = remote_user() + if user != 'AnonymousCoward': + print(' | ' + link_tag('user/' + user, user, cssclass='login')) + + print('

') + + def send_footer(self): + if config_get('debug_cgi', False): + cgi.print_arguments() + cgi.print_form(form) + cgi.print_environ() + footer = self.pragma("footer", "sys/footer") + if footer != "off": + link_inline(footer, kvargs = { + 'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%Y-%m-%dT%I:%M:%S%p'), localtime(self._mtime())) + }) + print('') + 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 format(self): + def send(self): #css foo.css value = self.pragma("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(), mtime=self._mtime()) + self.send_title(name=self.page_name, text=self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type) self.send_naked() - send_footer(mtime=self._mtime()) + self.send_footer() + + def send_atom(self): + emit_header(self._mtime(), 'application/atom+xml') + self.in_html = True + link_inline("sys/atom_header", kvargs = { + 'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%a, %d %b %Y %I:%M:%S %p'), localtime(self._mtime())) + }) + self.in_html = False + self.send_naked() + self.in_html = True + link_inline("sys/atom_footer") + self.in_html = False def send_editor(self, preview=None): - send_title(None, 'Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type) + self.send_title(text='Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type) if not self.can_write(): send_guru("Write access denied by ACLs", "error") 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), @@ -759,18 +774,19 @@ class Page: print("

") WikiFormatter(preview).print_html() print("

") - send_footer() + self.send_footer() def send_raw(self, mimetype='text/plain', args=[]): if not self.can_read(): - send_title(None, msg_text='Read access denied by ACLs', msg_type='notice', mtime=self._mtime()) + self.send_title(msg_text='Read access denied by ACLs', msg_type='notice') return emit_header(self._mtime(), mimetype) 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() @@ -829,13 +845,9 @@ try: else: send_httperror("403 Forbidden", query_string()) +except HttpException, e: + send_httperror(e.error, query=e.query) except Exception: - import traceback - msg_text = traceback.format_exc() - if title_done: - send_guru(msg_text, "error") - else: - send_title(None, msg_text=msg_text) - send_footer() + send_httperror("500 Internal Server Error", query=query_string(), trace=True) sys.stdout.flush()