From: Bernie Innocenti Date: Tue, 24 Nov 2009 18:16:59 +0000 (-0500) Subject: Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/geekigeeki X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=commitdiff_plain;h=bc824021236f6cec7008d4f4493f0a2b95ad1632;hp=7ae41b552945125129bc2ee13cce0600c0d951b4 Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/geekigeeki --- diff --git a/geekigeeki.conf.py b/geekigeeki.conf.py index 26e9a30..e2314af 100644 --- a/geekigeeki.conf.py +++ b/geekigeeki.conf.py @@ -10,7 +10,7 @@ site_icon = 'sys/favicon16x16.png' # set to None for read-only sites, or # leave empty ('') to allow anonymous edits # otherwise, set to a URL that requires authentication -privileged_url = 'https://www.develer.com/~bernie/wiki' +privileged_url = 'https://secure.sugarlabs.org/codewiz/wiki' #privileged_url = '' #privileged_url = None @@ -19,15 +19,15 @@ data_dir = 'data' # default page links meta_urls = [ # http-equiv content - [ 'X-XRDS-Location', 'http://www.codewiz.org/yadis.xml' ], + [ 'X-XRDS-Location', 'http://codewiz.org/yadis.xml' ], ] link_urls = [ # rel href - [ 'icon', 'sys/favicon.png' ], + [ 'icon', 'sys/favicon.gif' ], [ 'stylesheet', 'sys/geekigeeki.css' ], - [ 'openid.server', 'https://www.develer.com/openid/bernie' ], - [ 'openid.delegate', 'https://www.develer.com/openid/bernie' ], - [ 'pavatar', 'http://www.codewiz.org/wiki/BernieAvatar80x80.png' ], + [ 'openid.server', 'https://id.sugarlabs.org/bernie' ], + [ 'openid.delegate', 'https://id.sugarlabs.org/bernie' ], + [ 'pavatar', 'http://codewiz.org/wiki/BernieAvatar80x80.png' ], ] history_url = '../wikigit/wiki.git' diff --git a/geekigeeki.py b/geekigeeki.py index 9d2bf9e..44b5131 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 --------------------------------------------------------- @@ -127,14 +127,11 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal 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(' ') @@ -157,7 +154,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal print('') - # Body + # BODY if editable: print('') else: @@ -166,8 +163,8 @@ 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('
') + # NAVBAR + print('
') def send_httperror(status="403 Not Found", query=""): print("Status: %s" % status) @@ -205,7 +202,7 @@ def link_tag(dest, text=None, privileged=False, **kvargs): if text is None: text = humanlink(dest) elif image_re.match(text): - text = '' + text + '' + text = '' + text + '' link_class = kvargs.get('class', kvargs.get('cssclass', None)) if not link_class: @@ -388,7 +385,6 @@ class WikiFormatter: ",,": ["sub", False], "''": ["em", False], # LEGACY "'''": ["b", False], # LEGACY - "``": ["tt", False], # LEGACY } def _b_repl(self, word): @@ -552,7 +548,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,}) diff --git a/gitweb_config.perl b/gitweb_config.perl index a9393f5..b5abd4f 100755 --- a/gitweb_config.perl +++ b/gitweb_config.perl @@ -1,11 +1,11 @@ #bernie # path to git projects (.git) -$projectroot = "/home/bernie/public_html/wiki/git"; +$projectroot = "/srv/www-codewiz/wiki/git"; @git_base_url_list = ( - 'git://www.codewiz.org/~bernie', - 'http://www.codewiz.org/~bernie/git', + 'git://codewiz.org/~bernie', + 'http://codewiz.org/~bernie/git', 'ssh://shell.codewiz.org/~bernie/public_git'); $site_name = "Codewiz Git Repositories";