webinterface.git

@@ -72,7 +72,7 @@ foreach ($records as $rec) {

             }

         }

     }

-    if ($rec['type'] == 'mx') {

+    if ($rec['type'] == 'mx' || $rec['type'] == 'srv') {

         $data .= ' ('.(int) $rec['spec'].')';

     }

     if ($rec['type'] == 'sshfp') {

@@ -83,7 +83,7 @@ foreach ($records as $rec) {

     }

     $ttl = ($rec['ttl'] ? $rec['ttl'] : 3600);

     $link = $rec['fqdn'];

-    if (!in_array($rec['type'], array('a', 'aaaa', 'mx', 'cname', 'ns', 'txt', 'spf', 'ptr', 'sshfp', 'caa'))) {

+    if (!in_array($rec['type'], array('a', 'aaaa', 'mx', 'cname', 'ns', 'txt', 'spf', 'ptr', 'sshfp', 'srv', 'caa'))) {

         $editable = false;

     }

     $delete = internal_link('dns_record_save', icon_delete('Record löschen'), "id={$rec['id']}&action=delete");

@@ -98,6 +98,9 @@ foreach ($records as $rec) {

 }

 foreach ($auto_records as $rec) {

     $data = filter_output_html($rec['ip'] ? $rec['ip'] : $rec['data']);

+    if ($rec['type'] == 'mx' || $rec['type'] == 'srv') {

+        $data .= ' ('.(int) $rec['spec'].')';

+    }

     $ttl = ($rec['ttl'] ? $rec['ttl'] : 3600);

     output("<tr><td><em>{$rec['fqdn']}</em></td><td>".strtoupper($rec['type'])."</td><td>$data</td><td>{$ttl} Sek.</td><td>&#160;</td></tr>\n");

 }

@@ -128,6 +131,7 @@ output('<h4>Neuen DNS-Record anlegen</h4>

 <li>'.internal_link('dns_record_edit', 'TXT', 'id=new&type=txt&domain='.$domain->id).'</li>

 <li>'.internal_link('dns_record_edit', 'SSHFP', 'id=new&type=sshfp&domain='.$domain->id).'</li>

 <li>'.internal_link('dns_record_edit', 'CAA', 'id=new&type=caa&domain='.$domain->id).'</li>

+<li>'.internal_link('dns_record_edit', 'SRV', 'id=new&type=srv&domain='.$domain->id).'</li>

 </ul>

 <h4>Automatische DNS-Records</h4>

@@ -173,6 +173,14 @@ if ($type == 'mx') {

 }

+if ($type == 'srv') {

+    $form .= '

+<tr><td><label for="spec">Priorität:</label></td><td><input type="text" name="spec" id="spec" value="'.$data['spec'].'" /></td></tr>

+<tr><td><label for="data">Ziel (Server:Port):</label></td><td><input type="text" name="data" id="data" value="'.$data['data'].'" /></td></tr>

+';

+}

+

+

 output(html_form('dns_record_edit', 'dns_record_save', "type={$type}&domain={$domain->id}&id={$_REQUEST['id']}", '<table>

 <tr><td><label for="hostname">Hostname:</label></td><td><input type="text" name="hostname" id="hostname" value="'.$data['hostname'].'" />&#160;<strong>.'.$domain->fqdn.'</strong></td></tr>

 '.$form.'

@@ -151,7 +151,7 @@ function get_dyndns_records($id)

     return $data;

 }

-$valid_record_types = array('a', 'aaaa', 'mx', 'ns', 'spf', 'txt', 'cname', 'ptr', 'srv', 'raw', 'sshfp', 'caa');

+$valid_record_types = array('a', 'aaaa', 'mx', 'ns', 'spf', 'txt', 'cname', 'ptr', 'srv', 'raw', 'sshfp', 'caa', 'srv');

 function blank_dns_record($type)

@@ -220,6 +220,17 @@ function get_domain_auto_records($domainname)

 }

+function warn_autorecord_collission($hostname, $domain, $type) {

+    $autorecords = get_domain_auto_records($domain);

+    foreach ($autorecords as $ar) {

+        if ($ar['hostname'] == $hostname && $ar['type'] == $type) {

+            warning('Sie haben einen DNS-Record angelegt, für den bisher ein automatisch erzeuger Record vorhanden war. Ihr neuer Eintrag wird den bisherigen ersetzen. Bitte haben Sie einen Moment Geduld und laden Sie diese Seite in wenigen Minuten neu. Der automatisch erzeute Record sollte dann verschwunden sein.');

+            break;

+        }

+    }

+}

+

+

 $implemented_record_types = array('a', 'aaaa', 'mx', 'spf', 'txt', 'cname', 'ptr', 'srv', 'ns', 'sshfp', 'caa');

 function save_dns_record($id, $record)

@@ -246,6 +257,7 @@ function save_dns_record($id, $record)

     if ($record['ttl'] &&  (int) $record['ttl'] < 1) {

         system_failure('Fehler bei TTL');

     }

+    warn_autorecord_collission($record['hostname'], $dom->fqdn, $record['type']);

     switch ($record['type']) {

     case 'a':

       if ($record['dyndns']) {

@@ -324,8 +336,18 @@ function save_dns_record($id, $record)

       break;

     case 'srv':

-      system_failure('not implemented yet');

-      // no break

+      $record['dyndns'] = null;

+      $record['spec'] = (int) $record['spec'];

+      if ($record['spec'] < 0) {

+          system_failure("invalid priority");

+      }

+      if (! $record['data']) {

+          system_failure('SRV target missing');

+      }

+      list($hostname, $port) = explode(':', $record['data'], 2);

+      verify_input_hostname($hostname);

+      $record['ip'] = null;

+      break;

     default:

       system_failure('Not implemented');

   }