[Astlinux-commits] SF.net SVN: astlinux:[8118] branches/1.0/package

[<abe...@us...>]

Revision: 8118
          http://sourceforge.net/p/astlinux/code/8118
Author:   abelbeck
Date:     2017-01-22 15:47:41 +0000 (Sun, 22 Jan 2017)
Log Message:
-----------
ddclient and webinterface Network tab, remove Dynamic DNS 'getip.krisk.org' (no longer working), map to default

Modified Paths:
--------------
    branches/1.0/package/ddclient/dynamicdns.init
    branches/1.0/package/webinterface/altweb/admin/network.php

Modified: branches/1.0/package/ddclient/dynamicdns.init
===================================================================
--- branches/1.0/package/ddclient/dynamicdns.init	2017-01-21 22:12:28 UTC (rev 8117)
+++ branches/1.0/package/ddclient/dynamicdns.init	2017-01-22 15:47:41 UTC (rev 8118)
@@ -13,7 +13,7 @@
 
   delay="360"
 
-  if [ -z "$DDGETIP" ]; then
+  if [ -z "$DDGETIP" -o "$DDGETIP" = "getip.krisk.org" ]; then
     web_str="myip.dnsomatic.com/"
   elif [ "$DDGETIP" = "interface" ]; then
     use_web="#"

Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php	2017-01-21 22:12:28 UTC (rev 8117)
+++ branches/1.0/package/webinterface/altweb/admin/network.php	2017-01-22 15:47:41 UTC (rev 8118)
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2008-2016 Lonnie Abelbeck
+// Copyright (C) 2008-2017 Lonnie Abelbeck
 // This is free software, licensed under the GNU General Public License
 // version 3 as published by the Free Software Foundation; you can
 // redistribute it and/or modify it under the terms of the GNU
@@ -40,6 +40,7 @@
 // 06-07-2016, Added Avahi mDNS/DNS-SD support
 // 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
 //
 // System location of rc.conf file
 $CONFFILE = '/etc/rc.conf';
@@ -106,7 +107,6 @@
   'User Defined&nbsp;&nbsp;&nbsp;&gt;&gt;&gt;' => '',
   'myip.dnsomatic.com' => 'myip.dnsomatic.com',
   'checkip.dyndns.org' => 'checkip.dyndns.org',
-  'getip.krisk.org' => 'getip.krisk.org',
   'External Interface' => 'interface'
 );
 
@@ -2115,7 +2115,8 @@
   
   putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
   putHtml('DNS Get IPv4 Address:');
-  if (($t_value = getVARdef($db, 'DDGETIP', $cur_db)) === '') {
+  $t_value = getVARdef($db, 'DDGETIP', $cur_db);
+  if ($t_value  === '' || $t_value  === 'getip.krisk.org') {
     $t_value = 'myip.dnsomatic.com';
   }
   putHtml('<select name="dd_getip">');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.