From cbae4b93b0d2792a375cdc9da0c99b1d299459a3 Mon Sep 17 00:00:00 2001
From: Michael Fürmann <michael@spicyweb.de>
Date: Thu, 19 Feb 2015 15:07:56 -0500
Subject: [PATCH] Removed public registration from domain form, can't be supported atm.
---
interface/web/mail/lib/lang/en_xmpp_domain.lng | 3 +++
interface/web/mail/xmpp_domain_edit.php | 3 +++
interface/web/mail/templates/xmpp_domain_edit.htm | 13 ++++++++-----
interface/web/mail/form/xmpp_domain.tform.php | 4 ++--
4 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/interface/web/mail/form/xmpp_domain.tform.php b/interface/web/mail/form/xmpp_domain.tform.php
index 6c5ff62..b2db7f8 100644
--- a/interface/web/mail/form/xmpp_domain.tform.php
+++ b/interface/web/mail/form/xmpp_domain.tform.php
@@ -125,13 +125,13 @@
'registration_message' => array(
'datatype' => 'TEXT',
'formtype' => 'TEXT',
- 'default' => "Please visit our website for information on registration.",
+ 'default' => "",
'value' => ''
),
'domain_admins' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
- 'default' => 'admin@service.com, superuser@service.com',
+ 'default' => '',
'value' => '',
'width' => '15',
'maxlength' => '3'
diff --git a/interface/web/mail/lib/lang/en_xmpp_domain.lng b/interface/web/mail/lib/lang/en_xmpp_domain.lng
index 5fd20f0..86abd2b 100644
--- a/interface/web/mail/lib/lang/en_xmpp_domain.lng
+++ b/interface/web/mail/lib/lang/en_xmpp_domain.lng
@@ -1,5 +1,6 @@
<?php
$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
$wb["domain_txt"] = 'Domain';
$wb["type_txt"] = 'Type';
$wb["active_txt"] = 'Active';
@@ -26,5 +27,7 @@
$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
$wb["use_status_host_txt"] = 'Enable XML Status host';
$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
?>
diff --git a/interface/web/mail/templates/xmpp_domain_edit.htm b/interface/web/mail/templates/xmpp_domain_edit.htm
index 5877e7b..b6fff9b 100644
--- a/interface/web/mail/templates/xmpp_domain_edit.htm
+++ b/interface/web/mail/templates/xmpp_domain_edit.htm
@@ -82,29 +82,32 @@
</div>
<div id="toggle-management-normal" class="collapse">
- <div class="form-group">
+ <!--
+ Currently not supported
+ div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='public_registration_txt'}</label>
<div class="col-sm-9">
{tmpl_var name='public_registration'}
</div>
- </div>
+ </div-->
</div>
+ <input type="hidden" name="public_registration" id="public_registration" value="n" />
<div id="toggle-registration-closed" class="collapse">
<div class="form-group">
<label for="registration_url" class="col-sm-3 control-label">{tmpl_var name='registration_url_txt'}</label>
<div class="col-sm-9">
- <input type="text" name="registration_url" id="registration_url" value="{tmpl_var name='registration_url'}" class="form-control" />
+ <input type="text" name="registration_url" id="registration_url" value="{tmpl_var name='registration_url'}" class="form-control" placeholder="<tmpl_var name='about_registration_url_txt'>" />
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='registration_message_txt'}</label>
- <div class="col-sm-9"><textarea class="form-control" name="registration_message" id="registration_message" rows='3' cols='30'>{tmpl_var name='registration_message'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="registration_message" id="registration_message" rows='3' cols='30' placeholder="<tmpl_var name='about_registration_message_txt'>">{tmpl_var name='registration_message'}</textarea></div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='domain_admins_txt'}</label>
- <div class="col-sm-9"><textarea class="form-control" name="domain_admins" id="domain_admins" rows='3' cols='30'>{tmpl_var name='domain_admins'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="domain_admins" id="domain_admins" rows='3' cols='30' placeholder="admin@service.com, superuser@service.com">{tmpl_var name='domain_admins'}</textarea></div>
</div>
diff --git a/interface/web/mail/xmpp_domain_edit.php b/interface/web/mail/xmpp_domain_edit.php
index ce90735..ff1f8b8 100644
--- a/interface/web/mail/xmpp_domain_edit.php
+++ b/interface/web/mail/xmpp_domain_edit.php
@@ -295,6 +295,9 @@
}
}
+ // Reset public registration to 'n', is not yet supported
+ $this->dataRecord["public_registration"] = 'n';
+
parent::onSubmit();
}
--
Gitblit v1.9.1