webinterface.git

@@ -15,43 +15,57 @@ $domain = new Domain((int) $_REQUEST['dom']);

 DEBUG($domain);

-$output .= '<h3>DNS-Records für <em>'.filter_input_general($domain->fqdn).'</em></h3>';

+output('<h3>DNS-Records für <em>'.filter_input_general($domain->fqdn).'</em></h3>');

 $records = get_domain_records($domain->id);

 $auto_records = get_domain_auto_records($domain->fqdn);

-$output .= '<table><tr><th>Hostname</th><th>Typ</th><th>IP-Adresse/Inhalt</th><th>TTL</th><th>&#160;</th></tr>

-';

+output('<table><tr><th>Hostname</th><th>Typ</th><th>IP-Adresse/Inhalt</th><th>TTL</th><th>&#160;</th></tr>

+');

 foreach ($records AS $rec)

 {

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

   if ($rec['dyndns'])

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

+  {

+    $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'].')';

+  }

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

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

+  output("<tr><td>".internal_link('dns_record_edit', $rec['fqdn'], "id={$rec['id']}")."</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");

 }  

 foreach ($auto_records AS $rec)

 {

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

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

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

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

 }

-$output .= '</table>';

+output('</table>');

 if ($domain->autodns)

-  $output .= '<p style="font-size: 80%;"><em>Kursive Hostnames bezeichnen automatisch erzeugte Records. Diese können nicht geändert werden.</em></p>';

+  output('<p style="font-size: 80%;"><em>Kursive Hostnames bezeichnen automatisch erzeugte Records. Diese können nicht geändert werden.</em></p>');

 else

-  $output .= '<p style="font-size: 80%;"><em>Für diese Domain wurde die Erzeugung automatischer Records deaktiviert.</em></p>';

-

-

