--- rpms/smeserver-ddclient/contribs10/smeserver-ddclient-1.3.0-Update-SM2-code-for-new-services-and-protocols.patch	2023/12/04 15:19:27	1.3
+++ rpms/smeserver-ddclient/contribs10/smeserver-ddclient-1.3.0-Update-SM2-code-for-new-services-and-protocols.patch	2023/12/14 10:24:43	1.5
@@ -16,7 +16,7 @@ diff -urN smeserver-ddclient-1.3.0.old/r
  		$OUT .= ", fwv4-skip='$fwskip' " if ( $fwskip ne '' );
 diff -urN smeserver-ddclient-1.3.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm smeserver-ddclient-1.3.0/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm
 --- smeserver-ddclient-1.3.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm	2023-11-10 16:11:05.915271983 +0000
-+++ smeserver-ddclient-1.3.0/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm	2023-12-04 14:53:00.000000000 +0000
++++ smeserver-ddclient-1.3.0/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm	2023-12-14 10:17:00.000000000 +0000
 @@ -114,90 +114,164 @@
  
  my %ddc_datas = ();
@@ -26,53 +26,53 @@ diff -urN smeserver-ddclient-1.3.0.old/r
 +	# Router/Firewall devices from which it can get ip address
 +	#
 +	my $devices = ( [
-+		[ '2wire' => '2Wire 1701HG Gateway' ],
-+		[ '3com-3c886a' => '3com 3c886a 56k Lan Modem' ],
-+		[ '3com-oc-remote812' => '3com OfficeConnect Remote 812' ],
-+		[ 'alcatel-510' => 'Alcatel Speed Touch 510' ],
-+		[ 'alcatel-530' => 'Alcatel/Thomson SpeedTouch 530' ],
-+		[ 'alcatel-stp' => 'Alcatel Speed Touch Pro' ],
-+		[ 'allnet-1298' => 'Allnet 1298' ],
-+		[ 'cayman-3220h' => 'Cayman 3220-H DSL' ],
-+		[ 'dlink-524' => 'D-Link DI-524' ],
-+		[ 'dlink-604' => 'D-Link DI-604' ],
-+		[ 'D-Link DI-614+' => 'dlink-614' ],
-+		[ 'E-tech Router' => 'e-tech' ],
-+		[ 'ELSA LanCom DSL/10 DSL FW' => 'elsa-lancom-dsl10' ],
-+		[ 'ELSA LanCom DSL/10 DSL FW (isdn ch01)' => 'elsa-lancom-dsl10-ch01' ],
-+		[ 'ELSA LanCom DSL/10 DSL FW (isdn ch01)' => 'elsa-lancom-dsl10-ch02' ],
-+		[ 'Linksys FW' => 'linksys' ],
-+		[ 'Linksys RV042 Dual Homed Router WAN Port 2' => 'linksys-rv042-wan1' ],
-+		[ 'Linksys RV042 Dual Homed Router WAN Port 2' => 'linksys-rv042-wan2' ],
-+		[ 'Linksys FW version 2' => 'linksys-ver2' ],
-+		[ 'Linksys FW version 3' => 'linksys-ver3' ],
-+		[ 'Linksys WCG200 FW' => 'linksys-wcg200' ],
-+		[ 'Linksys WRT854G FW' => 'linksys-wrt854g' ],
-+		[ 'MaxGate UGATE-3x00 FW' => 'maxgate-ugate3x00' ],
-+		[ 'NetComm NB3' => 'netcomm-nb3' ],
++		[ '2Wire 1701HG Gateway' => '2wire' ],
++		[ '3com 3c886a 56k Lan Modem' => '3com-3c886a' ],
++		[ '3com OfficeConnect Remote 812' => '3com-oc-remote812' ],
++		[ 'Alcatel Speed Touch 510' => 'alcatel-510' ],
++		[ 'Alcatel/Thomson SpeedTouch 530' => 'alcatel-530' ],
++		[ 'Alcatel Speed Touch Pro' => 'alcatel-stp' ],
++		[ 'Allnet 1298' => 'allnet-1298' ],
++		[ 'Cayman 3220-H DSL' => 'cayman-3220h' ],
++		[ 'D-Link DI-524' => 'dlink-524' ],
++		[ 'D-Link DI-604' => 'dlink-604' ],
++		[ 'dlink-614' => 'D-Link DI-614+' ],
++		[ 'e-tech' => 'E-tech Router' ],
++		[ 'elsa-lancom-dsl10' => 'ELSA LanCom DSL/10 DSL FW' ],
++		[ 'elsa-lancom-dsl10-ch01' => 'ELSA LanCom DSL/10 DSL FW (isdn ch01)' ],
++		[ 'elsa-lancom-dsl10-ch02' => 'ELSA LanCom DSL/10 DSL FW (isdn ch01)' ],
++		[ 'linksys' => 'Linksys FW' ],
++		[ 'linksys-rv042-wan1' => 'Linksys RV042 Dual Homed Router WAN Port 2' ],
++		[ 'linksys-rv042-wan2' => 'Linksys RV042 Dual Homed Router WAN Port 2' ],
++		[ 'linksys-ver2' => 'Linksys FW version 2' ],
++		[ 'linksys-ver3' => 'Linksys FW version 3' ],
++		[ 'linksys-wcg200' => 'Linksys WCG200 FW' ],
++		[ 'linksys-wrt854g' => 'Linksys WRT854G FW' ],
++		[ 'maxgate-ugate3x00' => 'MaxGate UGATE-3x00 FW' ],
++		[ 'netcomm-nb3' => 'NetComm NB3' ],
 +		[ 'netgear-dg834g' => 'netgear-dg834g' ],
-+		[ 'Netgear RP614 FW' => 'netgear-rp614' ],
-+		[ 'Netgear FW' => 'netgear-rt3xx' ],
-+		[ 'Netgear WGT624' => 'netgear-wgt624' ],
-+		[ 'Netgear WPN824 FW' => 'netgear-wpn824' ],
-+		[ 'Netopia R910 FW' => 'netopia-r910' ],
++		[ 'netgear-rp614' => 'Netgear RP614 FW' ],
++		[ 'netgear-rt3xx' => 'Netgear FW' ],
++		[ 'netgear-wgt624' => 'Netgear WGT624' ],
++		[ 'netgear-wpn824' => 'Netgear WPN824 FW' ],
++		[ 'netopia-r910' => 'Netopia R910 FW' ],
 +		[ 'olitec-SX200' => 'olitec-SX200' ],
-+		[ 'Linksys RTP300' => 'rtp300' ],
-+		[ 'Siemens SpeedStream 4200' => 'siemens-ss4200' ],
-+		[ 'Sitecom DC-202 FW' => 'sitecom-dc202' ],
-+		[ 'SMC Barricade FW' => 'smc-barricade' ],
-+		[ 'SMC Barricade FW (7004VBR model config)' => 'smc-barricade-7004vbr' ],
-+		[ 'SMC Barricade 7401BRA FW' => 'smc-barricade-7401bra' ],
-+		[ 'SMC Barricade FW (alternate config)' => 'smc-barricade-alt' ],
-+		[ 'SOHOWare BroadGuard NBG800' => 'sohoware-nbg800' ],
-+		[ 'Sveasoft WRT54G/WRT54GS' => 'sveasoft' ],
-+		[ 'Thomson SpeedTouch 536v6' => 'thomson-st536v6' ],
-+		[ 'Thomson/Technicolor TG782' => 'thomson-tg782' ],
-+		[ 'Vigor 2200 USB' => 'vigor-2200usb' ],
-+		[ 'Watchguard Edge X FW' => 'watchguard-edge-x' ],
-+		[ 'Watchguard SOHO FW' => 'watchguard-soho' ],
-+		[ 'Westell C90-610015-06 DSL Router' => 'westell-6100' ],
-+		[ 'Xsense Aero' => 'xsense-aero' ]
++		[ 'rtp300' => 'Linksys RTP300' ],
++		[ 'siemens-ss4200' => 'Siemens SpeedStream 4200' ],
++		[ 'sitecom-dc202' => 'Sitecom DC-202 FW' ],
++		[ 'smc-barricade' => 'SMC Barricade FW' ],
++		[ 'smc-barricade-7004vbr' => 'SMC Barricade FW (7004VBR model config)' ],
++		[ 'smc-barricade-7401bra' => 'SMC Barricade 7401BRA FW' ],
++		[ 'smc-barricade-alt' => 'SMC Barricade FW (alternate config)' ],
++		[ 'sohoware-nbg800' => 'SOHOWare BroadGuard NBG800' ],
++		[ 'sveasoft' => 'Sveasoft WRT54G/WRT54GS' ],
++		[ 'thomson-st536v6' => 'Thomson SpeedTouch 536v6' ],
++		[ 'thomson-tg782' => 'Thomson/Technicolor TG782' ],
++		[ 'vigor-2200usb' => 'Vigor 2200 USB' ],
++		[ 'watchguard-edge-x' => 'Watchguard Edge X FW' ],
++		[ 'watchguard-soho' => 'Watchguard SOHO FW' ],
++		[ 'westell-6100' => 'Westell C90-610015-06 DSL Router' ],
++		[ 'xsense-aero' => 'Xsense Aero' ]	
 +	] );
 +	 return $devices;
 +
