Skip to content

Commit cbae4b9

Browse files
committed
Removed public registration from domain form, can't be supported atm.
1 parent 536f803 commit cbae4b9

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

interface/web/mail/form/xmpp_domain.tform.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@
125125
'registration_message' => array(
126126
'datatype' => 'TEXT',
127127
'formtype' => 'TEXT',
128-
'default' => "Please visit our website for information on registration.",
128+
'default' => "",
129129
'value' => ''
130130
),
131131
'domain_admins' => array(
132132
'datatype' => 'VARCHAR',
133133
'formtype' => 'TEXT',
134-
'default' => 'admin@service.com, superuser@service.com',
134+
'default' => '',
135135
'value' => '',
136136
'width' => '15',
137137
'maxlength' => '3'

interface/web/mail/lib/lang/en_xmpp_domain.lng

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
22
$wb["server_id_txt"] = 'Server';
3+
$wb["client_group_id_txt"] = 'Client';
34
$wb["domain_txt"] = 'Domain';
45
$wb["type_txt"] = 'Type';
56
$wb["active_txt"] = 'Active';
@@ -26,5 +27,7 @@ $wb["http_archive_show_join_txt"] = 'Show join messages in archive';
2627
$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
2728
$wb["use_status_host_txt"] = 'Enable XML Status host';
2829
$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
30+
$wb["about_registration_url_txt"] = 'Link to your registration form.';
31+
$wb["about_registration_message_txt"] = 'Description about your account registration process.';
2932
$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
3033
?>

interface/web/mail/templates/xmpp_domain_edit.htm

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,29 +82,32 @@ <h1><tmpl_var name="list_head_txt"></h1>
8282
</div>
8383

8484
<div id="toggle-management-normal" class="collapse">
85-
<div class="form-group">
85+
<!--
86+
Currently not supported
87+
div class="form-group">
8688
<label class="col-sm-3 control-label">{tmpl_var name='public_registration_txt'}</label>
8789
<div class="col-sm-9">
8890
{tmpl_var name='public_registration'}
8991
</div>
90-
</div>
92+
</div-->
9193
</div>
94+
<input type="hidden" name="public_registration" id="public_registration" value="n" />
9295
<div id="toggle-registration-closed" class="collapse">
9396
<div class="form-group">
9497
<label for="registration_url" class="col-sm-3 control-label">{tmpl_var name='registration_url_txt'}</label>
9598
<div class="col-sm-9">
96-
<input type="text" name="registration_url" id="registration_url" value="{tmpl_var name='registration_url'}" class="form-control" />
99+
<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'>" />
97100
</div>
98101
</div>
99102
<div class="form-group">
100103
<label class="col-sm-3 control-label">{tmpl_var name='registration_message_txt'}</label>
101-
<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>
104+
<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>
102105
</div>
103106
</div>
104107

105108
<div class="form-group">
106109
<label class="col-sm-3 control-label">{tmpl_var name='domain_admins_txt'}</label>
107-
<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>
110+
<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>
108111
</div>
109112

110113

interface/web/mail/xmpp_domain_edit.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@ function onSubmit() {
295295
}
296296
}
297297

298+
// Reset public registration to 'n', is not yet supported
299+
$this->dataRecord["public_registration"] = 'n';
300+
298301
parent::onSubmit();
299302
}
300303

0 commit comments

Comments
 (0)