-$output .= html_form('dns_record_new', 'dns_record_edit', 'id=new&dom='.$domain->id, 

-'<h4>Neuen DNS-Record anlegen</h4>

-<p>

-<label for="type">Typ:</label>&#160;'.html_select('type', array('a' => 'A', 'aaaa' => 'AAAA', 'mx' => 'MX', 'ns' => 'NS', 'spf' => 'SPF', 'txt' => 'TXT', 'cname' => 'CNAME', 'ptr' => 'PTR', 'srv' => 'SRV', 'raw' => 'RAW'), 'a').'

-&#160;&#160;&#160;<input type="submit" value="Anlegen" />

-</p>');

+  output('<p style="font-size: 80%;"><em>Für diese Domain wurde die Erzeugung automatischer Records deaktiviert.</em></p>');

+

+

+output('<h4>Neuen DNS-Record anlegen</h4>

+<p>Je nach dem, welchen Eintrags-Typ Sie anlegen möchten, werden im nächsten Schritt unterschiedliche Daten abgefragt. Bitte klicken Sie auf den Eintrags-Typ, den Sie anlegen möchten. Momentan werden noch nicht alle Eintrags-Typen über dieses System bereitgestellt. Hier nicht aufgeführte Eintragsarten können Sie beim Support beantragen.</p>

+

+<ul>

+<li>'.internal_link('dns_record_edit', 'DynDNS (Hostname für einen DynDNS-Account setzen))', 'id=new&type=dyndns&domain='.$domain->id).'</li>

+<li>'.internal_link('dns_record_edit', 'A (normaler Hostname/normale Subdomain)', 'id=new&type=a&domain='.$domain->id).'</li>

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

+</ul>

+<ul>

+<li>'.internal_link('dns_record_edit', 'AAAA (IPv6-Adresse)', 'id=new&type=aaaa&domain='.$domain->id).'</li>

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

+</ul>

+');

 ?>

@@ -14,51 +14,93 @@ $section = 'dns_dns';

 $data = array();

 $type = NULL;

+$dyndns = false;

+$dyndns_accounts = array();

+foreach (get_dyndns_accounts() AS $t)

+{

+  $dyndns_accounts[$t['id']] = $t['handle'];

+}

+

+if ($_REQUEST['type'] == "dyndns")

+{

+  $_REQUEST['type'] = 'a';

+  $dyndns = true;

+}

+

 $new = false;

 if ($_REQUEST['id'] == 'new')

 {

   $new = true;

   $data = blank_dns_record($_REQUEST['type']);

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

-  $type = $_POST['type'];

+  $domain = new Domain((int) $_REQUEST['domain']);

+  $type = $_REQUEST['type'];

   if (! in_array($type, $valid_record_types))

     system_failure('Ungültiger Record-Typ!');

   $data['domain'] = $domain->id;

+  if ($dyndns)

+    $data['ttl'] = 120;

 }

 if (! $new)

 {

   $data = get_dns_record($_REQUEST['id']);

   $type = $data['type'];

+  $dyndns = isset($data['dyndns']);

+  $domain = new Domain((int) $data['domain']);

   if (! in_array($type, $valid_record_types))

     system_failure('Ungültiger Record-Typ!');

 }

-

-

 if ($new)

-  $output .= '<h3>DNS-Record erstellen</h3>';

+  output('<h3>DNS-Record erstellen</h3>');

 else

-  $output .= '<h3>DNS-Record bearbeiten</h3>';

+  output('<h3>DNS-Record bearbeiten</h3>');

-

-$action = 'create';

-if (! $new)

-  $action = 'edit&id='.(int)$_REQUEST['id'];

+output('<p>Record-Typ: '.strtoupper($type).'</p>');

 $submit = 'Speichern';

 if ($new) 

   $submit = 'Anlegen';

-$domain = new Domain( (int) $data['domain'] );

+$form = '';

+

+if (! $dyndns && ($type == 'a' || $type == 'aaaa'))

+{

+  $form .= '

+<tr><td><label for="ip">IP-Adresse:</label></td><td><input type="text" name="ip" id="ip" value="'.$data['ip'].'" /></td></tr>

+';

+}

+

+if ($type == 'ptr' || $type == 'cname')

+{

+  $form .= '

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

+';

+}

+

+if ($dyndns)

+{

+  $form .= '

+<tr><td><label for="dyndns">DynDNS-Zugang:</label></td><td>'.html_select('dyndns', $dyndns_accounts, $data['dyndns']).'</td></tr>

+';

+}

+

+if ($type == 'mx')

+{

+  $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">Posteingangsserver:</label></td><td><input type="text" name="data" id="data" value="'.$data['data'].'" /></td></tr>

+';

+}

-$output .= html_form('dns_record_edit', 'save', 'type=dns&action='.$action, 

-'<p>

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

-<p>Typ: 

+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.'

+<tr><td><label for="ttl">TTL:</label></td><td><input type="text" name="ttl" id="ttl" value="'.$data['ttl'].'" /></td></tr>

+</table>

 <p><input type="submit" value="'.$submit.'" /></p>

-</p>');

+</p>'));

 ?>

@@ -0,0 +1,72 @@

+<?php

+

+require_once('inc/base.php');

+require_once('inc/debug.php');

+global $debugmode;

+require_once('inc/security.php');

+

+require_role(ROLE_CUSTOMER);

+

+require_once('dnsinclude.php');

+

+$section = 'dns_dns';

+

+

+$record = NULL;

+

+$id = NULL;

+if ($_REQUEST['id'] == 'new')

+{

+  $record = blank_dns_record($_REQUEST['type']);

+}

+else

+{

+  $id = (int) $_REQUEST['id'];

+  $record = get_dns_record($id);

+}

+

+

+if ($_GET['action'] == 'delete') {

+  $sure = user_is_sure();

+  if ($sure === NULL)

+  {

+    $domain = new Domain((int) $record['domain']);

+    $fqdn = $domain->fqdn;

+    if ($record['hostname'])

+    {

+      $fqdn = $record['hostname'].'.'.$fqdn;

+    }

+    are_you_sure("action=delete&id={$id}", "Möchten Sie den ".strtoupper($record['type'])."-Record für ".$fqdn." wirklich löschen?");

+  }

+  elseif ($sure === true)

+  {

+    delete_dns_record($id);

+    if (! $debugmode)

+      header("Location: dns_domain?dom=".$record['domain']);

+  }

+  elseif ($sure === false)

+  {

+    if (! $debugmode)

+      header("Location: dns_domain?dom=".$record['domain']);

+  }

+}

+else

+{

+  // Sicherheitsprüfungen passieren im Backend

+  

+  $record['hostname'] = $_REQUEST['hostname'];

+  $record['domain'] = (int) $_REQUEST['domain'];

+  $record['ip'] = $_REQUEST['ip'];

+  $record['data'] = $_REQUEST['data'];

+  $record['dyndns'] = (int) $_REQUEST['dyndns'];

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

+  $record['ttl'] = (int) $_REQUEST['ttl'];

+  

+  save_dns_record($id, $record);

+

+  if (!$debugmode)

+    header('Location: dns_domain?dom='.$record['domain']);

+}

+

+

+

@@ -191,7 +191,7 @@ function save_dns_record($id, $record)

       break;

     case 'aaaa':

       $record['dyndns'] = '';

-      verify_input_ipv4($record['ip']);

+      verify_input_ipv6($record['ip']);

       $record['data'] = '';

       $record['spec'] = '';

       break;

@@ -205,10 +205,8 @@ function save_dns_record($id, $record)

         system_failure('MX hostname missing');

       $record['ip'] = '';

       break;

-    case 'spf':

-    case 'txt':

-      system_failure('not implemented yet');

     case 'cname':

+    case 'ptr':

       $record['dyndns'] = '';

       $record['spec'] = '';

       $record['ip'] = '';

@@ -217,7 +215,8 @@ function save_dns_record($id, $record)

         system_failure('MX hostname missing');

       break;

-    case 'ptr':

+    case 'spf':

+    case 'txt':

     case 'srv':

       system_failure('not implemented yet');

     default:

@@ -225,22 +224,25 @@ function save_dns_record($id, $record)

   }

   $id = (int) $id;

   $record['hostname'] = maybe_null($record['hostname']);

-  $record['ttl'] = ($recory['ttl'] == 0 ? 'NULL' : (int) $record['ttl']);

+  $record['ttl'] = ($record['ttl'] == 0 ? 'NULL' : (int) $record['ttl']);

   $record['ip'] = maybe_null($record['ip']);

   $record['data'] = maybe_null($record['data']);

   $record['spec'] = maybe_null($record['spec']);

   $record['dyndns'] = maybe_null($record['dyndns']);

   if ($id)

-    db_query("UPDATE dns.custom_records SET hostname={$record['hostname']}, domain={$dom->id}, type={$record['type']}, ttl={$record['ttl']}, ip={$record['ip']}, dyndns={$record['dyndns']}, data={$record['data']}, spec={$record['spec']} WHERE id={$id} LIMIT 1");

+    db_query("UPDATE dns.custom_records SET hostname={$record['hostname']}, domain={$dom->id}, type='{$record['type']}', ttl={$record['ttl']}, ip={$record['ip']}, dyndns={$record['dyndns']}, data={$record['data']}, spec={$record['spec']} WHERE id={$id} LIMIT 1");

   else

-    db_query("INSERT INTO dns.custom_records (hostname, domain, type, ttl, ip, dyndns, data, spec) VALUES ({$record['hostname']}, {$dom->id}, {$record['type']}, {$record['ttl']}, {$record['ip']}, {$record['dyndns']}, {$record['data']}, {$record['spec']})");

+    db_query("INSERT INTO dns.custom_records (hostname, domain, type, ttl, ip, dyndns, data, spec) VALUES ({$record['hostname']}, {$dom->id}, '{$record['type']}', {$record['ttl']}, {$record['ip']}, {$record['dyndns']}, {$record['data']}, {$record['spec']})");

 }

 function delete_dns_record($id)

 {

- // ...

+  $id = (int) $id;

+  // Diese Funktion prüft, ob der Eintrag einer eigenen Domain gehört

+  $record = get_dns_record($id);

+  db_query("DELETE FROM dns.custom_records WHERE id={$id} LIMIT 1");

 }

 ?>