* Merge multiple PPPoE/PPTP interfaces from RELENG_1_MULTI_ANYTHING

* Much improved rule generation speed
* Many bug fixing in general of the interface handling

NOTE: this is the other half of changes

1 files changed, 70 insertions, 256 deletions

diff --git a/usr/local/www/services_dyndns.php b/usr/local/www/services_dyndns.php
index 470a8c8..efa0043 100755
--- a/usr/local/www/services_dyndns.php
+++ b/usr/local/www/services_dyndns.php
@@ -1,10 +1,7 @@
 <?php
 /* $Id$ */
 /*
-	services_dyndns.php
-	part of m0n0wall (http://m0n0.ch/wall)
-
-	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
+	Copyright (C) 2008 Ermal Luçi
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -31,282 +28,99 @@
 
 require("guiconfig.inc");
 
-if (!is_array($config['dnsupdate'])) {
-	$config['dnsupdate'] = array();
-}
-
-$pconfig['username'] = $config['dyndns']['username'];
-$pconfig['password'] = $config['dyndns']['password'];
-$pconfig['host'] = $config['dyndns']['host'];
-$pconfig['mx'] = $config['dyndns']['mx'];
-$pconfig['type'] = $config['dyndns']['type'];
-$pconfig['enable'] = isset($config['dyndns']['enable']);
-$pconfig['wildcard'] = isset($config['dyndns']['wildcard']);
-
-$pconfig['dnsupdate_enable'] = isset($config['dnsupdate']['enable']);
-$pconfig['dnsupdate_host'] = $config['dnsupdate']['host'];
-$pconfig['dnsupdate_ttl'] = $config['dnsupdate']['ttl'];
-if (!$pconfig['dnsupdate_ttl'])
-	$pconfig['dnsupdate_ttl'] = 60;
-$pconfig['dnsupdate_keydata'] = $config['dnsupdate']['keydata'];
-$pconfig['dnsupdate_keyname'] = $config['dnsupdate']['keyname'];
-$pconfig['dnsupdate_keytype'] = $config['dnsupdate']['keytype'];
-if (!$pconfig['dnsupdate_keytype'])
-	$pconfig['dnsupdate_keytype'] = "zone";
-$pconfig['dnsupdate_server'] = $config['dnsupdate']['server'];
-$pconfig['dnsupdate_usetcp'] = isset($config['dnsupdate']['usetcp']);
-
-if ($_POST) {
-
-	unset($input_errors);
-	$pconfig = $_POST;
+if (!is_array($config['dyndnses']['dyndns']))
+	$config['dyndnses']['dyndns'] = array();
 
-	/* input validation */
-	$reqdfields = array();
-	$reqdfieldsn = array();
-	if ($_POST['enable']) {
-		$reqdfields = array_merge($reqdfields, explode(" ", "host username password type"));
-		$reqdfieldsn = array_merge($reqdfieldsn, explode(",", "Hostname,Username,Password,Service type"));
-	}
-	if ($_POST['dnsupdate_enable']) {
-		$reqdfields = array_merge($reqdfields, explode(" ", "dnsupdate_host dnsupdate_ttl dnsupdate_keyname dnsupdate_keydata"));
-		$reqdfieldsn = array_merge($reqdfieldsn, explode(",", "Hostname,TTL,Key name,Key"));
-	}
-	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+$a_dyndns = &$config['dyndnses']['dyndns'];
 
