mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing existing DynDNS force-update feature. Redmine bug #2228

Browse Source
This commit is contained in:
Yehuda Katz 2012-02-22 20:02:09 -05:00
parent 40ce0d68ed
commit f3b2b2a42c
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/inc/dyndns.class
View File

@ -94,7 +94,7 @@
*/ */
function updatedns ($dnsService = '', $dnsHost = '', $dnsUser = '', $dnsPass = '', function updatedns ($dnsService = '', $dnsHost = '', $dnsUser = '', $dnsPass = '',
$dnsWildcard = 'OFF', $dnsMX = '', $dnsIf = '', $dnsBackMX = '', $dnsWildcard = 'OFF', $dnsMX = '', $dnsIf = '', $dnsBackMX = '',
$dnsServer = '', $dnsPort = '', $dnsUpdateURL = '') { $dnsServer = '', $dnsPort = '', $dnsUpdateURL = '', $forceUpdate = false) {
global $config, $g; global $config, $g;
@ -140,7 +140,7 @@
$this->_debugID = rand(1000000, 9999999); $this->_debugID = rand(1000000, 9999999);
if ($this->_detectChange() == false) { if ($forceUpdate == false && $this->_detectChange() == false) {
$this->_error(10); $this->_error(10);
} else { } else {
switch ($this->_dnsService) { switch ($this->_dnsService) {

8
etc/inc/services.inc
View File

@ -1309,8 +1309,12 @@ function services_dyndns_configure_client($conf) {
$dnsPass = $conf['password'], $dnsPass = $conf['password'],
$dnsWilcard = $conf['wildcard'], $dnsWilcard = $conf['wildcard'],
$dnsMX = $conf['mx'], $dnsMX = $conf['mx'],
$dnsIf = "{$conf['interface']}"); $dnsIf = "{$conf['interface']}",
$dnsBackMX = NULL,
$dnsServer = NULL,
$dnsPort = NULL,
$dnsUpdateURL = NULL,
$forceUpdate = $conf['force']);
} }
function services_dyndns_configure($int = "") { function services_dyndns_configure($int = "") {

3
usr/local/www/services_dyndns.php
View File

@ -159,7 +159,8 @@ include("head.inc");
<td colspan="3" class="list"><p class="vexpl"><span class="red"><strong> <td colspan="3" class="list"><p class="vexpl"><span class="red"><strong>
<?=gettext("Note:");?><br> <?=gettext("Note:");?><br>
</strong></span> </strong></span>
<?=gettext("IP addresses appearing in green are up to date with Dynamic DNS provider.");?> <?=gettext("IP addresses appearing in green are up to date with Dynamic DNS provider.");?><br>
<?=gettext("You can force an update for an IP address on the edit page for that service.");?>
</td> </td>
<td class="list">&nbsp;</td> <td class="list">&nbsp;</td>
</tr> </tr>

12
usr/local/www/services_dyndns_edit.php
View File

@ -104,6 +104,7 @@ if ($_POST) {
$dyndns['enable'] = $_POST['enable'] ? false : true; $dyndns['enable'] = $_POST['enable'] ? false : true;
$dyndns['interface'] = $_POST['interface']; $dyndns['interface'] = $_POST['interface'];
$dyndns['descr'] = $_POST['descr']; $dyndns['descr'] = $_POST['descr'];
$dyndns['force'] = isset($_POST['force']);
if($dyndns['username'] == "none") if($dyndns['username'] == "none")
$dyndns['username'] = ""; $dyndns['username'] = "";
@ -115,15 +116,7 @@ if ($_POST) {
write_config(); write_config();
$retval = 0; services_dyndns_configure_client($dyndns);
conf_mount_rw();
unlink("{$g['conf_path']}/dyndns_{$dyndns['interface']}{$dyndns['type']}{$dyndns['host']}.cache");
$retval = services_dyndns_configure_client($dyndns);
conf_mount_ro();
header("Location: services_dyndns.php"); header("Location: services_dyndns.php");
exit; exit;
@ -237,6 +230,7 @@ include("head.inc");
<a href="services_dyndns.php"><input name="cancel" type="button" class="formbtn" value="<?=gettext("Cancel");?>"></a> <a href="services_dyndns.php"><input name="cancel" type="button" class="formbtn" value="<?=gettext("Cancel");?>"></a>
<?php if (isset($id) && $a_dyndns[$id]): ?> <?php if (isset($id) && $a_dyndns[$id]): ?>
<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>"> <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>">
<input name="force" type="submit" class="formbtn" value="<?=gettext("Save & Force Update");?>" onClick="enable_change(true)">
<?php endif; ?> <?php endif; ?>
</td> </td>
</tr> </tr>