From bae250cc81b831236583e886920c37999978ab3c Mon Sep 17 00:00:00 2001
From: Michael Kuron <mkuron@users.noreply.github.com>
Date: Sun, 12 Jul 2020 09:39:39 +0200
Subject: [PATCH 1/2] DNS: add link for downloading zonefile (#3633)

* DNS: add link for downloading zonefile

* DNS zonefile: add placeholders for optional entries
---
 data/web/inc/ajax/dns_diagnostics.php | 35 ++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/data/web/inc/ajax/dns_diagnostics.php b/data/web/inc/ajax/dns_diagnostics.php
index 4ee6f92e..b84d01b4 100644
--- a/data/web/inc/ajax/dns_diagnostics.php
+++ b/data/web/inc/ajax/dns_diagnostics.php
@@ -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 />

From bbf147242499d970087dfa7b65e1389d03fe38ed Mon Sep 17 00:00:00 2001
From: Miro Rauhala <4082806+mirorauhala@users.noreply.github.com>
Date: Sun, 12 Jul 2020 11:15:12 +0300
Subject: [PATCH 2/2] [WEB] fix undefined elements (#3651)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [WEB] $lang is not used in this context

* [Web] $stmt variable is not used

* [WEB] fix undefined function

* [WEB] remove undefined variable $display
---
 data/web/json_api.php | 2 +-
 data/web/mailbox.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/web/json_api.php b/data/web/json_api.php
index a05497a8..f0053680 100644
--- a/data/web/json_api.php
+++ b/data/web/json_api.php
@@ -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;
               }
diff --git a/data/web/mailbox.php b/data/web/mailbox.php
index 366aea09..18125049 100644
--- a/data/web/mailbox.php
+++ b/data/web/mailbox.php
@@ -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>