-	if($pconfig['type'] <> "zoneedit") {
-		if (($_POST['host'] && !is_domain($_POST['host']))) {
-			$input_errors[] = "The host name contains invalid characters.";
-		}
-	}
-	if (($_POST['mx'] && !is_domain($_POST['mx']))) {
-		$input_errors[] = "The MX contains invalid characters.";
-	}
-	if (($_POST['username'] && !is_dyndns_username($_POST['username']))) {
-		$input_errors[] = "The username contains invalid characters.";
-	}
-
-	if (($_POST['dnsupdate_host'] && !is_domain($_POST['dnsupdate_host']))) {
-		$input_errors[] = "The DNS update host name contains invalid characters.";
-	}
-	if (($_POST['dnsupdate_ttl'] && !is_numericint($_POST['dnsupdate_ttl']))) {
-		$input_errors[] = "The DNS update TTL must be an integer.";
-	}
-	if (($_POST['dnsupdate_keyname'] && !is_domain($_POST['dnsupdate_keyname']))) {
-		$input_errors[] = "The DNS update key name contains invalid characters.";
-	}
-
-	if (!$input_errors) {
-		$config['dyndns']['type'] = $_POST['type'];
-		$config['dyndns']['username'] = $_POST['username'];
-		$config['dyndns']['password'] = $_POST['password'];
-		$config['dyndns']['host'] = $_POST['host'];
-		$config['dyndns']['mx'] = $_POST['mx'];
-		$config['dyndns']['wildcard'] = $_POST['wildcard'] ? true : false;
-		$config['dyndns']['enable'] = $_POST['enable'] ? true : false;
-
-		$config['dnsupdate']['enable'] = $_POST['dnsupdate_enable'] ? true : false;
-		$config['dnsupdate']['host'] = $_POST['dnsupdate_host'];
-		$config['dnsupdate']['ttl'] = $_POST['dnsupdate_ttl'];
-		$config['dnsupdate']['keyname'] = $_POST['dnsupdate_keyname'];
-		$config['dnsupdate']['keytype'] = $_POST['dnsupdate_keytype'];
-		$config['dnsupdate']['keydata'] = $_POST['dnsupdate_keydata'];
-		$config['dnsupdate']['server'] = $_POST['dnsupdate_server'];
-		$config['dnsupdate']['usetcp'] = $_POST['dnsupdate_usetcp'] ? true : false;
+if ($_GET['act'] == "del") {
+		unset($a_dyndns[$_GET['id']]);
 
 		write_config();
 
-		$retval = 0;
-
-		/* nuke the cache file */
-		config_lock();
-		services_dyndns_reset();
-		$retval = services_dyndns_configure();
-		$retval |= services_dnsupdate_process();
-		config_unlock();
-		$savemsg = get_std_save_message($retval);
-	}
+		header("Location: services_dyndns.php");
+		exit;
 }
 
-$pgtitle = array("Services","Dynamic DNS client");
+$pgtitle = array("Services", "Dynamic DNS clients");
 include("head.inc");
 
 ?>
 
-<script language="JavaScript">
-<!--
-function enable_change(enable_change) {
-	var endis;
-
-	endis = !(document.iform.enable.checked || enable_change);
-	document.iform.host.disabled = endis;
-	document.iform.mx.disabled = endis;
-	document.iform.type.disabled = endis;
-	document.iform.wildcard.disabled = endis;
-	document.iform.username.disabled = endis;
-	document.iform.password.disabled = endis;
-
-	endis = !(document.iform.dnsupdate_enable.checked || enable_change);
-	document.iform.dnsupdate_host.disabled = endis;
-	document.iform.dnsupdate_ttl.disabled = endis;
-	document.iform.dnsupdate_keyname.disabled = endis;
-	document.iform.dnsupdate_keytype[0].disabled = endis;
-	document.iform.dnsupdate_keytype[1].disabled = endis;
-	document.iform.dnsupdate_keytype[2].disabled = endis;
-	document.iform.dnsupdate_keydata.disabled = endis;
-	document.iform.dnsupdate_server.disabled = endis;
-	document.iform.dnsupdate_usetcp.disabled = endis;
-}
-//-->
-</script>
-
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
+<form action="services_dyndns.php" method="post" name="iform" id="iform">
 <?php if ($input_errors) print_input_errors($input_errors); ?>
