diff -urN MoinMoin-orig/Page.py MoinMoin/Page.py
--- MoinMoin-orig/Page.py 2004-09-04 15:50:00.000000000 -0400
+++ MoinMoin/Page.py 2004-11-22 13:43:36.000000000 -0500
@@ -278,7 +278,7 @@
@rtype: string
@return: complete url of this page (including query string if specified)
"""
- url = "%s/%s" % (request.getScriptname(), wikiutil.quoteWikiname(self.page_name))
+ url = "%s%s" % (request.getRelativeScriptname(), wikiutil.quoteWikiname(self.page_name))
if querystr:
querystr = util.web.makeQueryString(querystr)
url = "%s?%s" % (url, querystr)
@@ -487,8 +487,8 @@
pi_redirect = args
if request.form.has_key('action') or request.form.has_key('redirect') or content_only: continue
- request.http_redirect('%s/%s?action=show&redirect=%s' % (
- request.getScriptname(),
+ request.http_redirect('%s%s?action=show&redirect=%s' % (
+ request.getRelativeScriptname(),
wikiutil.quoteWikiname(pi_redirect),
urllib.quote_plus(self.page_name, ''),))
return
@@ -549,8 +549,8 @@
page_needle = self.page_name
if config.allow_subpages and page_needle.count('/'):
page_needle = '/' + page_needle.split('/')[-1]
- link = '%s/%s?action=fullsearch&value=%s&literal=1&case=1&context=40' % (
- request.getScriptname(),
+ link = '%s%s?action=fullsearch&value=%s&literal=1&case=1&context=40' % (
+ request.getRelativeScriptname(),
wikiutil.quoteWikiname(self.page_name),
urllib.quote_plus(page_needle, ''))
title = self.split_title(request)
diff -urN MoinMoin-orig/action/AttachFile.py MoinMoin/action/AttachFile.py
--- MoinMoin-orig/action/AttachFile.py 2004-10-29 09:48:25.000000000 -0400
+++ MoinMoin/action/AttachFile.py 2004-11-22 13:44:25.000000000 -0500
@@ -83,8 +83,8 @@
urllib.quote(filename), timestamp)
else:
# send file via CGI
- url = "%s/%s?action=%s&do=get&target=%s" % (
- request.getScriptname(), wikiutil.quoteWikiname(pagename),
+ url = "%s%s?action=%s&do=get&target=%s" % (
+ request.getRelativeScriptname(), wikiutil.quoteWikiname(pagename),
action_name, urllib.quote_plus(filename) )
if escaped:
@@ -194,7 +194,7 @@
for file in files:
fsize = os.stat(os.path.join(attach_dir,file))[6] # in byte
fsize = float(int(float(fsize)/102.4))/10.0
- baseurl = request.getScriptname()
+ baseurl = request.getRelativeScriptname()
action = action_name
urlpagename = wikiutil.quoteWikiname(pagename)
urlfile = urllib.quote_plus(file)
@@ -211,13 +211,13 @@
del_link = ''
if request.user.may.delete(pagename) and not readonly:
- del_link = '%(label_del)s | ' % parmdict
if ext == '.draw':
- viewlink = '%(label_edit)s' % parmdict
+ viewlink = '%(label_edit)s' % parmdict
else:
- viewlink = '%(label_view)s' % parmdict
+ viewlink = '%(label_view)s' % parmdict
parmdict['viewlink'] = viewlink
parmdict['del_link'] = del_link
@@ -321,7 +321,7 @@
conflict, you have to rename the file that you want to upload.
Otherwise, if "Rename to" is left blank, the original filename will be used.""") + '
')
request.write("""
-
""" % {
- 'baseurl': request.getScriptname(),
+ 'baseurl': request.getRelativeScriptname(),
'pagename': wikiutil.quoteWikiname(pagename),
'action_name': action_name,
'upload_label_file': _('File to upload'),
diff -urN MoinMoin-orig/action/LikePages.py MoinMoin/action/LikePages.py
--- MoinMoin-orig/action/LikePages.py 2004-06-04 07:40:42.000000000 -0400
+++ MoinMoin/action/LikePages.py 2004-11-22 13:44:33.000000000 -0500
@@ -128,8 +128,8 @@
for key in keys:
if matches[key] == match:
page = Page(key)
- request.write('%s' % (
- request.getScriptname(),
+ request.write('%s' % (
+ request.getRelativeScriptname(),
wikiutil.quoteWikiname(page.page_name),
page.split_title(request)))
request.write("")
diff -urN MoinMoin-orig/config.py MoinMoin/config.py
--- MoinMoin-orig/config.py 2004-10-29 09:48:25.000000000 -0400
+++ MoinMoin/config.py 2004-11-22 12:32:46.000000000 -0500
@@ -143,6 +143,7 @@
'up': ("%(q_page_parent_page)s", _("Up"), "up"),
},
'refresh': None, # (minimum_delay, type), e.g.: (2, 'internal')
+ 'relative_links': False,
'shared_intermap': None, # can be string or list of strings (filenames)
'show_hosts': 1,
'show_section_numbers': 1,
diff -urN MoinMoin-orig/request.py MoinMoin/request.py
--- MoinMoin-orig/request.py 2004-07-02 16:45:32.000000000 -0400
+++ MoinMoin/request.py 2004-11-22 13:52:31.000000000 -0500
@@ -289,7 +289,7 @@
def getBaseURL(self):
""" Return a fully qualified URL to this script. """
- return self.getQualifiedURL(self.getScriptname())
+ return self.getQualifiedURL(self.getRelativeScriptname())
def getQualifiedURL(self, uri=None):
@@ -549,12 +549,17 @@
#############################################################################
def getScriptname(self):
- """ Return the scriptname part of the URL ("/path/to/my.cgi"). """
+ """ Return the scriptname part of the URL ("/path/to/my.cgi/"). """
name = self.script_name
if name == '/':
return ''
return name
+ def getRelativeScriptname(self):
+ if config.relative_links:
+ return ''
+ else:
+ return self.getScriptname() + '/'
def getPathinfo(self):
""" Return the remaining part of the URL. """
@@ -813,7 +818,7 @@
def getBaseURL(self):
""" Return a fully qualified URL to this script. """
- return self.getQualifiedURL(self.getScriptname())
+ return self.getQualifiedURL(self.getRelativeScriptname())
@@ -967,7 +972,6 @@
return ''
return name
-
def getPathinfo(self):
""" Return the remaining part of the URL. """
return self.path_info
@@ -1108,7 +1112,6 @@
return ''
return name
-
def getPathinfo(self):
""" Return the remaining part of the URL. """
return self.path_info
@@ -1223,7 +1226,6 @@
return ''
return name
-
def getPathinfo(self):
""" Return the remaining part of the URL. """
pathinfo = self.path_info
diff -urN MoinMoin-orig/wikiutil.py MoinMoin/wikiutil.py
--- MoinMoin-orig/wikiutil.py 2004-08-22 18:25:50.000000000 -0400
+++ MoinMoin/wikiutil.py 2004-11-22 13:56:38.000000000 -0500
@@ -171,7 +171,7 @@
for line in lines:
if not line or line[0] == '#': continue
try:
- line = "%s %s/InterWiki" % (line, request.getScriptname())
+ line = "%s %sInterWiki" % (line, request.getRelativeScriptname())
wikitag, urlprefix, trash = line.split(None, 2)
except ValueError:
pass
@@ -181,9 +181,9 @@
del lines
# add own wiki as "Self" and by its configured name
- _interwiki_list['Self'] = request.getScriptname() + '/'
+ _interwiki_list['Self'] = request.getRelativeScriptname()
if config.interwikiname:
- _interwiki_list[config.interwikiname] = request.getScriptname() + '/'
+ _interwiki_list[config.interwikiname] = request.getRelativeScriptname()
# split wiki url
wikitag, tail = split_wiki(wikiurl)
@@ -192,7 +192,7 @@
if wikitag and _interwiki_list.has_key(wikitag):
return (wikitag, _interwiki_list[wikitag], tail, False)
else:
- return (wikitag, request.getScriptname(), "/InterWiki", True)
+ return (wikitag, request.getRelativeScriptname(), "InterWiki", True)
#############################################################################
@@ -726,13 +726,13 @@
if text is None:
text = params # default
if formatter:
- return formatter.url("%s/%s" % (request.getScriptname(), params), text, css_class, **kw)
+ return formatter.url("%s%s" % (request.getRelativeScriptname(), params), text, css_class, **kw)
attrs = ''
if kw.has_key('attrs'):
attrs += ' ' + kw['attrs']
if css_class:
attrs += ' class="%s"' % css_class
- return ('%s' % (attrs, request.getScriptname(), params, text))
+ return ('%s' % (attrs, request.getRelativeScriptname(), params, text))
def linediff(oldlines, newlines, **kw):
@@ -922,12 +922,12 @@
# later:
# Links
- request.write('\n' % (request.getScriptname(), quoteWikiname(page_front_page)))
+ request.write('\n' % (request.getRelativeScriptname(), quoteWikiname(page_front_page)))
if pagename:
- request.write('\n' % (
- _('Wiki Markup'), request.getScriptname(), quoteWikiname(pagename),))
- request.write('\n' % (
- _('Print View'), request.getScriptname(), quoteWikiname(pagename),))
+ request.write('\n' % (
+ _('Wiki Markup'), request.getRelativeScriptname(), quoteWikiname(pagename),))
+ request.write('\n' % (
+ _('Print View'), request.getRelativeScriptname(), quoteWikiname(pagename),))
# !!! currently disabled due to Mozilla link prefetching, see
# http://www.mozilla.org/projects/netlib/Link_Prefetching_FAQ.html
@@ -939,24 +939,24 @@
#~ # this shopuld never happend in theory, but let's be sure
#~ pass
#~ else:
- #~ request.write('\n' % (request.getScriptname(), quoteWikiname(all_pages[0]))
+ #~ request.write('\n' % (request.getRelativeScriptname(), quoteWikiname(all_pages[0]))
#~ if pos > 0:
- #~ request.write('\n' % (request.getScriptname(), quoteWikiname(all_pages[pos-1])))
+ #~ request.write('\n' % (request.getRelativeScriptname(), quoteWikiname(all_pages[pos-1])))
#~ if pos+1 < len(all_pages):
- #~ request.write('\n' % (request.getScriptname(), quoteWikiname(all_pages[pos+1])))
- #~ request.write('\n' % (request.getScriptname(), quoteWikiname(all_pages[-1])))
+ #~ request.write('\n' % (request.getRelativeScriptname(), quoteWikiname(all_pages[pos+1])))
+ #~ request.write('\n' % (request.getRelativeScriptname(), quoteWikiname(all_pages[-1])))
if page_parent_page:
- request.write('\n' % (request.getScriptname(), quoteWikiname(page_parent_page)))
+ request.write('\n' % (request.getRelativeScriptname(), quoteWikiname(page_parent_page)))
from MoinMoin.action import AttachFile
AttachFile.send_link_rel(request, pagename)
request.write(
- '\n' % (request.getScriptname(), quoteWikiname(page_find_page)) +
- '\n' % (request.getScriptname(), quoteWikiname(page_title_index)) +
- '\n' % (request.getScriptname(), quoteWikiname(page_word_index)) +
- '\n' % (request.getScriptname(), quoteWikiname(page_help_formatting))
+ '\n' % (request.getRelativeScriptname(), quoteWikiname(page_find_page)) +
+ '\n' % (request.getRelativeScriptname(), quoteWikiname(page_title_index)) +
+ '\n' % (request.getRelativeScriptname(), quoteWikiname(page_word_index)) +
+ '\n' % (request.getRelativeScriptname(), quoteWikiname(page_help_formatting))
)
request.write("\n")
@@ -1018,7 +1018,7 @@
link = escape(link, quote=1)
navi_link = escape(navi_link)
else:
- link = "%s/%s" % (request.getScriptname(), quoteWikiname(navi_link))
+ link = "%s%s" % (request.getRelativeScriptname(), quoteWikiname(navi_link))
navibar.append((link, navi_link,))