Skip to content

Commit 1fceb0e

Browse files
author
Kristan Kenney
committed
Discourage adding mail domains as 'admin'
1 parent 1d6e60e commit 1fceb0e

File tree

1 file changed

+93
-73
lines changed

1 file changed

+93
-73
lines changed

‎web/templates/admin/add_mail.html‎

Lines changed: 93 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -51,104 +51,124 @@
5151
?>
5252
</td>
5353
</tr>
54-
<tr>
55-
<td class="vst-text step-top">
56-
<?php print _('Domain');?>
57-
</td>
58-
</tr>
59-
<tr>
60-
<td>
61-
<input type="text" size="20" class="vst-input" name="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>">
62-
</td>
63-
</tr>
64-
<?php if($_SESSION['IMAP_SYSTEM']){?>
54+
<? if (($user == 'admin') && (($_GET['accept'] !== "true"))) {?>
6555
<tr>
66-
<td class="vst-text step-top">
67-
<?php print _('Webmail Client');?>
56+
<td class="step-top">
57+
<span class="alert alert-danger alert-with-icon">
58+
<i class="fas fa-exclamation"></i>
59+
<?=_('Avoid adding web domains on admin account')?>
60+
</span>
6861
</td>
6962
</tr>
70-
<tr>
71-
<td>
72-
<select class="vst-list" name="v_webmail" tabindex="6" >
73-
<?php foreach ($webmail_clients as $client){
74-
echo "\t\t\t\t<option value=\"".htmlentities($client)."\"";
75-
if ((!empty($v_webmail)) && ( $v_webmail == $client )) {
76-
echo ' selected' ;
77-
}
78-
echo ">".htmlentities(ucfirst($client))."</option>\n";
79-
}
80-
?>
81-
<option value="" <?php if(empty($v_webmail)){ echo "selected";}?>><?php print _('Disabled');?></option>
82-
</select>
83-
</td>
84-
</tr>
85-
<?php } ?>
86-
<tr>
87-
<td class="vst-text input-label step-top">
88-
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_antispam" <?php if ((empty($v_antispam)) || ($v_antispam == 'yes')) echo "checked=yes"; ?>><?php print _('AntiSpam Support');?></label>
89-
</td>
90-
</tr>
91-
<tr>
92-
<td class="vst-text input-label">
93-
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_antivirus" <?php if ((empty($v_antivirus)) || ($v_antivirus == 'yes')) echo "checked=yes"; ?>><?php print _('AntiVirus Support');?></label>
94-
</td>
95-
</tr>
96-
<tr>
97-
<td class="vst-text input-label">
98-
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_dkim" <?php if (isset($v_dkim)&&$v_dkim == 'yes') echo "checked=yes"; ?>><?php print _('DKIM Support');?></label>
99-
</td>
100-
</tr>
101-
<tr>
102-
<td class="vst-text input-label">
103-
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_smtp_relay" <?php if ($v_smtp_relay == 'true') echo "checked=yes"; ?> onclick="javascript:elementHideShow('smtp_relay_table');"><?php print _('SMTP Relay');?></label>
104-
</td>
105-
</tr>
106-
<tr>
107-
<td class="step-left">
108-
<table style="display:<?php if ($v_smtp_relay == 'true'){echo 'block';} else {echo 'none';} ?>;" id="smtp_relay_table">
63+
<?php } ?>
64+
<? if (($user == 'admin') && (empty($_GET['accept']))) {?>
65+
<tr>
66+
<td class="step-top">
67+
<span><a href="/add/user/" class="vst-advanced" style="padding-left: 67px !important;padding-right: 67px !important;"><?=_('Add User')?></a></span>
68+
<span><a href="/add/mail/?accept=true" class="vst-advanced" style="padding-left: 67px !important;padding-right: 67px !important;"><?=_('Continue')?></a> </span>
69+
</td>
70+
</tr>
71+
<? } ?>
72+
<? if (($user == 'admin') && (($_GET['accept'] === "true")) || ($user !== "admin")) {?>
10973
<tr>
110-
<td class="input-label vst-text">
111-
<?php print _('Host');?>
74+
<td class="vst-text step-top">
75+
<?php print _('Domain');?>
11276
</td>
11377
</tr>
11478
<tr>
11579
<td>
116-
<input type="text" size="20" class="vst-input" name="v_smtp_relay_host" value="<?=htmlentities(trim($v_smtp_relay_host, "'"))?>">
80+
<input type="text" size="20" class="vst-input" name="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>">
11781
</td>
11882
</tr>
83+
<?php if($_SESSION['IMAP_SYSTEM']){?>
84+
<tr>
85+
<td class="vst-text step-top">
86+
<?php print _('Webmail Client');?>
87+
</td>
88+
</tr>
89+
<tr>
90+
<td>
91+
<select class="vst-list" name="v_webmail" tabindex="6" >
92+
<?php foreach ($webmail_clients as $client){
93+
echo "\t\t\t\t<option value=\"".htmlentities($client)."\"";
94+
if ((!empty($v_webmail)) && ( $v_webmail == $client )) {
95+
echo ' selected' ;
96+
}
97+
echo ">".htmlentities(ucfirst($client))."</option>\n";
98+
}
99+
?>
100+
<option value="" <?php if(empty($v_webmail)){ echo "selected";}?>><?php print _('Disabled');?></option>
101+
</select>
102+
</td>
103+
</tr>
104+
<?php } ?>
119105
<tr>
120-
<td class="input-label vst-text">
121-
<?php print _('Port');?>
106+
<td class="vst-text input-label step-top">
107+
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_antispam" <?php if ((empty($v_antispam)) || ($v_antispam == 'yes')) echo "checked=yes"; ?>><?php print _('AntiSpam Support');?></label>
122108
</td>
123109
</tr>
124110
<tr>
125-
<td>
126-
<input type="text" size="20" class="vst-input" name="v_smtp_relay_port" value="<?=htmlentities(trim($v_smtp_relay_port, "'"))?>">
127-
</td>
128-
</tr>
129-
<tr>
130-
<td class="input-label vst-text">
131-
<?php print _('Username');?>
111+
<td class="vst-text input-label">
112+
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_antivirus" <?php if ((empty($v_antivirus)) || ($v_antivirus == 'yes')) echo "checked=yes"; ?>><?php print _('AntiVirus Support');?></label>
132113
</td>
133114
</tr>
134115
<tr>
135-
<td>
136-
<input type="text" size="20" class="vst-input" name="v_smtp_relay_user" value="<?=htmlentities(trim($v_smtp_relay_user, "'"))?>">
116+
<td class="vst-text input-label">
117+
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_dkim" <?php if (isset($v_dkim)&&$v_dkim == 'yes') echo "checked=yes"; ?>><?php print _('DKIM Support');?></label>
137118
</td>
138119
</tr>
139120
<tr>
140-
<td class="input-label vst-text">
141-
<?php print _('Password');?>
121+
<td class="vst-text input-label">
122+
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_smtp_relay" <?php if ($v_smtp_relay == 'true') echo "checked=yes"; ?> onclick="javascript:elementHideShow('smtp_relay_table');"><?php print _('SMTP Relay');?></label>
142123
</td>
143124
</tr>
144125
<tr>
145-
<td>
146-
<input type="text" size="20" class="vst-input" name="v_smtp_relay_pass">
126+
<td class="step-left">
127+
<table style="display:<?php if ($v_smtp_relay == 'true'){echo 'block';} else {echo 'none';} ?>;" id="smtp_relay_table">
128+
<tr>
129+
<td class="input-label vst-text">
130+
<?php print _('Host');?>
131+
</td>
132+
</tr>
133+
<tr>
134+
<td>
135+
<input type="text" size="20" class="vst-input" name="v_smtp_relay_host" value="<?=htmlentities(trim($v_smtp_relay_host, "'"))?>">
136+
</td>
137+
</tr>
138+
<tr>
139+
<td class="input-label vst-text">
140+
<?php print _('Port');?>
141+
</td>
142+
</tr>
143+
<tr>
144+
<td>
145+
<input type="text" size="20" class="vst-input" name="v_smtp_relay_port" value="<?=htmlentities(trim($v_smtp_relay_port, "'"))?>">
146+
</td>
147+
</tr>
148+
<tr>
149+
<td class="input-label vst-text">
150+
<?php print _('Username');?>
151+
</td>
152+
</tr>
153+
<tr>
154+
<td>
155+
<input type="text" size="20" class="vst-input" name="v_smtp_relay_user" value="<?=htmlentities(trim($v_smtp_relay_user, "'"))?>">
156+
</td>
157+
</tr>
158+
<tr>
159+
<td class="input-label vst-text">
160+
<?php print _('Password');?>
161+
</td>
162+
</tr>
163+
<tr>
164+
<td>
165+
<input type="text" size="20" class="vst-input" name="v_smtp_relay_pass">
166+
</td>
167+
</tr>
168+
</table>
147169
</td>
148170
</tr>
149-
</table>
150-
</td>
151-
</tr>
171+
<? } ?>
152172
<tr>
153173
<td>
154174
<br>

0 commit comments

Comments
 (0)