-<?php if ($savemsg) print_info_box($savemsg); ?>
-            <form action="services_dyndns.php" method="post" name="iform" id="iform">
-              <table width="100%" border="0" cellpadding="6" cellspacing="0">
-                <tr>
-                  <td colspan="2" valign="top" class="optsect_t">
-				  <table border="0" cellspacing="0" cellpadding="0" width="100%">
-				  <tr><td class="optsect_s"><strong>Dynamic DNS client</strong></td>
-				  <td align="right" class="optsect_s"><input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked"; ?> onClick="enable_change(false)"> <strong>Enable</strong></td></tr>
-				  </table></td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncellreq">Service type</td>
-                  <td width="78%" class="vtable">
-			<select name="type" class="formselect" id="type">
-                      <?php
-						$types = explode(",", "DNS-O-Matic DynDNS (dynamic),DynDNS (static),DynDNS (custom),DHS,DyNS,easyDNS,No-IP,ODS.org,ZoneEdit,ZoneEdit,Loopia,freeDNS");
-						$vals = explode(" ", "dnsomatic dyndns dyndns-static dyndns-custom dhs dyns easydns noip ods zoneedit loopia freedns");				$j = 0; for ($j = 0; $j < count($vals); $j++): ?>
-                      <option value="<?=$vals[$j];?>" <?php if ($vals[$j] == $pconfig['type']) echo "selected";?>>
-                      <?=htmlspecialchars($types[$j]);?>
-                      </option>
-                      <?php endfor; ?>
-                    </select></td>
-				</tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncellreq">Hostname/Interface</td>
-                  <td width="78%" class="vtable">
-                    <input name="host" type="text" class="formfld unknown" id="host" size="30" value="<?=htmlspecialchars($pconfig['host']);?>">
-                    <br>
-				    <span class="vexpl">
-				    <span class="red"><strong>Note:<br></strong>
-				    </span>
-					Enter the complete host/domain name.  example:  myhost.dyndns.org
-				    </span>
-		          </td>
-				</tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncell">MX</td>
-                  <td width="78%" class="vtable">
-                    <input name="mx" type="text" class="formfld unknown" id="mx" size="30" value="<?=htmlspecialchars($pconfig['mx']);?>">
-                    <br>
-					Note: With DynDNS service you can only use a hostname, not an IP address.
-					<br>
-                    Set this option only if you need a special MX record. Not
-                    all services support this.</td>
-				</tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncellreq">Wildcards</td>
-                  <td width="78%" class="vtable">
-                    <input name="wildcard" type="checkbox" id="wildcard" value="yes" <?php if ($pconfig['wildcard']) echo "checked"; ?>>
-                    Enable Wildcard</td>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr><td>
+<?php
+	$tab_array = array();
+	$tab_array[] = array("DynDns", true, "services_dyndns.php");
+	$tab_array[] = array("RFC 2136", false, "services_rfc2136.php");
+	display_top_tabs($tab_array);
+?>
+  </td></tr>
+  <tr>
+    <td>
+	<div id="mainarea">
+	<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+                <tr>
+				  <td width="5%"  class="listhdrr"></td>
+				  <td width="15%" class="listhdrr">Service</td>
+                  <td width="20%" class="listhdrr">Hostname</td>
+                  <td width="50%" class="listhdr">Description</td>
+                  <td width="10%" class="list"></td>
 				</tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncellreq">Username</td>
-                  <td width="78%" class="vtable">
-                    <input name="username" type="text" class="formfld user" id="username" size="20" value="<?=htmlspecialchars($pconfig['username']);?>">
+			  <?php $i = 0; foreach ($a_dyndns as $dyndns): ?>
+                <tr>
+				  <td class="listlr">
+				  <?php $iflist = get_configured_interface_with_descr();
+				  		foreach ($iflist as $if => $ifdesc):
+							if ($dyndns['interface'] == $if): ?>
+								<?=$ifdesc; break;?>
+					<?php endif; endforeach; ?>
+				  </td>
+                  <td class="listlr">
+				  <?php
+						$types = explode(",", "DNS-O-Matic DynDNS (dynamic),DynDNS (static),DynDNS (custom),DHS,DyNS,easyDNS,No-IP,ODS.org,ZoneEdit,ZoneEdit,Loopia,freeDNS");
+						$vals = explode(" ", "dnsomatic dyndns dyndns-static dyndns-custom dhs dyns easydns noip ods zoneedit loopia freedns");				
+						$j = 0; for ($j = 0; $j < count($vals); $j++) 
+                      				if ($vals[$j] == $dyndns['type']) { 
+                      					echo htmlspecialchars($types[$j]);
+											break;
+									}
+						?>
                   </td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncellreq">Password</td>
-                  <td width="78%" class="vtable">
-                    <input name="password" type="password" class="formfld pwd" id="password" size="20" value="<?=htmlspecialchars($pconfig['password']);?>">
+                  <td class="listr">
+					<?=htmlspecialchars($dyndns['host']);?>
                   </td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top">&nbsp;</td>
-                  <td width="78%">
-                    <input name="Submit" type="submit" class="formbtn" value="Save" onClick="enable_change(true)">
-                  </td>
-                <tr>
-                  <td colspan="2" class="list" height="12">&nbsp;</td>
-                </tr>
-                </tr>
-                <tr>
-                  <td colspan="2" valign="top" class="optsect_t">
-				  <table border="0" cellspacing="0" cellpadding="0" width="100%">
-				  <tr><td class="optsect_s"><strong>RFC 2136 Dynamic DNS updates</strong></td>
-				  <td align="right" class="optsect_s"><input name="dnsupdate_enable" type="checkbox" value="yes" <?php if ($pconfig['dnsupdate_enable']) echo "checked"; ?> onClick="enable_change(false)"> <strong>Enable</strong></td></tr>
-				  </table></td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncellreq">Hostname</td>
-                  <td width="78%" class="vtable">
-                    <input name="dnsupdate_host" type="text" class="formfld unknown" id="dnsupdate_host" size="30" value="<?=htmlspecialchars($pconfig['dnsupdate_host']);?>">
+                  <td class="listbg">
+		    <font color="white">
+                    <?=htmlspecialchars($dyndns['descr']);?>&nbsp;
+		    </font>
                   </td>
