From: <abe...@us...> - 2017-01-29 15:39:10
|
Revision: 8132 http://sourceforge.net/p/astlinux/code/8132 Author: abelbeck Date: 2017-01-29 15:39:07 +0000 (Sun, 29 Jan 2017) Log Message: ----------- web interface, add support for DDGETIPV6 rc.conf variable, 'HE Free DNS' Dynamic DNS Service Type, and 'checkip.dns.he.net' DNS Get Modified Paths: -------------- branches/1.0/package/webinterface/altweb/admin/network.php branches/1.0/package/webinterface/altweb/common/license-astlinux.txt branches/1.0/package/webinterface/altweb/common/license-packages.txt branches/1.0/package/webinterface/altweb/common/version.php Modified: branches/1.0/package/webinterface/altweb/admin/network.php =================================================================== --- branches/1.0/package/webinterface/altweb/admin/network.php 2017-01-29 00:14:33 UTC (rev 8131) +++ branches/1.0/package/webinterface/altweb/admin/network.php 2017-01-29 15:39:07 UTC (rev 8132) @@ -41,6 +41,7 @@ // 07-15-2016, Added 4th LAN Interface // 11-14-2016, Added IPsec strongSwan support // 01-22-2017, Removed Dynamic DNS 'getip.krisk.org', map to default +// 01-29-2017, Added DDGETIPV6 support // // System location of rc.conf file $CONFFILE = '/etc/rc.conf'; @@ -96,6 +97,7 @@ 'DynDNS [static]' => 'st...@dy...', 'EasyDNS' => 'easydns', 'FreeDNS' => 'de...@fr...', + 'HE Free DNS' => 'he', 'NameCheap' => 'namecheap', 'No-IP' => 'de...@no...', 'nsupdate.info' => 'de...@ns...', @@ -106,10 +108,18 @@ $select_dyndns_getip = array ( 'User Defined >>>' => '', 'myip.dnsomatic.com' => 'myip.dnsomatic.com', + 'checkip.dns.he.net' => 'he', 'checkip.dyndns.org' => 'checkip.dyndns.org', 'External Interface' => 'interface' ); +$select_dyndns_getipv6 = array ( + 'User Defined >>>' => '', + 'checkip.dns.he.net' => 'he', + 'External Interface' => 'interface', + 'Disabled' => 'no' +); + $select_ldap_deref = array ( 'never' => 'never', 'searching' => 'searching', @@ -636,6 +646,12 @@ $value = 'DDGETIP="'.tuq($_POST['other_dd_getip']).'"'; } fwrite($fp, $value."\n"); + if ($_POST['dd_getipv6'] !== '') { + $value = 'DDGETIPV6="'.$_POST['dd_getipv6'].'"'; + } else { + $value = 'DDGETIPV6="'.tuq($_POST['other_dd_getipv6']).'"'; + } + fwrite($fp, $value."\n"); $value = 'DDHOST="'.tuq($_POST['dd_host']).'"'; fwrite($fp, $value."\n"); $value = 'DDUSER="'.tuq($_POST['dd_user']).'"'; @@ -2131,8 +2147,27 @@ } putHtml('</select>'); putHtml('<input type="text" size="36" maxlength="128" value="'.$t_value.'" name="other_dd_getip" /></td></tr>'); - + putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">'); + putHtml('DNS Get IPv6 Address:'); + $t_value = getVARdef($db, 'DDGETIPV6', $cur_db); + if ($t_value === '') { + $t_value = 'no'; + } + putHtml('<select name="dd_getipv6">'); + foreach ($select_dyndns_getipv6 as $key => $value) { + if (strcasecmp($t_value, $value) == 0) { + $sel = ' selected="selected"'; + $t_value = ''; + } else { + $sel = ''; + } + putHtml('<option value="'.$value.'"'.$sel.'>'.$key.'</option>'); + } + putHtml('</select>'); + putHtml('<input type="text" size="36" maxlength="128" value="'.$t_value.'" name="other_dd_getipv6" /></td></tr>'); + + putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">'); $value = getVARdef($db, 'DDHOST', $cur_db); putHtml('DNS Hostname:<input type="text" size="36" maxlength="128" value="'.$value.'" name="dd_host" /></td></tr>'); putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">'); Modified: branches/1.0/package/webinterface/altweb/common/license-astlinux.txt =================================================================== --- branches/1.0/package/webinterface/altweb/common/license-astlinux.txt 2017-01-29 00:14:33 UTC (rev 8131) +++ branches/1.0/package/webinterface/altweb/common/license-astlinux.txt 2017-01-29 15:39:07 UTC (rev 8132) @@ -1,4 +1,4 @@ -AstLinux is Copyright (c) 2004-2017 by Kristian Kielhofner. +AstLinux is Copyright (c) 2004-2017 by AstLinux Project, Kristian Kielhofner. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: branches/1.0/package/webinterface/altweb/common/license-packages.txt =================================================================== --- branches/1.0/package/webinterface/altweb/common/license-packages.txt 2017-01-29 00:14:33 UTC (rev 8131) +++ branches/1.0/package/webinterface/altweb/common/license-packages.txt 2017-01-29 15:39:07 UTC (rev 8132) @@ -6,7 +6,7 @@ ## 3) Lines beginning with a '#' are treated as comments ## ex-vi~Copyright (c) 2001-2002 Caldera International Inc. All rights reserved. -RUNNIX~Copyright (c) 2006-2017 Kristian Kielhofner, AstLinux Project. +RUNNIX~Copyright (c) 2006-2017 AstLinux Project, Kristian Kielhofner. libSRTP~Copyright (c) 2001-2016 Cisco Systems, Inc. All rights reserved. iLBC CODEC~Copyright (c) 2011 The WebRTC project authors. All rights reserved. Web Interface~Copyright (c) 2008-2017 Lonnie Abelbeck. @@ -19,9 +19,9 @@ OpenSSL~Copyright (c) 1998-2016 The OpenSSL Project. All rights reserved. OpenSSH~Copyright (c) 1995-2015 Tatu Ylonen, Espoo, Finland. All rights reserved. OpenVPN~Copyright (c) 2002-2017 OpenVPN Technologies, Inc. -PHP~Copyright (c) 1999-2016 The PHP Group. All rights reserved. +PHP~Copyright (c) 1999-2017 The PHP Group. All rights reserved. vsftpd~Copyright (c) 2001-2015 Daniel Jacobowitz. -lighttpd~Copyright (c) 2004-2016 Jan Kneschke. +lighttpd~Copyright (c) 2004-2017 Jan Kneschke. msmtp~Copyright (c) 2000-2016 Martin Lambers. libxml2~Copyright (c) 1998-2016 Daniel Veillard. All Rights Reserved. libtiff~Copyright (c) 1988-2015 Sam Leffler, Copyright (c) 1991-1997 Silicon Graphics, Inc. @@ -31,16 +31,16 @@ curl~Copyright (c) 1996-2016 Daniel Stenberg. rp-pppoe~Copyright (c) 2001-2012 Roaring Penguin Software Inc. zabbix~Copyright (c) 2000-2016 SIA Zabbix. -zlib~Copyright (c) 1995-2013 Jean-loup Gailly. +zlib~Copyright (c) 1995-2017 Jean-loup Gailly. SILK CODEC~Copyright (c) 2010-2016 Skype and/or Microsoft. All rights reserved. Licensed via Digium, Inc. SpanDSP~Copyright (c) 2003-2015 Steve Underwood. All rights reserved. -Prosody~Copyright (c) 2008-2016 Matthew Wild and Waqas Hussain. +Prosody~Copyright (c) 2008-2017 Matthew Wild and Waqas Hussain. Lua~Copyright (c) 1994-2012 Lua.org, PUC-Rio. All rights reserved. perl~Copyright (c) 1987-2016 Larry Wall, et al. perl-cross~Copyright (c) 2009-2016 Alex Suykov. phpLiteAdmin~Copyright (c) 2011-2015 phpLiteAdmin (https://bitbucket.org/phpliteadmin/public) -FOP2~Copyright (c) 2009-2016 House Internet S.R.L. (http://www.fop2.com) -ddclient~Copyright (c) 1999-2015 Paul Burry, wimpunk, et al. +FOP2~Copyright (c) 2009-2017 House Internet S.R.L. (http://www.fop2.com) +ddclient-curl~Copyright (c) 1999-2017 David Kerr, Paul Burry, wimpunk, et al. vCard converter~Copyright (c) 2006-2013 Thomas Bruederli. OpenLDAP~Copyright (c) 1998-2016 The OpenLDAP Foundation. All rights reserved. darkstat~Copyright (c) 2001-2015 Emil Mikulic, et al. @@ -53,7 +53,7 @@ Monit~Copyright (c) 2001-2016 Tildeslash. All rights reserved. sqlite~Copyright (c) 1995-2017 SQLite Consortium. sqliteodbc~Copyright (c) 2001-2016 Christian Werner. -Fossil~Copyright (c) 2007-2016 D. Richard Hipp. All rights reserved. +Fossil~Copyright (c) 2007-2017 D. Richard Hipp. All rights reserved. BusyBox~Copyright (c) 1998-2011 Erik Andersen, Rob Landley, Denys Vlasenko, et al. dhcp6c~Copyright (c) 1998-2008 WIDE Project with 2016 Debian patches. htop~Copyright (c) 2004-2012 Hisham Muhammad. Modified: branches/1.0/package/webinterface/altweb/common/version.php =================================================================== --- branches/1.0/package/webinterface/altweb/common/version.php 2017-01-29 00:14:33 UTC (rev 8131) +++ branches/1.0/package/webinterface/altweb/common/version.php 2017-01-29 15:39:07 UTC (rev 8132) @@ -1,6 +1,6 @@ <?php // version.php for AstLinux Alternate Web Interface -$GUI_VERSION = '1.8.39'; +$GUI_VERSION = '1.8.40'; ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |