webinterface.git

@@ -40,12 +40,19 @@ output('<table><tr><th>Hostname</th><th>Typ</th><th>IP-Adresse/Inhalt</th><th>TT

 ');

 foreach ($records AS $rec)

 {

+  $editable = true;

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

   if ($rec['dyndns'])

   {

+    if ($domain->fqdn == config('masterdomain'))

+    { 

+      $data = '<em>DynDNS #'.$rec['dyndns'].'</em>';

+      $editable = false;

+    } else {

       $dyndns = get_dyndns_account($rec['dyndns']);

       $data = internal_link('dyndns_edit', '<em>DynDNS #'.$rec['dyndns'].' ('.$dyndns['handle'].')</em>', 'id='.$rec['dyndns']);

     }

+  }

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

   {

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

@@ -56,7 +63,10 @@ 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'))) {

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

+      $editable = false;

+  }

+  if ($editable) {

       $link = internal_link('dns_record_edit', $rec['fqdn'], "id={$rec['id']}");

   }

   output("<tr><td>{$link}</td><td>".strtoupper($rec['type'])."</td><td>$data</td><td>{$ttl} Sek.</td><td>".internal_link('dns_record_save', '<img src="'.$prefix.'images/delete.png" width="16" height="16" alt="löschen" title="Record löschen" />', "id={$rec['id']}&action=delete")."</td></tr>\n");

@@ -67,6 +67,11 @@ function create_dyndns_account($handle, $password_http, $sshkey)

   db_query("INSERT INTO dns.dyndns (uid, handle, password, sshkey) VALUES ".

            "(:uid, :handle, :pwhash, :sshkey)",

            array(":uid" => $uid, ":handle" => $handle, ":pwhash" => $pwhash, ":sshkey" => $sshkey));

+  $dyndns_id = db_insert_id();

+  $masterdomain = new Domain(config('masterdomain'));

+  db_query("INSERT INTO dns.custom_records (type, domain, hostname, dyndns, ttl) VALUES ".

+           "('a', :dom, :hostname, :dyndns, 120)",

+           array(":dom" => $masterdomain->id, ":hostname" => filter_input_hostname($handle).'.'.$_SESSION['userinfo']['username'], ":dyndns" => $dyndns_id));

   logger(LOG_INFO, "modules/dns/include/dnsinclude", "dyndns", "inserted account");

 }

@@ -108,7 +113,9 @@ function get_dyndns_records($id)

   $data = array();

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

     $dom = new Domain((int) $entry['domain']);

+    if ($dom->fqdn != config('masterdomain')) {

       $dom->ensure_userdomain();

+    }

     $entry['fqdn'] = $entry['hostname'].'.'.$dom->fqdn;

     if (! $entry['hostname'])

       $entry['fqdn'] = $dom->fqdn;