+                  <td valign="middle" nowrap class="list"> <a href="services_dyndns_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a>
+                     &nbsp;<a href="services_dyndns.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this VLAN?')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
 				</tr>
+			  <?php $i++; endforeach; ?>
                 <tr>
-                  <td valign="top" class="vncellreq">TTL</td>
-                  <td class="vtable">
-                    <input name="dnsupdate_ttl" type="text" class="formfld unknown" id="dnsupdate_ttl" size="6" value="<?=htmlspecialchars($pconfig['dnsupdate_ttl']);?>">
-                  seconds</td>
-                </tr>
-                <tr>
-                  <td valign="top" class="vncellreq">Key name</td>
-                  <td class="vtable">
-                    <input name="dnsupdate_keyname" type="text" class="formfld unknown" id="dnsupdate_keyname" size="30" value="<?=htmlspecialchars($pconfig['dnsupdate_keyname']);?>">
-                    <br>
-                    This must match the setting on the DNS server.</td>
-                </tr>
-                <tr>
-                  <td valign="top" class="vncellreq">Key type </td>
-                  <td class="vtable">
-				  <input name="dnsupdate_keytype" type="radio" value="zone" <?php if ($pconfig['dnsupdate_keytype'] == "zone") echo "checked"; ?>> Zone &nbsp;
-                  <input name="dnsupdate_keytype" type="radio" value="host" <?php if ($pconfig['dnsupdate_keytype'] == "host") echo "checked"; ?>> Host &nbsp;
-                  <input name="dnsupdate_keytype" type="radio" value="user" <?php if ($pconfig['dnsupdate_keytype'] == "user") echo "checked"; ?>> User
+                  <td class="list" colspan="4"></td>
+                  <td class="list"> <a href="services_dyndns_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
 				</tr>
-                <tr>
-                  <td valign="top" class="vncellreq">Key</td>
-                  <td class="vtable">
-                    <input name="dnsupdate_keydata" type="text" class="formfld unknown" id="dnsupdate_keydata" size="70" value="<?=htmlspecialchars($pconfig['dnsupdate_keydata']);?>">
-                    <br>
-                    Paste an HMAC-MD5 key here.</td>
-		</tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncellreq">Server</td>
-                  <td width="78%" class="vtable">
-                    <input name="dnsupdate_server" type="text" class+"formfld" id="dnsupdate_server" size="30" value="<?=htmlspecialchars($pconfig['dnsupdate_server'])?>">
-                  </td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncellreq">Protocol</td>
-                  <td width="78%" class="vtable">
-                    <input name="dnsupdate_usetcp" type="checkbox" id="dnsupdate_usetcp" value="yes" <?php if ($pconfig['dnsupdate_usetcp']) echo "checked"; ?>>
-                    <strong>Use TCP instead of UDP</strong></td>
+				<tr>
+				<td colspan="3" class="list"><p class="vexpl"><span class="red"><strong>
+				  Note:<br>
+				  </strong></span>
+				  Add something meaningful here.
+				  </td>
+				<td class="list">&nbsp;</td>
 				</tr>
-                <tr>
-                  <td width="22%" valign="top">&nbsp;</td>
-                  <td width="78%">
-                    <input name="Submit" type="submit" class="formbtn" value="Save" onClick="enable_change(true)">
-                  </td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top">&nbsp;</td>
-                  <td width="78%"><span class="vexpl"><span class="red"><strong>Note:<br>
-                    </strong></span>You must configure a DNS server in <a href="system.php">System:
-                    General setup</a> or allow the DNS server list to be overridden
-                    by DHCP/PPP on WAN for dynamic DNS updates to work.</span></td>
-                </tr>
               </table>
+	      </div>
+	</td>
+	</tr>
+</table>
 </form>
-<script language="JavaScript">
-<!--
-enable_change(false);
-//-->
-</script>
 <?php include("fend.inc"); ?>
 </body>
 </html>