@@ -93,21 +93,21 @@ diff -urN smeserver-ddclient-1.3.0.old/r
 +	# Web Services from which it can get ip address
 +	#
 +	my $webservices = ( [
-+		[ 'dyndnshttp://checkip.dyndns.org/' => 'dyndns' ],
-+		[ 'freednshttps://freedns.afraid.org/dynamic/check.php' => 'freedns' ],
-+		[ 'googledomainshttps://domains.google.com/checkip' => 'googledomains' ],
-+		[ 'hehttps://checkip.dns.he.net/' => 'he' ],
-+		[ 'ip4only.mehttps://ip4only.me/api/' => 'ip4only.me' ],
-+		[ 'ip6only.mehttps://ip6only.me/api/' => 'ip6only.me' ],
-+		[ 'ipify-ipv4https://api.ipify.org/' => 'ipify-ipv4' ],
-+		[ 'ipify-ipv6https://api6.ipify.org/' => 'ipify-ipv6' ],
-+		[ 'loopiahttps://dns.loopia.se/checkip/checkip.php' => 'loopia' ],
-+		[ 'myonlineportalhttps://myonlineportal.net/checkip' => 'myonlineportal' ],
-+		[ 'noip-ipv4http://ip1.dynupdate.no-ip.com/' => 'noip-ipv4' ],
-+		[ 'noip-ipv6http://ip1.dynupdate6.no-ip.com/' => 'noip-ipv6' ],
-+		[ 'nsupdate.info-ipv4https://ipv4.nsupdate.info/myip' => 'nsupdate.info-ipv4' ],
-+		[ 'nsupdate.info-ipv6https://ipv6.nsupdate.info/myip' => 'nsupdate.info-ipv6' ],
-+		[ 'zoneedithttps://dynamic.zoneedit.com/checkip.html' => 'zoneedit' ]
++		[ 'dyndns-http://checkip.dyndns.org/' => 'dyndns' ],
++		[ 'freedns-https://freedns.afraid.org/dynamic/check.php' => 'freedns' ],
++		[ 'googledomains-https://domains.google.com/checkip' => 'googledomains' ],
++		[ 'he-https://checkip.dns.he.net/' => 'he' ],
++		[ 'ip4only.me-https://ip4only.me/api/' => 'ip4only.me' ],
++		[ 'ip6only.me-https://ip6only.me/api/' => 'ip6only.me' ],
++		[ 'ipify-ipv4-https://api.ipify.org/' => 'ipify-ipv4' ],
++		[ 'ipify-ipv6-https://api6.ipify.org/' => 'ipify-ipv6' ],
++		[ 'loopia:-https://dns.loopia.se/checkip/checkip.php' => 'loopia' ],
++		[ 'myonlineportal-https://myonlineportal.net/checkip' => 'myonlineportal' ],
++		[ 'noip-ipv4-http://ip1.dynupdate.no-ip.com/' => 'noip-ipv4' ],
++		[ 'noip-ipv6-http://ip1.dynupdate6.no-ip.com/' => 'noip-ipv6' ],
++		[ 'nsupdate.info-ipv4-https://ipv4.nsupdate.info/myip' => 'nsupdate.info-ipv4' ],
++		[ 'nsupdate.info-ipv6-https://ipv6.nsupdate.info/myip' => 'nsupdate.info-ipv6' ],
++		[ 'zoneedit-https://dynamic.zoneedit.com/checkip.html' => 'zoneedit' ]
 +	] );
 +	return $webservices
 +
