paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

master
andryyy 2020-07-12 21:43:46 +02:00
parent 9860b62d4e bbf1472424
commit 13b2f02a24
3 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
data/web/inc/ajax/dns_diagnostics.php
View File

@ -302,7 +302,7 @@ $data_field = array(
<th><?=$lang['diagnostics']['dns_records_status'];?></th>
</tr>
<?php
foreach ($records as $record) {
foreach ($records as &$record) {
$record[1] = strtoupper($record[1]);
$state = state_missing;
if ($record[1] == 'TLSA') {
@ -416,9 +416,42 @@ foreach ($records as $record) {
<td class="dns-found">%s</td>
<td class="dns-recommended">%s</td>
</tr>', $record[0], $record[1], $record[2], $state);
$record[3] = explode('<br />', $state);
}
unset($record);
?>
</table>
<?php
$data = sprintf("\$ORIGIN %s.\n", $domain);
foreach ($records as $record) {
if ($domain == substr($record[0], -strlen($domain))) {
$label = substr($record[0], 0, -strlen($domain)-1);
$val = $record[2];
if (strlen($label) == 0)
$label = "@";
$vals = array();
if(strpos($val, "<a") !== FALSE) {
if(is_array($record[3]) && count($record[3]) == 1 && $record[3][0] == state_optional)
{
$record[3][0] = "**TODO**";
$label = ';' . $label;
}
foreach ($record[3] as $val) {
$val = str_replace(state_optional, '', $val);
$val = str_replace(state_good, '', $val);
if (strlen($val) > 0)
$vals[] = sprintf("%s\tIN\t%s\t%s\n", $label, $record[1], $val);
}
} else {
$vals[] = sprintf("%s\tIN\t%s\t%s\n", $label, $record[1], $val);
}
foreach ($vals as $val) {
$data .= str_replace($domain, $domain . '.', $val);
}
}
}
echo '<a target="_blank" href="data:text/plain;base64,' . base64_encode($data) .'">Download</a>';
?>
</div>
<p class="help-block">
<sup>1</sup> <?=$lang['diagnostics']['cname_from_a'];?><br />

2
data/web/json_api.php
View File

@ -551,7 +551,7 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
break;
default:
$data = rsetting('details', $object);
$data = rsettings('details', $object);
process_get_return($data);
break;
}

2
data/web/mailbox.php
View File

@ -461,7 +461,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
<div class="table-responsive">
<table class="table table-striped" id="recipient_map_table"></table>
</div>
<div class="mass-actions-mailbox" style="display: <?php echo $display; ?>">
<div class="mass-actions-mailbox">
<div class="btn-group">
<a class="btn btn-sm btn-default" id="toggle_multi_select_all" data-id="recipient_map" href="#"><span class="glyphicon glyphicon-check" aria-hidden="true"></span> <?=$lang['mailbox']['toggle_all'];?></a>
<a class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" href="#"><?=$lang['mailbox']['quick_actions'];?> <span class="caret"></span></a>