webinterface.git

@@ -111,12 +111,12 @@ if ($is_current_user) {

         $vmail = count_vmail($dom->id);

         if ($used) {

             if ($vmail > 0) {

-                output("<div class=\"tile usage used\"><p><strong>".internal_link('../email/vmail', "E-Mail", 'filter='.$dom->fqdn)."</strong></p><p>E-Mail-Postfächer unter dieser Domain: <strong>{$vmail}</strong></p></div>");

+                output("<div class=\"tile usage used\"><p><strong>".internal_link('email', "E-Mail", 'dom='.$dom->id)."</strong></p><p>E-Mail-Postfächer unter dieser Domain: <strong>{$vmail}</strong></p><p>".internal_link('../email/vmail', "Postfächer verwalten", 'filter='.$dom->fqdn)."</p></div>");

             } else {

-                output("<div class=\"tile usage unused\"><p><strong>".internal_link('../email/imap', "E-Mail")."</strong></p><p>Manuelle Mail-Konfiguration ist aktiv</p></div>");

+                output("<div class=\"tile usage unused\"><p><strong>".internal_link('email', "E-Mail", "dom=".$dom->id)."</strong></p><p>Manuelle Mail-Konfiguration ist aktiv</p><p>".internal_link('../email/imap', "Accounts verwalten")."</p></div>");

             }

         } else {

-            output("<div class=\"tile usage unused\"><p><strong>".internal_link('../email/vmail', "E-Mail", 'filter='.$dom->fqdn)."</strong></p><p>Bisher keine E-Mail-Postfächer unter dieser Domain.</p></div>");

+            output("<div class=\"tile usage unused\"><p><strong>".internal_link('email', "E-Mail", 'dom='.$dom->id)."</strong></p><p>Bisher keine E-Mail-Postfächer unter dieser Domain.</p><p>".internal_link('../email/vmail', "Postfächer verwalten", "filter=".$dom->fqdn)."</p></div>");

         }

         $everused = true;

     }

@@ -38,6 +38,27 @@ function dns_in_use($domain)

     return ($result->rowCount() > 0);

 }

+function mail_setting($domain)

+{

+    if (! in_array('email', config('modules'))) {

+        return null;

+    }

+    $domain = (int) $domain;

+    $result = db_query("SELECT mail FROM kundendaten.domains WHERE id=?", [$domain]);

+    if ($result->rowCount() < 1) {

+        system_failure("Domain not found");

+    }

+    $d = $result->fetch();

+    if ($d['mail'] == 'none') {

+        return 'none';

+    } // manually disabled

+    $result = db_query("SELECT id FROM mail.virtual_mail_domains WHERE domain=?", [$domain]);

+    if ($result->rowCount() > 0) {

+        return 'vmail';

+    }

+    return 'manual';

+}

+

 function mail_in_use($domain)

 {

@@ -72,6 +72,28 @@ foreach ($domains as $id => $dom) {

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

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

       </span>';

+    

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

+        $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">DKIM-Einstellung: </label><select name="dkim" id="dkim-select">

+            <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></p>

+        <p>Werden E-Mails nur über unsere Anlagen versendet oder nutzen Sie für den Versand unter dieser Domain auch andere Anbieter?</p>

+        <p><span class="buttonset" id="buttonset-dkim-'.$id.'">

+         <input type="radio" name="dkim-'.$id.'" id="dkim-'.$id.'-dmarc" value="dmarc"'.$check_dmarc.' />

+         <label for="dkim-'.$id.'-dmarc">Nur schokokeks.org</label>

+         <input type="radio" name="dkim-'.$id.'" id="dkim-'.$id.'-dkim" value="dkim"'.$check_dkim.' />

+         <label for="dkim-'.$id.'-dkim">Auch andere Anbieter</label>

+         <input type="radio" name="dkim-'.$id.'" id="dkim-'.$id.'-off" value="off"'.$check_dkimoff.' />

+         <label for="dkim-'.$id.'-off">DKIM Ausgeschaltet</label>

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

+      </span>';

+

+    }

     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)) {

         foreach ($subdomains[$id] as $subdom) {

@@ -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.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.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)) {

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

             $domains[$mydom['id']] = [

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

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

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

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

         ];

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

@@ -120,6 +120,9 @@ p.addnew a:hover {

   border-bottom: 2px solid #257f00;

 }

+p.addnew a.grey {

+    color: #555;

+}

 p.delete a {

   color: #b22;