X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=faf59027217f4c59f0300d99c22f4a22f487e4b5;hb=d810022b52bf2aa2c7a4b4c530dd7a7f03dc9299;hp=3eb4c1a32ee7d4de3bcc2008856bc8caeaaa89ba;hpb=f717244ea693c7882948b4758836e530169a6c11;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index 3eb4c1a..faf5902 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -78,7 +78,7 @@ def relative_url(pathname, privileged=False):
else:
url = script_name()
pathname = url + '/' + pathname
- return pathname
+ return cgi.escape(pathname, quote=True)
def permalink(s):
return re.sub(' ', '-', re.sub('[^a-z0-9_ ]', '', s.lower()).strip())
@@ -143,7 +143,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
# Navbar
print '
'
- print link_tag('FrontPage', relative_url(site_icon or 'Home'), 'navlink')
+ print link_tag('FrontPage', site_icon or 'Home', 'navlink')
if name:
print '
' + link_tag('?fullsearch=' + name, text, 'navlink') + ' '
else:
@@ -180,7 +180,7 @@ def link_tag(params, text=None, link_class=None, privileged=False):
if text is None:
text = params # default
elif img_re.match(text):
- text = '
'
+ text = '
'
if not link_class:
if is_external_url(params):
@@ -202,7 +202,7 @@ def link_inline(name, descr=None, args=''):
if not descr: descr = name
url = relative_url(name)
if video_re.match(name):
- return '
' % url
+ return '
' % url
elif img_re.match(name):
return '
' % (url, url + args, descr)
elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page
@@ -403,11 +403,13 @@ class WikiFormatter:
return link_inline(name, name)
def _html_repl(self, word):
+ if not self.in_html and word.startswith('
'
return word; # Pass through
def _ent_repl(self, s):