nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change XMPP server config form to use FormPlugin methods. This works with POST form method.

Browse Source
This commit is contained in:
James Valleroy 2013-11-15 23:36:45 -05:00
parent 63508b6bba
commit 579ae89477
1 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
modules/installed/services/xmpp.py
View File

@ -11,50 +11,60 @@ class xmpp(PagePlugin):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
PagePlugin.__init__(self, *args, **kwargs) PagePlugin.__init__(self, *args, **kwargs)
self.register_page("services.xmpp") self.register_page("services.xmpp")
self.register_page("services.xmpp.configure")
self.register_page("services.xmpp.register") self.register_page("services.xmpp.register")
cfg.html_root.services.menu.add_item("XMPP", "icon-comment", "/services/xmpp", 40) cfg.html_root.services.menu.add_item("XMPP", "icon-comment", "/services/xmpp", 40)
@cherrypy.expose @cherrypy.expose
@require() @require()
def index(self, submitted=False, **kwargs): def index(self, **kwargs):
checkedinfo = { main = "<p>XMPP Server Accounts and Configuration</p>"
'inband_enable' : False, sidebar_right = '<strong><a href="'+cfg.server_dir+'/services/xmpp/configure">Configure XMPP Server</a></strong><br />'
} sidebar_right = sidebar_right + '<strong><a href="'+cfg.server_dir+'/services/xmpp/register">Register XMPP Account</a></strong>'
return self.fill_template(title="XMPP Server", main=main, sidebar_right=sidebar_right)
if submitted: class configure(FormPlugin, PagePlugin):
opts = [] url = ["/services/xmpp/configure"]
for k in kwargs.keys():
if 'on' == kwargs[k]:
shortk = k.split("xmpp_").pop()
checkedinfo[shortk] = True
for key in checkedinfo.keys(): sidebar_left = ''
if checkedinfo[key]: sidebar_right = _("<strong>Configure XMPP Server</strong>")
opts.append(key)
else:
opts.append('no'+key)
privilegedaction_run("xmpp-setup", opts)
output, error = privilegedaction_run("xmpp-setup", ['status']) def main(self, inband_enable=False, message=None, *args, **kwargs):
output, error = privilegedaction_run("xmpp-setup", 'status')
if error: if error:
raise Exception("something is wrong: " + error) raise Exception("something is wrong: " + error)
for option in output.split(): if "inband_enable" in output.split():
checkedinfo[option] = True inband_enable = True
main = "<p>XMPP Server Configuration</p>" form = Form(title="Configure XMPP Server",
form = Form(title="Configuration", action=cfg.server_dir + "/services/xmpp/configure/index",
action=cfg.server_dir + "/services/xmpp", name="configure_xmpp_form",
name="configure_xmpp", message=message)
message='') form.checkbox(_("Allow In-Band Registration"), name="inband_enable",
form.checkbox(_("Allow In-Band Registration"), name="xmpp_inband_enable", id="inband_enable", checked=inband_enable)
id="xmpp_inband_enable", checked=checkedinfo['inband_enable']) # hidden field is needed because checkbox doesn't post if not checked
form.hidden(name="submitted", value="True") form.hidden(name="submitted", value="True")
form.html(_("<p>When enabled, anyone who can reach this server will be allowed to register an account through an XMPP client.</p>")) form.html(_("<p>When enabled, anyone who can reach this server will be allowed to register an account through an XMPP client.</p>"))
form.submit(_("Update setup")) form.submit(_("Update setup"))
main += form.render() return form.render()
sidebar_right = '<strong><a href="'+cfg.server_dir+'/services/xmpp/register">Register XMPP Account</a></strong>' def process_form(self, inband_enable=None, **kwargs):
return self.fill_template(title="XMPP Server Configuration", main=main, sidebar_right=sidebar_right) msg = Message()
if inband_enable == u'on':
output, error = privilegedaction_run("xmpp-setup", "inband_enable")
if error:
raise Exception("something is wrong: " + error)
msg.add = _("Enabled in-band registration.")
else:
output, error = privilegedaction_run("xmpp-setup", "noinband_enable")
if error:
raise Exception("something is wrong: " + error)
msg.add = _("Disabled in-band registration.")
cfg.log(msg.text)
main = self.main(inband_enable, msg=msg.text)
return self.fill_template(title="XMPP Server Configuration", main=main, sidebar_left=self.sidebar_left, sidebar_right=self.sidebar_right)
class register(FormPlugin, PagePlugin): class register(FormPlugin, PagePlugin):
url = ["/services/xmpp/register"] url = ["/services/xmpp/register"]