Ticket #780: cptools.py.patch

cptools.py

old	new
205	205	def on_check(self, username):
206	206	pass
207	207
208		def login_screen(self, from_page='..', username='', error_msg=''):
	208	def login_screen(self, from_page='..', username='', error_msg='', **kwargs):
209	209	return """<html><body>
210	210	Message: %(error_msg)s
211	211	<form method="post" action="do_login">
…	…
217	217	</body></html>""" % {'from_page': from_page, 'username': username,
218	218	'error_msg': error_msg}
219	219
220		def do_login(self, username, password, from_page='..'):
	220	def do_login(self, username, password, from_page='..', **kwargs):
221	221	"""Login. May raise redirect, or return True if request handled."""
222	222	error_msg = self.check_username_and_password(username, password)
223	223	if error_msg:
…	…
232	232	self.on_login(username)
233	233	raise cherrypy.HTTPRedirect(from_page or "/")
234	234
235		def do_logout(self, from_page='..'):
	235	def do_logout(self, from_page='..', **kwargs):
236	236	"""Logout. May raise redirect, or return True if request handled."""
237	237	sess = cherrypy.session
238	238	username = sess.get(self.session_key)