diff --git a/plinth/modules/xmpp/__init__.py b/plinth/modules/xmpp/__init__.py index 1365f1d98..d823530bd 100644 --- a/plinth/modules/xmpp/__init__.py +++ b/plinth/modules/xmpp/__init__.py @@ -79,6 +79,13 @@ def setup(helper, old_version=None): helper.call('post', service.notify_enabled, None, True) +def get_status(): + """Get the current settings.""" + return {'enabled': is_enabled(), + 'is_running': is_running(), + 'domainname': get_domainname()} + + def is_enabled(): """Return whether the module is enabled.""" return (action_utils.service_is_enabled('ejabberd') and @@ -96,6 +103,13 @@ def get_domainname(): return '.'.join(fqdn.split('.')[1:]) +def enable(should_enable): + """Enable/disable the module.""" + sub_command = 'enable' if should_enable else 'disable' + actions.superuser_run('xmpp', [sub_command]) + service.notify_enabled(None, should_enable) + + def on_pre_hostname_change(sender, old_hostname, new_hostname, **kwargs): """ Backup ejabberd database before hostname is changed. diff --git a/plinth/modules/xmpp/forms.py b/plinth/modules/xmpp/forms.py deleted file mode 100644 index 3d9e5d61d..000000000 --- a/plinth/modules/xmpp/forms.py +++ /dev/null @@ -1,30 +0,0 @@ -# -# This file is part of Plinth. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# - -""" -Forms for configuring XMPP service. -""" - -from django import forms -from django.utils.translation import ugettext_lazy as _ - - -class XmppForm(forms.Form): # pylint: disable=W0232 - """XMPP configuration form.""" - enabled = forms.BooleanField( - label=_('Enable XMPP'), - required=False) diff --git a/plinth/modules/xmpp/urls.py b/plinth/modules/xmpp/urls.py index db022e9cf..36e86a7c3 100644 --- a/plinth/modules/xmpp/urls.py +++ b/plinth/modules/xmpp/urls.py @@ -21,8 +21,10 @@ URLs for the XMPP module from django.conf.urls import url -from . import views +from plinth.views import ConfigurationView + urlpatterns = [ - url(r'^apps/xmpp/$', views.index, name='index'), + url(r'^apps/xmpp/$', ConfigurationView.as_view(module_name='xmpp'), + name='index'), ] diff --git a/plinth/modules/xmpp/views.py b/plinth/modules/xmpp/views.py deleted file mode 100644 index ca1841535..000000000 --- a/plinth/modules/xmpp/views.py +++ /dev/null @@ -1,79 +0,0 @@ -# -# This file is part of Plinth. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# - -""" -Plinth module to configure XMPP server -""" - -from django.contrib import messages -from django.template.response import TemplateResponse -from django.utils.translation import ugettext as _ -import logging - -from .forms import XmppForm -from plinth import actions -from plinth.modules import xmpp - - -logger = logging.getLogger(__name__) - - -def index(request): - """Serve configuration page""" - status = get_status() - - form = None - - if request.method == 'POST': - form = XmppForm(request.POST, prefix='xmpp') - if form.is_valid(): - _apply_changes(request, status, form.cleaned_data) - status = get_status() - form = XmppForm(initial=status, prefix='xmpp') - else: - form = XmppForm(initial=status, prefix='xmpp') - - return TemplateResponse(request, 'xmpp.html', - {'title': xmpp.title, - 'description': xmpp.description, - 'status': status, - 'form': form}) - - -def get_status(): - """Get the current settings.""" - status = {'enabled': xmpp.is_enabled(), - 'is_running': xmpp.is_running(), - 'domainname': xmpp.get_domainname()} - - return status - - -def _apply_changes(request, old_status, new_status): - """Apply the changes.""" - modified = False - - if old_status['enabled'] != new_status['enabled']: - sub_command = 'enable' if new_status['enabled'] else 'disable' - actions.superuser_run('xmpp', [sub_command]) - xmpp.service.notify_enabled(None, new_status['enabled']) - modified = True - - if modified: - messages.success(request, _('Configuration updated')) - else: - messages.info(request, _('Setting unchanged'))