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

[Web] Some changes

Browse Source 
[SOGo] Allow to not spawn SOGo but an idling shell
[Rspamd] Remove X-CSA-Complaints from bulk headers...
This commit is contained in:
andryyy
2020-04-27 17:27:47 +02:00
parent 0d4ba462c4
commit d392257289
29 changed files with 151 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
data/web/index.php
View File

@@ -34,11 +34,11 @@ $_SESSION['index_query_string'] = $_SERVER['QUERY_STRING'];
<div class="text-center mailcow-logo"><img src="<?=($main_logo = customize('get', 'main_logo')) ? $main_logo : '/img/cow_mailcow.svg';?>" alt="mailcow"></div>
<legend><?= isset($_SESSION['oauth2_request']) ? $lang['oauth2']['authorize_app'] : $UI_TEXTS['main_name'];?></legend>
<?php
if (strpos($_SESSION['index_query_string'], 'mobileconfig') !== false):
if (strpos($_SESSION['index_query_string'], 'mobileconfig') !== false) {
?>
<div class="alert alert-info"><?= $lang['login']['mobileconfig_info']; ?></div>
<?php
endif;
}
?>
<form method="post" autofill="off">
<div class="form-group">
@@ -57,55 +57,54 @@ $_SESSION['index_query_string'] = $_SERVER['QUERY_STRING'];
</div>
<div class="form-group">
<button type="submit" class="btn btn-success" value="Login"><?= $lang['login']['login']; ?></button>
<?php if(!isset($_SESSION['oauth2_request'])): ?>
<?php if(!isset($_SESSION['oauth2_request'])) { ?>
<div class="btn-group pull-right">
<button type="button" <?=(isset($_SESSION['mailcow_locale']) && count($AVAILABLE_LANGUAGES) === 1) ? 'disabled="true"' : '' ?> class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="lang-sm lang-lbl" lang="<?= $_SESSION['mailcow_locale']; ?>"></span> <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<?php
foreach ($AVAILABLE_LANGUAGES as $language):
foreach ($AVAILABLE_LANGUAGES as $language) {
?>
<li<?= ($_SESSION['mailcow_locale'] == $language) ? ' class="active"' : ''; ?>><a href="?<?= http_build_query(array_merge($_GET, array('lang' => $language))) ?>"><span class="lang-xs lang-lbl-full" lang="<?= $language; ?>"></span></a></li>
<?php
endforeach;
?>
<?php } ?>
</ul>
</div>
<?php endif ?>
<?php } ?>
</div>
</form>
<?php
if (isset($_SESSION['ldelay']) && $_SESSION['ldelay'] != '0'):
if (isset($_SESSION['ldelay']) && $_SESSION['ldelay'] != '0') {
?>
<p><div class="alert alert-info"><?= sprintf($lang['login']['delayed'], $_SESSION['ldelay']); ?></b></div></p>
<?php } ?>
<?php if(!isset($_SESSION['oauth2_request'])) { ?>
<legend><span class="glyphicon glyphicon-link" aria-hidden="true"></span> <?=$UI_TEXTS['apps_name'];?></legend>
<?php
endif;
?>
<?php if(!isset($_SESSION['oauth2_request'])): ?>
<legend><span class="glyphicon glyphicon-link" aria-hidden="true"></span> <?=$UI_TEXTS['apps_name'];?></legend>
<?php
foreach ($MAILCOW_APPS as $app):
?>
<a href="<?= htmlspecialchars($app['link']); ?>" role="button" style="margin-bottom:3pt" title="<?= htmlspecialchars($app['description']); ?>" class="btn btn-primary"><?= htmlspecialchars($app['name']); ?></a>&nbsp;
<?php
endforeach;
$app_links = customize('get', 'app_links');
if (!empty($app_links)) {
foreach ($app_links as $row) {
foreach ($row as $key => $val):
?>
<a href="<?= htmlspecialchars($val); ?>" role="button" style="margin-bottom:3pt" class="btn btn-primary"><?= htmlspecialchars($key); ?></a>&nbsp;
<?php
endforeach;
if (!empty($MAILCOW_APPS)) {
foreach ($MAILCOW_APPS as $app) {
if (getenv('SKIP_SOGO') == "y" && preg_match('/^\/SOGo/i', $app['link'])) { continue; }
?>
<a href="<?= htmlspecialchars($app['link']); ?>" role="button" style="margin-bottom:3pt" title="<?= htmlspecialchars($app['description']); ?>" class="btn btn-primary"><?= htmlspecialchars($app['name']); ?></a>&nbsp;
<?php
}
$app_links = customize('get', 'app_links');
if (!empty($app_links)) {
foreach ($app_links as $row) {
foreach ($row as $key => $val) {
?>
<a href="<?= htmlspecialchars($val); ?>" role="button" style="margin-bottom:3pt" class="btn btn-primary"><?= htmlspecialchars($key); ?></a>&nbsp;
<?php
}
}
}
}
}
endif;
?>
</div>
</div>
</div>
<?php if(!isset($_SESSION['oauth2_request'])): ?>
<?php if(!isset($_SESSION['oauth2_request'])) { ?>
<div class="col-md-offset-3 col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
@@ -113,19 +112,19 @@ $_SESSION['index_query_string'] = $_SERVER['QUERY_STRING'];
</div>
<div id="collapse1" class="panel-collapse collapse">
<div class="panel-body">
<?php if ($UI_TEXTS['help_text']): ?>
<?php if ($UI_TEXTS['help_text']) { ?>
<p><?=$UI_TEXTS['help_text'];?></p>
<?php else: ?>
<?php } else { ?>
<p><span style="border-bottom: 1px dotted #999;"><?=$UI_TEXTS['main_name'];?></span></p>
<p><?= $lang['start']['mailcow_panel_detail']; ?></p>
<p><span style="border-bottom: 1px dotted #999;"><?=$UI_TEXTS['apps_name'];?></span></p>
<p><?= $lang['start']['mailcow_apps_detail']; ?></p>
<?php endif; ?>
<?php } ?>
</div>
</div>
</div>
</div>
<?php endif ?>
<?php } ?>
</div>
</div><!-- /.container -->
<?php