mirror of
https://github.com/mail-in-a-box/mailinabox.git
synced 2026-03-02 15:34:48 +01:00
Merge 229da5843a into de4ec82a5a
This commit is contained in:
commit
71cc88a128
@ -45,21 +45,40 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
|
<fieldset>
|
||||||
|
<legend>
|
||||||
<label for="addaliasSenders" class="col-sm-1 control-label">Permitted Senders</label>
|
<label for="addaliasSenders" class="col-sm-1 control-label">Permitted Senders</label>
|
||||||
|
</legend>
|
||||||
|
|
||||||
<div class="col-sm-10">
|
<div class="col-sm-10">
|
||||||
<div class="radio">
|
<div class="radio">
|
||||||
<label>
|
<label for="addaliasForwardsToNotAdvanced">
|
||||||
<input id="addaliasForwardsToNotAdvanced" name="addaliasForwardsToDivToggle" type="radio" checked onclick="$('#addaliasForwardsToDiv').toggle(false)">
|
<input id="addaliasForwardsToNotAdvanced"
|
||||||
Any mail user listed in the Forwards To box can send mail claiming to be from <span class="regularalias">the alias address</span><span class="catchall domainalias">any address on the alias domain</span>.
|
name="addaliasForwardsToDivToggle"
|
||||||
|
type="radio"
|
||||||
|
checked
|
||||||
|
onclick="$('#addaliasForwardsToDiv').toggle(false)">
|
||||||
|
Any mail user listed in the Forwards To box can send mail claiming to be from
|
||||||
|
<span class="regularalias">the alias address</span>
|
||||||
|
<span class="catchall domainalias">any address on the alias domain</span>.
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="radio">
|
<div class="radio">
|
||||||
<label>
|
<label for="addaliasForwardsToAdvanced">
|
||||||
<input id="addaliasForwardsToAdvanced" name="addaliasForwardsToDivToggle" type="radio" id="addaliasForwardsToDivShower" onclick="$('#addaliasForwardsToDiv').toggle(true)">
|
<input id="addaliasForwardsToAdvanced"
|
||||||
I’ll enter the mail users that can send mail claiming to be from <span class="regularalias">the alias address</span><span class="catchall domainalias">any address on the alias domain</span>.
|
name="addaliasForwardsToDivToggle"
|
||||||
|
type="radio"
|
||||||
|
onclick="$('#addaliasForwardsToDiv').toggle(true)">
|
||||||
|
I’ll enter the mail users that can send mail claiming to be from
|
||||||
|
<span class="regularalias">the alias address</span>
|
||||||
|
<span class="catchall domainalias">any address on the alias domain</span>.
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
</div>
|
||||||
<div id="addaliasForwardsToDiv" style="margin-top: .5em; margin-left: 1.4em; display: none;">
|
<div id="addaliasForwardsToDiv" style="margin-top: .5em; margin-left: 1.4em; display: none;">
|
||||||
<textarea class="form-control" rows="3" id="addaliasSenders" placeholder="one user per line or separated by commas"></textarea>
|
<textarea class="form-control" rows="3" id="addaliasSenders" placeholder="one user per line or separated by commas"></textarea>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -67,12 +67,12 @@ and ensure every administrator account for this control panel does the same.</st
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="otp-label" style="font-weight: normal">3. Optionally, give your device a label so that you can remember what device you set it up on:</label>
|
<label for="totp-setup-label" style="font-weight: normal">3. Optionally, give your device a label so that you can remember what device you set it up on:</label>
|
||||||
<input type="text" id="totp-setup-label" class="form-control" placeholder="my phone" />
|
<input type="text" id="totp-setup-label" class="form-control" placeholder="my phone" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="otp" style="font-weight: normal">4. Use the app to generate your first six-digit code and enter it here:</label>
|
<label for="totp-setup-token" style="font-weight: normal">4. Use the app to generate your first six-digit code and enter it here:</label>
|
||||||
<input type="text" id="totp-setup-token" class="form-control" placeholder="6-digit code" />
|
<input type="text" id="totp-setup-token" class="form-control" placeholder="6-digit code" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -132,6 +132,7 @@ and ensure every administrator account for this control panel does the same.</st
|
|||||||
function render_totp_setup(provisioned_totp) {
|
function render_totp_setup(provisioned_totp) {
|
||||||
var img = document.createElement('img');
|
var img = document.createElement('img');
|
||||||
img.src = "data:image/png;base64," + provisioned_totp.qr_code_base64;
|
img.src = "data:image/png;base64," + provisioned_totp.qr_code_base64;
|
||||||
|
img.alt = "QR code, scan this in your authenticator app"
|
||||||
|
|
||||||
var code = document.createElement('div');
|
var code = document.createElement('div');
|
||||||
code.innerHTML = `Secret: ${provisioned_totp.secret}`;
|
code.innerHTML = `Secret: ${provisioned_totp.secret}`;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user