webinterface.git

@@ -77,19 +77,19 @@ foreach ($domains as $id => $dom) {

          <input type="submit" value="Speichern" />

       </span>';

-    if ($dom['type'] != 'none') {

+    if ($dom['type'] != 'none' && $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 .= ' <p><label for="dkim-select-'.$id.'">DKIM-Einstellung: </label><select name="dkim-'.$id.'" id="dkim-select-'.$id.'" class="autosubmit">

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

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

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

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

         </select>

-         <input class="hidden" type="submit" value="Speichern" /></p>

-      </span>';

+         <input class="hidden" type="submit" value="Speichern" />

+      ';

     } else {

-        $buttons .= '<p>Sie können keine DKIM-Einstellung vornehmen, wenn der Mail-Empfang ausgeschaltet ist.</p>';

+        //$buttons .= 'Sie können keine DKIM-Einstellung vornehmen, wenn der Mail-Empfang ausgeschaltet ist.';

     }

     output("<tr{$trextra}><td>{$dom['name']}</td><td>".html_form('vmail_domainchange', 'domainchange', '', $buttons)."</td><td>{$notice}</td></tr>\n");

     if (array_key_exists($id, $subdomains)) {

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

          <label for="option-'.$id.'-manual">Manuell</label>

          <input type="radio" name="option-'.$id.'" id="option-'.$id.'-off" value="off"'.($edit_disabled ? ' disabled="disabled"' : '').'/>

          <label for="option-'.$id.'-off">Ausgeschaltet</label>

-      </span>

-        <p>Für Subdomains können keine DKIM-Einstellungen gesetzt werden.</p>';

+      </span>';

             output("<tr{$trextra}><td>{$subdom['name']}.{$dom['name']}</td><td>{$buttons}</td><td>Subdomains können nur von Admins geändert werden!</td></tr>\n");

         }

     }

@@ -466,7 +466,7 @@ function domainsettings($only_domain=null)

     $subdomains = [];

     // Domains

-    $result = db_query("SELECT d.id, CONCAT_WS('.',d.domainname,d.tld) AS name, d.mail, d.dkim, d.mailserver_lock, m.id AS m_id, v.id AS v_id FROM kundendaten.domains AS d LEFT JOIN mail.virtual_mail_domains AS v ON (d.id=v.domain AND v.hostname IS NULL) LEFT JOIN mail.custom_mappings AS m ON (d.id=m.domain AND m.subdomain IS NULL) WHERE d.useraccount=:uid OR m.uid=:uid ORDER BY CONCAT_WS('.',d.domainname,d.tld);", [":uid" => $uid]);

+    $result = db_query("SELECT d.id, CONCAT_WS('.',d.domainname,d.tld) AS name, d.mail, d.dns, d.dkim, d.mailserver_lock, m.id AS m_id, v.id AS v_id FROM kundendaten.domains AS d LEFT JOIN mail.virtual_mail_domains AS v ON (d.id=v.domain AND v.hostname IS NULL) LEFT JOIN mail.custom_mappings AS m ON (d.id=m.domain AND m.subdomain IS NULL) WHERE d.useraccount=:uid OR m.uid=:uid ORDER BY CONCAT_WS('.',d.domainname,d.tld);", [":uid" => $uid]);

     while ($mydom = $result->fetch()) {

         if (! array_key_exists($mydom['id'], $domains)) {

@@ -477,6 +477,7 @@ function domainsettings($only_domain=null)

         "name" => $mydom['name'],

         "type" => $mydom['mail'],

         "dkim" => $mydom['dkim'],

+        "dns" => $mydom['dns'],

         "mailserver_lock" => $mydom['mailserver_lock'],

         ];

             if ($only_domain && $only_domain == $mydom['id']) {