Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-11 04:32:36 +01:00
Code Issues Projects Releases Wiki Activity

Factoids: Fix XHTML validation of the web interface.

Browse Source
This commit is contained in:
Valentin Lorentz 2013-06-01 10:32:51 +02:00
parent 74db03177f
commit 427f01032b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/Factoids/plugin.py
View File

@ -83,7 +83,9 @@ addConverter('factoidId', getFactoidId)
PAGE_SKELETON = """\ PAGE_SKELETON = """\
<html> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>Factoids</title> <title>Factoids</title>
<link rel="stylesheet" href="/default.css" /> <link rel="stylesheet" href="/default.css" />
@ -123,14 +125,14 @@ class FactoidsCallback(httpserver.SupyHTTPServerCallback):
parts = path.split('/')[1:] parts = path.split('/')[1:]
if path == '/': if path == '/':
self.send_response(200) self.send_response(200)
self.send_header('Content-type', 'text/html') self.send_header('Content-type', 'text/html; charset=utf-8')
self.end_headers() self.end_headers()
self.wfile.write(httpserver.get_template('factoids/index.html')) self.wfile.write(httpserver.get_template('factoids/index.html'))
elif len(parts) == 2: elif len(parts) == 2:
channel = urllib.unquote(parts[0]) channel = urllib.unquote(parts[0])
if not ircutils.isChannel(channel): if not ircutils.isChannel(channel):
self.send_response(404) self.send_response(404)
self.send_header('Content-type', 'text/html') self.send_header('Content-type', 'text/html; charset=utf-8')
self.end_headers() self.end_headers()
self.wfile.write(httpserver.get_template('generic/error.html')% self.wfile.write(httpserver.get_template('generic/error.html')%
{'title': 'Factoids - not a channel', {'title': 'Factoids - not a channel',
@ -138,7 +140,7 @@ class FactoidsCallback(httpserver.SupyHTTPServerCallback):
return return
if not self._plugin.registryValue('web.channel', channel): if not self._plugin.registryValue('web.channel', channel):
self.send_response(403) self.send_response(403)
self.send_header('Content-type', 'text/html') self.send_header('Content-type', 'text/html; charset=utf-8')
self.end_headers() self.end_headers()
self.wfile.write(httpserver.get_template('generic/error.html')% self.wfile.write(httpserver.get_template('generic/error.html')%
{'title': 'Factoids - unavailable', {'title': 'Factoids - unavailable',
@ -171,7 +173,7 @@ class FactoidsCallback(httpserver.SupyHTTPServerCallback):
content += '</tr><tr>' content += '</tr><tr>'
content = content[:-len('<tr>')] content = content[:-len('<tr>')]
self.send_response(200) self.send_response(200)
self.send_header('Content-type', 'text/html') self.send_header('Content-type', 'text/html; charset=utf-8')
self.end_headers() self.end_headers()
self.wfile.write(httpserver.get_template('factoids/channel.html')% self.wfile.write(httpserver.get_template('factoids/channel.html')%
{'channel': channel, 'rows': content}) {'channel': channel, 'rows': content})
@ -183,7 +185,7 @@ class FactoidsCallback(httpserver.SupyHTTPServerCallback):
self.end_headers() self.end_headers()
else: else:
self.send_response(400) self.send_response(400)
self.send_header('Content-type', 'text/plain') self.send_header('Content-type', 'text/plain; charset=utf-8')
self.end_headers() self.end_headers()
self.wfile.write('Missing field \'chan\'.') self.wfile.write('Missing field \'chan\'.')