://HOSTNAME in auth.wiki

This commit is contained in:
mdipierro committed 2012-08-20 11:16:25 -05:00
1 parent c8e34a9c24
commit c10584a068
2 files changed
+10 -3

No files matched your search

+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-08-20 10:58:09) dev Version 2.00.0 (2012-08-20 11:16:21) dev
+9 -2
View File
@@ -4478,6 +4478,7 @@ class Wiki(object):
self.force_prefix = force_prefix % self.auth.user self.force_prefix = force_prefix % self.auth.user
else: else:
self.force_prefix = force_prefix self.force_prefix = force_prefix
self.host = current.request.env.http_host
perms = self.manage_permissions = manage_permissions perms = self.manage_permissions = manage_permissions
db = auth.db db = auth.db
db.define_table( db.define_table(
@@ -4591,6 +4592,9 @@ class Wiki(object):
if ps: return ps[0] if ps: return ps[0]
return '' return ''
def fix_hostname(self,body):
return body.replace('://HOSTNAME','://%s' % self.host)
def read(self,slug): def read(self,slug):
if slug in '_cloud': if slug in '_cloud':
return self.cloud() return self.cloud()
@@ -4605,9 +4609,9 @@ class Wiki(object):
else: else:
match = self.regex_redirect.match(page.body) match = self.regex_redirect.match(page.body)
if match: redirect(match.group(1)) if match: redirect(match.group(1))
return dict(content=XML(page.html)) return dict(content=XML(self.fix_hostname(page.html)))
elif current.request.extension == 'load': elif current.request.extension == 'load':
return page.html if page else '' return self.fix_hostname(page.html) if page else ''
else: else:
if not page: if not page:
raise HTTP(404) raise HTTP(404)
@@ -4643,6 +4647,9 @@ class Wiki(object):
db.wiki_page.slug.default = slug db.wiki_page.slug.default = slug
db.wiki_page.menu.default = slug db.wiki_page.menu.default = slug
db.wiki_page.body.default = '## %s\n\npage content' % title_guess db.wiki_page.body.default = '## %s\n\npage content' % title_guess
vars = current.request.post_vars
if vars.body:
vars.body=vars.body.replace('://%s' % self.host,'://HOSTNAME')
form = SQLFORM(db.wiki_page,page,deletable=True,showid=False).process() form = SQLFORM(db.wiki_page,page,deletable=True,showid=False).process()
if form.deleted: if form.deleted:
current.session.flash = 'page deleted' current.session.flash = 'page deleted'