@@ -443,6 +443,15 @@ diff -urN smeserver-ddclient-1.3.0.old/r
      }
      else { $ddc_datas{"error"} = $retmsg; }
      do_display( $c, %ddc_datas );
+@@ -450,7 +541,7 @@
+ 
+         foreach $domain ( sort @virtualDomains ) {
+             my %properties = $domaindb->get($domain)->props;
+-            my $test = $domaindb->get_prop( $domain, "dns" ) || '';
++            my $test = $domaindb->get($domain) || '';
+             my %extraprops;
+             if ( $test ne '' ) {
+                 %extraprops = $domaindb->get($domain)->props;
 @@ -567,6 +658,8 @@
      my $Extinterface = $ddretrieve->prop('Extinterface') || '';
      my $cmd          = $ddretrieve->prop('cmd') || '';
@@ -735,7 +744,7 @@ diff -urN smeserver-ddclient-1.3.0.old/r
  		</span><span class=data>
 diff -urN smeserver-ddclient-1.3.0.old/root/usr/share/smanager/themes/default/templates/partials/_ddc_paramlist.html.ep smeserver-ddclient-1.3.0/root/usr/share/smanager/themes/default/templates/partials/_ddc_paramlist.html.ep
 --- smeserver-ddclient-1.3.0.old/root/usr/share/smanager/themes/default/templates/partials/_ddc_paramlist.html.ep	2023-11-10 16:11:05.902271946 +0000
-+++ smeserver-ddclient-1.3.0/root/usr/share/smanager/themes/default/templates/partials/_ddc_paramlist.html.ep	2023-12-04 10:53:00.000000000 +0000
++++ smeserver-ddclient-1.3.0/root/usr/share/smanager/themes/default/templates/partials/_ddc_paramlist.html.ep	2023-12-14 09:58:00.000000000 +0000
 @@ -1,4 +1,9 @@
  <div id='paramlist'>
 +  <script>
@@ -854,7 +863,7 @@ diff -urN smeserver-ddclient-1.3.0.old/r
 +				%=l 'Web service'
 +			</span><span class=data>
 +				% param retrievewebservice=>$ddc_datas->{"params"}->{"urlcheckip"} unless param 'retrievewebservice';
-+				%=select_field  retrievewebservice=>$dnslabels
++				%=select_field  retrievewebservice=>$webservices
 +			</span><br />
 +		</div>
 +