7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Web] Disable login for mailbox users, other SKIP_SOGO checks and fixes

Browse Source
This commit is contained in:
andryyy
2020-04-29 10:57:49 +02:00
parent 200167458e
commit 447c207fb9
16 changed files with 67 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
data/web/modals/mailbox.php
View File

@@ -62,11 +62,14 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<div class="checkbox">
<label><input type="checkbox" value="1" name="active" checked> <?=$lang['add']['active'];?></label>
</div>
<select name="active" class="form-control">
<option value="1" selected><?=$lang['add']['active'];?></option>
<option value="2"><?=$lang['add']['disable_login'];?></option>
<option value="0"><?=$lang['add']['inactive'];?></option>
</select>
</div>
</div>
<hr>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button class="btn btn-default" data-action="add_item" data-id="add_mailbox" data-api-url='add/mailbox' data-api-attr='{}' href="#"><?=$lang['admin']['add'];?></button>
@@ -129,9 +132,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
<input type="number" class="form-control" name="quota" value="10240" required>
</div>
</div>
<?php
if (getenv('SKIP_SOGO') != "y") {
?>
<?php if (getenv('SKIP_SOGO') != "y") { ?>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<div class="checkbox">
@@ -140,9 +141,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
</div>
</div>
</div>
<?php
}
?>
<?php } ?>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<div class="checkbox">
@@ -183,29 +182,18 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
<hr>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<?php
if (getenv('SKIP_SOGO') != "y") {
?>
<?php if (getenv('SKIP_SOGO') != "y") { ?>
<button class="btn btn-default" data-action="add_item" data-id="add_domain" data-api-url='add/domain' data-api-attr='{}' href="#"><?=$lang['add']['add_domain_only'];?></button>
<button class="btn btn-default" data-action="add_item" data-id="add_domain" data-api-url='add/domain' data-api-attr='{"restart_sogo":"1"}' href="#"><?=$lang['add']['add_domain_restart'];?></button>
<?php
}
else {
?>
<?php } else { ?>
<button class="btn btn-default" data-action="add_item" data-id="add_domain" data-api-url='add/domain' data-api-attr='{}' href="#"><?=$lang['add']['add'];?></button>
<?php
}
?>
<?php } ?>
</div>
</div>
<?php
// TODO: Separate SOGo-related text
if (getenv('SKIP_SOGO') != "y") {
?>
<?php // TODO: Separate SOGo-related text
if (getenv('SKIP_SOGO') != "y") { ?>
<p><span class="glyphicon glyphicon-exclamation-sign text-danger"></span> <?=$lang['add']['post_domain_add'];?></p>
<?php
}
?>
<?php } ?>
</form>
</div>
</div>
@@ -313,17 +301,13 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
<div class="checkbox">
<label><input class="goto_checkbox" type="checkbox" value="1" name="goto_ham"> <?=$lang['add']['goto_ham'];?></label>
</div>
<?php
if (getenv('SKIP_SOGO') != "y") {
?>
<?php if (getenv('SKIP_SOGO') != "y") { ?>
<hr>
<div class="checkbox">
<label><input type="checkbox" value="1" name="sogo_visible" checked> <?=$lang['edit']['sogo_visible'];?></label>
</div>
<p class="help-block"><?=$lang['edit']['sogo_visible_info'];?></p>
<?php
}
?>
<?php } ?>
</div>
</div>
<div class="form-group">