webinterface.git

@@ -236,7 +236,7 @@ function get_txt_record($hostname, $domainname, $tld)

     }

     DEBUG('dig @' . $NS . ' +short -t txt ' . $hostname . '.' . $domain . '.');

     $resp = shell_exec('dig @' . $NS . ' +short -t txt ' . $hostname . '.' . $domain . '.');

-    $TXT = trim($resp, "\n \"");

+    $TXT = trim((string) $resp, "\n \"");

     DEBUG($TXT);

     return $TXT;

 }

@@ -334,8 +334,8 @@ function insert_domain_external($domain, $dns = false, $mail = true)

     $domainname = str_replace(".$tld", "", $info['domainNameUnicode']);

     logger(LOG_WARNING, 'modules/domains/include/domains', 'domains', 'Inserting external domain ' . $info['domainNameUnicode'] . " DNS:{$dns} / Mail:{$mail}");

-    db_query("INSERT INTO kundendaten.domains (status, kunde, useraccount, domainname, tld, billing, provider, dns, mail, mailserver_lock) VALUES 

-        ('external', ?, ?, ?, ?, 'external', 'other', 0, ?, 1)", [$cid, $uid, $domainname, $tld, ($mail ? 'auto' : 'none')]);

+    db_query("INSERT INTO kundendaten.domains (status, kunde, useraccount, domainname, tld, billing, provider, dns, mail, dkim, mailserver_lock) VALUES 

+        ('external', ?, ?, ?, ?, 'external', 'other', 0, ?, ?, 1)", [$cid, $uid, $domainname, $tld, ($mail ? 'auto' : 'none'), ($mail ? 'dmarc' : 'none')]);

     $id = db_insert_id();

     if ($dns) {

         db_query("UPDATE kundendaten.domains SET dns=1 WHERE id=?", [$id]);

@@ -50,8 +50,13 @@ foreach ($_POST as $key => $value) {

     }

 }

 foreach ($newsetting as $id => $type) {

-    DEBUG('MAILCONFIG change request for id #' . $id . ' to ' . $type);

+    $old = domainsettings($id);

+    DEBUG('MAILCONFIG change request for id #' . $id . ' from ' . $old['type'] . ' to ' . $type);

     change_domain($id, $type);

+    if (($old['type'] == 'none' || $old['type'] == 'nomail') && ($type == 'auto' || $type == 'virtual')) {

+        // Default wenn man Mail-Verwendung einschaltet

+        $newdkimsetting[$id] = 'dmarc';

+    }

     if ($type == "nomail" || $type == "none") {

         // DKIM muss abgeschaltet sein, wenn das DKIM-UI nicht mehr angezeigt wird

         $newdkimsetting[$id] = 'none';

@@ -86,11 +86,8 @@ foreach ($domains as $id => $dom) {

     }

     if ($dom['type'] != 'none' && $dom['type'] != 'nomail' && $dom['dns'] == 1) {

-        $check_dmarc = ($dom['dkim'] == 'dmarc' ? ' checked="checked"' : '');

-        $check_dkim = ($dom['dkim'] == 'dkim' ? ' checked="checked"' : '');

-        $check_dkimoff = ($dom['dkim'] == 'none' ? ' checked="checked"' : '');

         $buttons .= '&nbsp;<select name="dkim-' . $id . '" id="dkim-select-' . $id . '" class="autosubmit">

-            <option value="dmarc" ' . ($dom['dkim'] == 'dmarc' ? 'selected' : '') . '>DKIM+DMARC (ohne Policy)</option>

+            <option value="dmarc" ' . ($dom['dkim'] == 'dmarc' ? 'selected' : '') . '>DKIM+DMARC (Standard)</option>

             <option value="dkim" ' . ($dom['dkim'] == 'dkim' ? 'selected' : '') . '>Nur DKIM</option>

             <option value="none" ' . ($dom['dkim'] == 'none' ? 'selected' : '') . '>DKIM ausgeschaltet</option>

         </select>