1 |
|
diff -urN smeserver-ddclient-1.3.0.old/root/etc/e-smith/templates/etc/ddclient/ddclient.conf/10Headers smeserver-ddclient-1.3.0/root/etc/e-smith/templates/etc/ddclient/ddclient.conf/10Headers |
2 |
|
--- smeserver-ddclient-1.3.0.old/root/etc/e-smith/templates/etc/ddclient/ddclient.conf/10Headers 2023-11-10 16:11:05.911271972 +0000 |
3 |
|
+++ smeserver-ddclient-1.3.0/root/etc/e-smith/templates/etc/ddclient/ddclient.conf/10Headers 2023-12-04 14:55:00.000000000 +0000 |
4 |
|
@@ -57,10 +57,11 @@ |
5 |
|
} else { |
6 |
|
# fw method |
7 |
|
my $fwaddress = $ddclient{'fwaddress'}||''; |
8 |
|
+ my $fwdevice = $ddclient{'Extinterface'}||''; |
9 |
|
my $fwlogin = $ddclient{'fwlogin'}||''; |
10 |
|
my $fwpassword = $ddclient{'fwpassword'}||''; |
11 |
|
my $fwskip = $ddclient{'fwskip'}||''; |
12 |
|
- $OUT .= "usev4=$method, fwv4=$fwaddress"; |
13 |
|
+ $OUT .= "usev4=$fwdevice, fwv4=$fwaddress"; |
14 |
|
$OUT .= ", fw-login=$fwlogin " if ( $fwlogin ne '' ); |
15 |
|
$OUT .= ", fw-password=$fwpassword " if ( $fwpassword ne '' ); |
16 |
|
$OUT .= ", fwv4-skip='$fwskip' " if ( $fwskip ne '' ); |
17 |
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 |
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 |
18 |
--- 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.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm 2023-11-10 16:11:05.915271983 +0000 |
19 |
+++ smeserver-ddclient-1.3.0/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm 2023-12-01 17:16:00.000000000 +0000 |
+++ smeserver-ddclient-1.3.0/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm 2023-12-04 14:53:00.000000000 +0000 |
20 |
@@ -114,57 +114,168 @@ |
@@ -114,90 +114,164 @@ |
21 |
|
|
22 |
my %ddc_datas = (); |
my %ddc_datas = (); |
23 |
|
|
24 |
+sub get_devices_names { |
+sub get_devices_names { |
25 |
+ # |
+ # |
26 |
+ # Router devices from which it can get ip address |
+ # Router/Firewall devices from which it can get ip address |
27 |
+ # |
+ # |
28 |
+ my $devices = ( [ |
+ my $devices = ( [ |
29 |
+ [ '2wire' => '2Wire 1701HG Gateway' ], |
+ [ '2wire' => '2Wire 1701HG Gateway' ], |
36 |
+ [ 'cayman-3220h' => 'Cayman 3220-H DSL' ], |
+ [ 'cayman-3220h' => 'Cayman 3220-H DSL' ], |
37 |
+ [ 'dlink-524' => 'D-Link DI-524' ], |
+ [ 'dlink-524' => 'D-Link DI-524' ], |
38 |
+ [ 'dlink-604' => 'D-Link DI-604' ], |
+ [ 'dlink-604' => 'D-Link DI-604' ], |
39 |
+ [ 'dlink-614' => 'D-Link DI-614+' ], |
+ [ 'D-Link DI-614+' => 'dlink-614' ], |
40 |
+ [ 'e-tech' => 'E-tech Router' ], |
+ [ 'E-tech Router' => 'e-tech' ], |
41 |
+ [ 'elsa-lancom-dsl10' => 'ELSA LanCom DSL/10 DSL FW' ], |
+ [ 'ELSA LanCom DSL/10 DSL FW' => 'elsa-lancom-dsl10' ], |
42 |
+ [ 'elsa-lancom-dsl10-ch01' => 'ELSA LanCom DSL/10 DSL FW (isdn ch01)' ], |
+ [ 'ELSA LanCom DSL/10 DSL FW (isdn ch01)' => 'elsa-lancom-dsl10-ch01' ], |
43 |
+ [ 'elsa-lancom-dsl10-ch02' => 'ELSA LanCom DSL/10 DSL FW (isdn ch01)' ], |
+ [ 'ELSA LanCom DSL/10 DSL FW (isdn ch01)' => 'elsa-lancom-dsl10-ch02' ], |
44 |
+ [ 'linksys' => 'Linksys FW' ], |
+ [ 'Linksys FW' => 'linksys' ], |
45 |
+ [ 'linksys-rv042-wan1' => 'Linksys RV042 Dual Homed Router WAN Port 2' ], |
+ [ 'Linksys RV042 Dual Homed Router WAN Port 2' => 'linksys-rv042-wan1' ], |
46 |
+ [ 'linksys-rv042-wan2' => 'Linksys RV042 Dual Homed Router WAN Port 2' ], |
+ [ 'Linksys RV042 Dual Homed Router WAN Port 2' => 'linksys-rv042-wan2' ], |
47 |
+ [ 'linksys-ver2' => 'Linksys FW version 2' ], |
+ [ 'Linksys FW version 2' => 'linksys-ver2' ], |
48 |
+ [ 'linksys-ver3' => 'Linksys FW version 3' ], |
+ [ 'Linksys FW version 3' => 'linksys-ver3' ], |
49 |
+ [ 'linksys-wcg200' => 'Linksys WCG200 FW' ], |
+ [ 'Linksys WCG200 FW' => 'linksys-wcg200' ], |
50 |
+ [ 'linksys-wrt854g' => 'Linksys WRT854G FW' ], |
+ [ 'Linksys WRT854G FW' => 'linksys-wrt854g' ], |
51 |
+ [ 'maxgate-ugate3x00' => 'MaxGate UGATE-3x00 FW' ], |
+ [ 'MaxGate UGATE-3x00 FW' => 'maxgate-ugate3x00' ], |
52 |
+ [ 'netcomm-nb3' => 'NetComm NB3' ], |
+ [ 'NetComm NB3' => 'netcomm-nb3' ], |
53 |
+ [ 'netgear-dg834g' => 'netgear-dg834g' ], |
+ [ 'netgear-dg834g' => 'netgear-dg834g' ], |
54 |
+ [ 'netgear-rp614' => 'Netgear RP614 FW' ], |
+ [ 'Netgear RP614 FW' => 'netgear-rp614' ], |
55 |
+ [ 'netgear-rt3xx' => 'Netgear FW' ], |
+ [ 'Netgear FW' => 'netgear-rt3xx' ], |
56 |
+ [ 'netgear-wgt624' => 'Netgear WGT624' ], |
+ [ 'Netgear WGT624' => 'netgear-wgt624' ], |
57 |
+ [ 'netgear-wpn824' => 'Netgear WPN824 FW' ], |
+ [ 'Netgear WPN824 FW' => 'netgear-wpn824' ], |
58 |
+ [ 'netopia-r910' => 'Netopia R910 FW' ], |
+ [ 'Netopia R910 FW' => 'netopia-r910' ], |
59 |
+ [ 'olitec-SX200' => 'olitec-SX200' ], |
+ [ 'olitec-SX200' => 'olitec-SX200' ], |
60 |
+ [ 'rtp300' => 'Linksys RTP300' ], |
+ [ 'Linksys RTP300' => 'rtp300' ], |
61 |
+ [ 'siemens-ss4200' => 'Siemens SpeedStream 4200' ], |
+ [ 'Siemens SpeedStream 4200' => 'siemens-ss4200' ], |
62 |
+ [ 'sitecom-dc202' => 'Sitecom DC-202 FW' ], |
+ [ 'Sitecom DC-202 FW' => 'sitecom-dc202' ], |
63 |
+ [ 'smc-barricade' => 'SMC Barricade FW' ], |
+ [ 'SMC Barricade FW' => 'smc-barricade' ], |
64 |
+ [ 'smc-barricade-7004vbr' => 'SMC Barricade FW (7004VBR model config)' ], |
+ [ 'SMC Barricade FW (7004VBR model config)' => 'smc-barricade-7004vbr' ], |
65 |
+ [ 'smc-barricade-7401bra' => 'SMC Barricade 7401BRA FW' ], |
+ [ 'SMC Barricade 7401BRA FW' => 'smc-barricade-7401bra' ], |
66 |
+ [ 'smc-barricade-alt' => 'SMC Barricade FW (alternate config)' ], |
+ [ 'SMC Barricade FW (alternate config)' => 'smc-barricade-alt' ], |
67 |
+ [ 'sohoware-nbg800' => 'SOHOWare BroadGuard NBG800' ], |
+ [ 'SOHOWare BroadGuard NBG800' => 'sohoware-nbg800' ], |
68 |
+ [ 'sveasoft' => 'Sveasoft WRT54G/WRT54GS' ], |
+ [ 'Sveasoft WRT54G/WRT54GS' => 'sveasoft' ], |
69 |
+ [ 'thomson-st536v6' => 'Thomson SpeedTouch 536v6' ], |
+ [ 'Thomson SpeedTouch 536v6' => 'thomson-st536v6' ], |
70 |
+ [ 'thomson-tg782' => 'Thomson/Technicolor TG782' ], |
+ [ 'Thomson/Technicolor TG782' => 'thomson-tg782' ], |
71 |
+ [ 'vigor-2200usb' => 'Vigor 2200 USB' ], |
+ [ 'Vigor 2200 USB' => 'vigor-2200usb' ], |
72 |
+ [ 'watchguard-edge-x' => 'Watchguard Edge X FW' ], |
+ [ 'Watchguard Edge X FW' => 'watchguard-edge-x' ], |
73 |
+ [ 'watchguard-soho' => 'Watchguard SOHO FW' ], |
+ [ 'Watchguard SOHO FW' => 'watchguard-soho' ], |
74 |
+ [ 'westell-6100' => 'Westell C90-610015-06 DSL Router' ], |
+ [ 'Westell C90-610015-06 DSL Router' => 'westell-6100' ], |
75 |
+ [ 'xsense-aero' => 'Xsense Aero'] |
+ [ 'Xsense Aero' => 'xsense-aero' ] |
76 |
+ ] ); |
+ ] ); |
77 |
+ return $devices; |
+ return $devices; |
78 |
+ |
+ |
130 |
# |
# |
131 |
my $c = shift; |
my $c = shift; |
132 |
- my $Labels = ( |
- my $Labels = ( |
133 |
+ my $dnsservices = ( [ |
- |
|
+ [ $c->l('1984') => '1984' ], |
|
|
+ [ $c->l('changeip') => 'changeip' ], |
|
|
+ [ $c->l('cloudflare') => 'cloudflare' ], |
|
|
+ [ $c->l('cloudns') => 'cloudns' ], |
|
|
+ [ $c->l('digitalocean') => 'digitalocean' ], |
|
|
+ [ $c->l('dinahosting') => 'dinahosting' ], |
|
|
+ [ $c->l('dnsexit') => 'dnsexit' ], |
|
|
+ [ $c->l('dnsmadeeasy') => 'dnsmadeeasy' ], |
|
|
+ [ $c->l('domeneshop') => 'domeneshop' ], |
|
|
+ [ $c->l('dondominio') => 'dondominio' ], |
|
|
+ [ $c->l('dslreports') => 'dslreports' ], |
|
|
+ [ $c->l('duckdns') => 'duckdns' ], |
|
|
+ [ $c->l('dyndns1') => 'dyndns1' ], |
|
|
+ [ $c->l('dyndns2') => 'dyndns2' ], |
|
|
+ [ $c->l('easydns') => 'easydns' ], |
|
|
+ [ $c->l('enom') => 'enom' ], |
|
|
+ [ $c->l('freedns') => 'freedns' ], |
|
|
+ [ $c->l('freemyip') => 'freemyip' ], |
|
|
+ [ $c->l('gandi') => 'gandi' ], |
|
|
+ [ $c->l('godaddy') => 'godaddy' ], |
|
|
+ [ $c->l('googledomains') => 'googledomains' ], |
|
|
+ [ $c->l('hetzner') => 'hetzner' ], |
|
|
+ [ $c->l('infomaniak') => 'infomaniak' ], |
|
|
+ [ $c->l('keysystems') => 'keysystems' ], |
|
|
+ [ $c->l('mythicdyn') => 'mythicdyn' ], |
|
|
+ [ $c->l('namecheap') => 'namecheap' ], |
|
|
+ [ $c->l('nfsn') => 'nfsn' ], |
|
|
+ [ $c->l('njalla') => 'njalla' ], |
|
|
+ [ $c->l('noip') => 'noip' ], |
|
|
+ [ $c->l('nsupdate') => 'nsupdate' ], |
|
|
+ [ $c->l('ovh') => 'ovh' ], |
|
|
+ [ $c->l('porkbun') => 'porkbun' ], |
|
|
+ [ $c->l('regfishde') => 'regfishde' ], |
|
|
+ [ $c->l('sitelutions') => 'sitelutions' ], |
|
|
+ [ $c->l('woima') => 'woima' ], |
|
|
+ [ $c->l('yandex') => 'yandex' ], |
|
|
+ [ $c->l('zoneedit') => 'zoneedit' ] |
|
|
+ ] ); |
|
|
+ return $dnsservices; |
|
|
|
|
134 |
- # v3.11.1 labels |
- # v3.11.1 labels |
135 |
- [ |
- [ |
136 |
- [$c->l('1984') '1984'], |
- [$c->l('1984') '1984'], |
172 |
- [$c->l('zoneedit1') 'zoneedit1'] |
- [$c->l('zoneedit1') 'zoneedit1'] |
173 |
- ] |
- ] |
174 |
- # end of v3.11.1 labels |
- # end of v3.11.1 labels |
175 |
- |
+ my $dnsservices = ( [ |
176 |
|
+ [ $c->l('1984') => '1984' ], |
177 |
|
+ [ $c->l('changeip') => 'changeip' ], |
178 |
|
+ [ $c->l('cloudflare') => 'cloudflare' ], |
179 |
|
+ [ $c->l('cloudns') => 'cloudns' ], |
180 |
|
+ [ $c->l('digitalocean') => 'digitalocean' ], |
181 |
|
+ [ $c->l('dinahosting') => 'dinahosting' ], |
182 |
|
+ [ $c->l('dnsexit') => 'dnsexit' ], |
183 |
|
+ [ $c->l('dnsmadeeasy') => 'dnsmadeeasy' ], |
184 |
|
+ [ $c->l('domeneshop') => 'domeneshop' ], |
185 |
|
+ [ $c->l('dondominio') => 'dondominio' ], |
186 |
|
+ [ $c->l('dslreports') => 'dslreports' ], |
187 |
|
+ [ $c->l('duckdns') => 'duckdns' ], |
188 |
|
+ [ $c->l('dyndns1') => 'dyndns1' ], |
189 |
|
+ [ $c->l('dyndns2') => 'dyndns2' ], |
190 |
|
+ [ $c->l('easydns') => 'easydns' ], |
191 |
|
+ [ $c->l('enom') => 'enom' ], |
192 |
|
+ [ $c->l('freedns') => 'freedns' ], |
193 |
|
+ [ $c->l('freemyip') => 'freemyip' ], |
194 |
|
+ [ $c->l('gandi') => 'gandi' ], |
195 |
|
+ [ $c->l('godaddy') => 'godaddy' ], |
196 |
|
+ [ $c->l('googledomains') => 'googledomains' ], |
197 |
|
+ [ $c->l('hetzner') => 'hetzner' ], |
198 |
|
+ [ $c->l('infomaniak') => 'infomaniak' ], |
199 |
|
+ [ $c->l('keysystems') => 'keysystems' ], |
200 |
|
+ [ $c->l('mythicdyn') => 'mythicdyn' ], |
201 |
|
+ [ $c->l('namecheap') => 'namecheap' ], |
202 |
|
+ [ $c->l('nfsn') => 'nfsn' ], |
203 |
|
+ [ $c->l('njalla') => 'njalla' ], |
204 |
|
+ [ $c->l('noip') => 'noip' ], |
205 |
|
+ [ $c->l('nsupdate') => 'nsupdate' ], |
206 |
|
+ [ $c->l('ovh') => 'ovh' ], |
207 |
|
+ [ $c->l('porkbun') => 'porkbun' ], |
208 |
|
+ [ $c->l('regfishde') => 'regfishde' ], |
209 |
|
+ [ $c->l('sitelutions') => 'sitelutions' ], |
210 |
|
+ [ $c->l('woima') => 'woima' ], |
211 |
|
+ [ $c->l('yandex') => 'yandex' ], |
212 |
|
+ [ $c->l('zoneedit') => 'zoneedit' ] |
213 |
|
+ ] ); |
214 |
|
+ return $dnsservices; |
215 |
|
|
216 |
- |
- |
217 |
- #[ [ $c->l('CUSTOMDNS'), 'CUSTOMDNS' ], |
- #[ [ $c->l('CUSTOMDNS'), 'CUSTOMDNS' ], |
218 |
|
- #[ $c->l('DYNDNS1'), 'DYNDNS1' ], |
219 |
|
- #[ $c->l('DYNDNS2'), 'DYNDNS2' ], |
220 |
|
- #[ $c->l('DYNDNS3'), 'DYNDNS3' ], |
221 |
|
- #[ $c->l('ZONEDIT'), 'ZONEDIT' ], |
222 |
|
- #[ $c->l('EASYDNS'), 'EASYDNS' ], |
223 |
|
- #[ $c->l('HAMMER'), 'HAMMER' ], |
224 |
|
- #[ $c->l('DSLREPORTS'), 'DSLREPORTS' ], |
225 |
|
- #[ $c->l('EURODYNDNS'), 'EURODYNDNS' ], |
226 |
|
- #[ $c->l('DTDNS'), 'DTDNS' ], |
227 |
|
- #[ $c->l('LOOPIA'), 'LOOPIA' ], |
228 |
|
- #[ $c->l('DNSPARK'), 'DNSPARK' ], |
229 |
|
- #[ $c->l('DYNHOST'), 'DYNHOST' ], |
230 |
|
- #[ $c->l('NOIP'), 'NOIP' ], |
231 |
|
- #[ $c->l('CHANGEIP'), 'CHANGEIP' ], |
232 |
|
- #[ $c->l('NAMECHEAP'), 'NAMECHEAP' ], |
233 |
|
- #[ $c->l('SPDNS'), 'SPDNS' ], |
234 |
|
- #[ $c->l('SITELUTIONS'), 'SITELUTIONS' ], |
235 |
|
- #[ $c->l('FREEDNS'), 'FREEDNS' ], |
236 |
|
- #[ $c->l('NSUPDATE'), 'NSUPDATE' ], |
237 |
|
- #[ $c->l('CLOUDFLARE'), 'CLOUDFLARE' ], |
238 |
|
- #[ $c->l('GOOGLEDOMAINS'), 'GOOGLEDOMAINS' ], |
239 |
|
- #[ $c->l('DUCKDNS'), 'DUCKDNS' ], |
240 |
|
- #[ $c->l('FREEMYIP'), 'FREEMYIP' ], |
241 |
|
- #[ $c->l('WOIMA'), 'WOIMA' ], |
242 |
|
- #[ $c->l('YANDEX'), 'YANDEX' ], |
243 |
|
- #[ $c->l('DNSMADEEASY'), 'DNSMADEEASY' ], |
244 |
|
- #[ $c->l('DONDOMINIO'), 'DONDOMINIO' ], |
245 |
|
- #[ $c->l('NEARLYFREESPEECH'), 'NFSN' ], |
246 |
|
- #[ $c->l('OVH'), 'OVH' ], |
247 |
|
- #[ $c->l('CLOUDNS'), 'CLOUDNS' ] |
248 |
|
- #] |
249 |
|
- ); |
250 |
|
- return $Labels; |
251 |
+ #my $output = `ddclient -list-protocols`; # Run ddclient command and capture the output |
+ #my $output = `ddclient -list-protocols`; # Run ddclient command and capture the output |
252 |
+ #my @protocols; |
+ #my @protocols; |
253 |
+ #foreach my $line (split /\n/, $output) { |
+ #foreach my $line (split /\n/, $output) { |
257 |
+ #push @protocols, [$custom_value, $protocol]; |
+ #push @protocols, [$custom_value, $protocol]; |
258 |
+ #} |
+ #} |
259 |
+ #return \@protocols; # Return a reference to the protocols array |
+ #return \@protocols; # Return a reference to the protocols array |
260 |
+} |
} |
|
+ |
|
|
+# Pre 3.11.1 dns services |
|
|
+ #[ [ $c->l('CUSTOMDNS'), 'CUSTOMDNS' ], |
|
|
#[ $c->l('DYNDNS1'), 'DYNDNS1' ], |
|
|
#[ $c->l('DYNDNS2'), 'DYNDNS2' ], |
|
|
#[ $c->l('DYNDNS3'), 'DYNDNS3' ], |
|
|
@@ -196,9 +307,6 @@ |
|
|
#[ $c->l('OVH'), 'OVH' ], |
|
|
#[ $c->l('CLOUDNS'), 'CLOUDNS' ] |
|
|
#] |
|
|
- ); |
|
|
- return $Labels; |
|
|
-} |
|
261 |
|
|
262 |
sub main { |
sub main { |
263 |
# |
@@ -230,13 +304,15 @@ |
|
@@ -230,13 +338,15 @@ |
|
264 |
my $emptycust = ( scalar @FreeDomains == 0 ); |
my $emptycust = ( scalar @FreeDomains == 0 ); |
265 |
|
|
266 |
my $Labels = ( |
my $Labels = ( |
275 |
+ [ $c->l('SME external Interface') => "smeIF" ], |
+ [ $c->l('SME external Interface') => "smeIF" ], |
276 |
+ [ $c->l('SME configuration DB') => 'smeCMD' ], |
+ [ $c->l('SME configuration DB') => 'smeCMD' ], |
277 |
+ [ $c->l('web') => 'web' ], |
+ [ $c->l('web') => 'web' ], |
278 |
+ [ $c->l('router') => 'router' ], |
+ [ $c->l('Router/Firewall') => 'router' ], |
279 |
+ [ $c->l('Interface') => 'if' ], |
+ [ $c->l('Interface') => 'if' ], |
280 |
+ [ $c->l('IP') => 'ip' ], |
+ [ $c->l('IP') => 'ip' ], |
281 |
+ [ $c->l('Command') => 'cmd' ] |
+ [ $c->l('Command') => 'cmd' ] |
283 |
); |
); |
284 |
|
|
285 |
$c->stash( |
$c->stash( |
286 |
@@ -246,6 +356,9 @@ |
@@ -246,6 +322,9 @@ |
287 |
domains => \@domains, |
domains => \@domains, |
288 |
freedomains => \@FreeDomains, |
freedomains => \@FreeDomains, |
289 |
methodlabels => $Labels, |
methodlabels => $Labels, |
293 |
emptydom => $emptydom, |
emptydom => $emptydom, |
294 |
emptycust => $emptycust |
emptycust => $emptycust |
295 |
); |
); |
296 |
@@ -260,6 +373,7 @@ |
@@ -260,6 +339,7 @@ |
297 |
# Called to update the parameters relating to the Ip address of the server |
# Called to update the parameters relating to the Ip address of the server |
298 |
# |
# |
299 |
my $c = shift; |
my $c = shift; |
301 |
$ddc_datas{"success"} = pushParams($c); |
$ddc_datas{"success"} = pushParams($c); |
302 |
do_display($c); |
do_display($c); |
303 |
} |
} |
304 |
@@ -269,6 +383,7 @@ |
@@ -269,6 +349,7 @@ |
305 |
#Called to update/delete the ddclient for a specific inbuilt domain |
#Called to update/delete the ddclient for a specific inbuilt domain |
306 |
# |
# |
307 |
my $c = shift; |
my $c = shift; |
309 |
my $retmsg; |
my $retmsg; |
310 |
if ( $c->param("Route") eq "ddclient2" ) { #Route is hidden field |
if ( $c->param("Route") eq "ddclient2" ) { #Route is hidden field |
311 |
$retmsg = performModifyCustom($c); |
$retmsg = performModifyCustom($c); |
312 |
@@ -276,10 +391,11 @@ |
@@ -276,10 +357,11 @@ |
313 |
else { |
else { |
314 |
$retmsg = performModifyDomain($c); |
$retmsg = performModifyDomain($c); |
315 |
} |
} |
322 |
$c->l( '' . $dns ) ); |
$c->l( '' . $dns ) ); |
323 |
do_display( $c, %ddc_datas ); |
do_display( $c, %ddc_datas ); |
324 |
} |
} |
325 |
@@ -296,7 +412,7 @@ |
@@ -296,7 +378,7 @@ |
326 |
# Create custom domain |
# Create custom domain |
327 |
# |
# |
328 |
my $c = shift; |
my $c = shift; |
331 |
my $modul = ''; |
my $modul = ''; |
332 |
my $trt = "NEW"; |
my $trt = "NEW"; |
333 |
|
|
334 |
@@ -305,18 +421,21 @@ |
@@ -305,18 +387,21 @@ |
335 |
title => $title, |
title => $title, |
336 |
modul => $modul, |
modul => $modul, |
337 |
ddc_datas => \%ddc_datas, |
ddc_datas => \%ddc_datas, |
355 |
$c->l( '' . $dns ) ); |
$c->l( '' . $dns ) ); |
356 |
do_display( $c, %ddc_datas ); |
do_display( $c, %ddc_datas ); |
357 |
} |
} |
358 |
@@ -334,7 +453,7 @@ |
@@ -334,7 +419,7 @@ |
359 |
# Display delete or modify panel for custom domain |
# Display delete or modify panel for custom domain |
360 |
# |
# |
361 |
my $c = shift; |
my $c = shift; |
364 |
my $modul = ''; |
my $modul = ''; |
365 |
my $trt = $c->param("trt"); |
my $trt = $c->param("trt"); |
366 |
|
|
367 |
@@ -349,7 +468,9 @@ |
@@ -349,7 +434,9 @@ |
368 |
title => $title, |
title => $title, |
369 |
modul => $modul, |
modul => $modul, |
370 |
ddc_datas => \%ddc_datas, |
ddc_datas => \%ddc_datas, |
375 |
); |
); |
376 |
$c->render( template => 'ddclient' ); |
$c->render( template => 'ddclient' ); |
377 |
} |
} |
378 |
@@ -360,21 +481,23 @@ |
@@ -360,21 +447,23 @@ |
379 |
# param trt = MOD or DEL |
# param trt = MOD or DEL |
380 |
# |
# |
381 |
my $c = shift; |
my $c = shift; |
402 |
); |
); |
403 |
$c->render( template => 'ddclient' ); |
$c->render( template => 'ddclient' ); |
404 |
} |
} |
405 |
@@ -386,10 +509,11 @@ |
@@ -386,10 +475,11 @@ |
406 |
# |
# |
407 |
my $c = shift; |
my $c = shift; |
408 |
my $route = $c->current_route; |
my $route = $c->current_route; |
415 |
|
|
416 |
#Delete it and return to front summary panel - depends on route domain or custom |
#Delete it and return to front summary panel - depends on route domain or custom |
417 |
if ( $c->param("Route") eq "ddclient2" ) { #Route is hidden field |
if ( $c->param("Route") eq "ddclient2" ) { #Route is hidden field |
418 |
@@ -400,7 +524,7 @@ |
@@ -400,7 +490,7 @@ |
419 |
} |
} |
420 |
|
|
421 |
if ( $retmsg eq "ok" ) { |
if ( $retmsg eq "ok" ) { |
424 |
$c->l( '' . $c->param("dns") ) ); |
$c->l( '' . $c->param("dns") ) ); |
425 |
} |
} |
426 |
else { $ddc_datas{"error"} = $retmsg; } |
else { $ddc_datas{"error"} = $retmsg; } |
427 |
@@ -415,15 +539,16 @@ |
@@ -415,15 +505,16 @@ |
428 |
# |
# |
429 |
my $c = shift; |
my $c = shift; |
430 |
my $route = $c->current_route; |
my $route = $c->current_route; |
443 |
} |
} |
444 |
else { $ddc_datas{"error"} = $retmsg; } |
else { $ddc_datas{"error"} = $retmsg; } |
445 |
do_display( $c, %ddc_datas ); |
do_display( $c, %ddc_datas ); |
446 |
@@ -588,6 +713,8 @@ |
@@ -567,6 +658,8 @@ |
447 |
|
my $Extinterface = $ddretrieve->prop('Extinterface') || ''; |
448 |
|
my $cmd = $ddretrieve->prop('cmd') || ''; |
449 |
|
my $forceIP = $ddretrieve->prop('ForceIP') || ''; |
450 |
|
+ my $fwlogin = $ddretrieve->prop('fwlogin') || ''; |
451 |
|
+ my $fwpassword = $ddretrieve->prop('fwpassword') || ''; |
452 |
|
my $res = { |
453 |
|
"ssl" => $ssl, |
454 |
|
"DeamonUpdate" => $DeamonUpdate, |
455 |
|
@@ -574,29 +667,43 @@ |
456 |
|
"Extinterface" => $Extinterface, |
457 |
|
"cmd" => $cmd, |
458 |
|
"ForceIP" => $forceIP, |
459 |
|
- "urlcheckip" => $urlcheckip |
460 |
|
+ "urlcheckip" => $urlcheckip, |
461 |
|
+ "FWlogin" => $fwlogin, |
462 |
|
+ "FWpassword" => $fwpassword |
463 |
|
}; |
464 |
|
return $res; |
465 |
|
} |
466 |
|
|
467 |
|
sub pushParams { |
468 |
|
my $c = shift; |
469 |
|
- my $DeamonUpdate = $c->param('retrievedeamonupdate'); |
470 |
|
- my $urlcheckip = $c->param('retrieveurlcheckip'); |
471 |
|
- my $ssl = $c->param('retrievessl'); |
472 |
|
+ my $retrievedeamonupdate = $c->param('retrievedeamonupdate'); |
473 |
|
+ my $retrieverouter = $c->param('retrieverouter'); |
474 |
|
+ my $retrievewebservice = $c->param('retrievewebservice'); |
475 |
|
+ my $retrieveurlcheckip = $c->param('retrieveurlcheckip'); |
476 |
|
+ my $retrievessl = $c->param('retrievessl'); |
477 |
|
my $retrievemethod = $c->param('retrievemethod'); |
478 |
my $retrieveinterface = $c->param('retrieveinterface'); |
my $retrieveinterface = $c->param('retrieveinterface'); |
479 |
my $retrievecmd = $c->param('retrievecmd'); |
my $retrievecmd = $c->param('retrievecmd'); |
480 |
my $retrieveip = $c->param('retrieveip'); |
my $retrieveip = $c->param('retrieveip'); |
481 |
|
+ my $retrievefwlogin = $c->param('retrieverouterlogin'); |
482 |
|
+ my $retrievefwpassword = $c->param('retrieverouterpassword'); |
483 |
+ |
+ |
484 |
+ #print 1 / 0; #Crash |
+ #print 1 / 0; #Crash |
485 |
|
|
486 |
my $ddclient = $db->get('ddclient'); |
my $ddclient = $db->get('ddclient'); |
487 |
$ddclient->set_prop( 'urlcheckip' => $urlcheckip ); |
- $ddclient->set_prop( 'urlcheckip' => $urlcheckip ); |
488 |
@@ -616,7 +743,7 @@ |
- $ddclient->set_prop( 'DeamonUpdate' => $DeamonUpdate ); |
489 |
|
- $ddclient->set_prop( 'SSL' => $ssl ); |
490 |
|
+ $ddclient->set_prop( 'urlcheckip' => $retrievewebservice || $retrieveurlcheckip ); |
491 |
|
+ $ddclient->set_prop( 'DeamonUpdate' => $retrievedeamonupdate ); |
492 |
|
+ $ddclient->set_prop( 'SSL' => $retrievessl ); |
493 |
|
$ddclient->set_prop( 'method' => $retrievemethod ); |
494 |
|
- $ddclient->set_prop( 'Extinterface' => $retrieveinterface ); |
495 |
|
+ if ($retrievemethod eq 'router') { |
496 |
|
+ $ddclient->set_prop( 'Extinterface' => $retrieverouter ); |
497 |
|
+ } else { |
498 |
|
+ $ddclient->set_prop( 'Extinterface' => $retrieveinterface ); |
499 |
|
+ } |
500 |
|
$ddclient->set_prop( 'cmd' => $retrievecmd ); |
501 |
|
$ddclient->set_prop( 'ForceIP' => $retrieveip ); |
502 |
|
+ $ddclient->set_prop( 'fwlogin' => $retrievefwlogin ); |
503 |
|
+ $ddclient->set_prop( 'fwpassword' => $retrievefwpassword ); |
504 |
|
|
505 |
|
$domaindb->reload(); |
506 |
|
|
507 |
|
@@ -616,7 +723,7 @@ |
508 |
#------------------------------------------------------------ |
#------------------------------------------------------------ |
509 |
|
|
510 |
my $domainName = $c->param('domainName'); |
my $domainName = $c->param('domainName'); |
513 |
$domainName = $1; |
$domainName = $1; |
514 |
} |
} |
515 |
else { |
else { |
516 |
@@ -624,7 +751,7 @@ |
@@ -624,7 +731,7 @@ |
517 |
} |
} |
518 |
|
|
519 |
my $domainLogin = $c->param('login'); |
my $domainLogin = $c->param('login'); |
522 |
$domainLogin = $1; |
$domainLogin = $1; |
523 |
} |
} |
524 |
else { |
else { |
525 |
@@ -632,7 +759,7 @@ |
@@ -632,7 +739,7 @@ |
526 |
} |
} |
527 |
|
|
528 |
my $domainPassword = $c->param('password'); |
my $domainPassword = $c->param('password'); |
531 |
$domainPassword = $1; |
$domainPassword = $1; |
532 |
} |
} |
533 |
else { |
else { |
534 |
@@ -646,7 +773,7 @@ |
@@ -646,7 +753,7 @@ |
535 |
|
|
536 |
my $dns = $c->param('dns'); |
my $dns = $c->param('dns'); |
537 |
if ( $dns eq 'CUSTOMDNS' ) { |
if ( $dns eq 'CUSTOMDNS' ) { |
540 |
$customDNS = $1; |
$customDNS = $1; |
541 |
} |
} |
542 |
else |
else |
543 |
@@ -685,7 +812,7 @@ |
@@ -685,7 +792,7 @@ |
544 |
# Attempt to delete domain |
# Attempt to delete domain |
545 |
#------------------------------------------------------------ |
#------------------------------------------------------------ |
546 |
|
|
549 |
$domain = $1; |
$domain = $1; |
550 |
} |
} |
551 |
else { |
else { |
552 |
@@ -726,7 +853,7 @@ |
@@ -726,7 +833,7 @@ |
553 |
#------------------------------------------------------------ |
#------------------------------------------------------------ |
554 |
|
|
555 |
my $domainName = $c->param('domainName'); |
my $domainName = $c->param('domainName'); |
558 |
$domainName = $1; |
$domainName = $1; |
559 |
} |
} |
560 |
else { |
else { |
561 |
@@ -749,7 +876,7 @@ |
@@ -749,7 +856,7 @@ |
562 |
|
|
563 |
my $domainDesc = $c->param('desc'); |
my $domainDesc = $c->param('desc'); |
564 |
my $domainLogin = $c->param('login'); |
my $domainLogin = $c->param('login'); |
567 |
$domainLogin = $1; |
$domainLogin = $1; |
568 |
} |
} |
569 |
else { |
else { |
570 |
@@ -757,7 +884,7 @@ |
@@ -757,7 +864,7 @@ |
571 |
} |
} |
572 |
|
|
573 |
my $domainPassword = $c->param('password'); |
my $domainPassword = $c->param('password'); |
576 |
$domainPassword = $1; |
$domainPassword = $1; |
577 |
} |
} |
578 |
else { |
else { |
579 |
@@ -771,7 +898,7 @@ |
@@ -771,7 +878,7 @@ |
580 |
|
|
581 |
my $dns = $c->param('dns'); |
my $dns = $c->param('dns'); |
582 |
if ( $dns eq 'CUSTOMDNS' ) { |
if ( $dns eq 'CUSTOMDNS' ) { |
585 |
$customDNS = $1; |
$customDNS = $1; |
586 |
} |
} |
587 |
else { |
else { |
588 |
@@ -809,7 +936,7 @@ |
@@ -809,7 +916,7 @@ |
589 |
#------------------------------------------------------------ |
#------------------------------------------------------------ |
590 |
|
|
591 |
my $domainName = $c->param('domainName'); |
my $domainName = $c->param('domainName'); |
594 |
$domainName = $1; |
$domainName = $1; |
595 |
} |
} |
596 |
else { |
else { |
597 |
@@ -817,7 +944,7 @@ |
@@ -817,7 +924,7 @@ |
598 |
} |
} |
599 |
|
|
600 |
my $domainLogin = $c->param('login'); |
my $domainLogin = $c->param('login'); |
603 |
$domainLogin = $1; |
$domainLogin = $1; |
604 |
} |
} |
605 |
else { |
else { |
606 |
@@ -825,7 +952,7 @@ |
@@ -825,7 +932,7 @@ |
607 |
} |
} |
608 |
|
|
609 |
my $domainPassword = $c->param('password'); |
my $domainPassword = $c->param('password'); |
612 |
$domainPassword = $1; |
$domainPassword = $1; |
613 |
} |
} |
614 |
else { |
else { |
615 |
@@ -839,7 +966,7 @@ |
@@ -839,7 +946,7 @@ |
616 |
|
|
617 |
my $dns = $c->param('dns'); |
my $dns = $c->param('dns'); |
618 |
if ( $dns eq 'CUSTOMDNS' ) { |
if ( $dns eq 'CUSTOMDNS' ) { |
621 |
$customDNS = $1; |
$customDNS = $1; |
622 |
} |
} |
623 |
else |
else |
624 |
@@ -878,7 +1005,7 @@ |
@@ -878,7 +985,7 @@ |
625 |
# Attempt to delete domain |
# Attempt to delete domain |
626 |
#------------------------------------------------------------ |
#------------------------------------------------------------ |
627 |
|
|
735 |
</span><span class=data> |
</span><span class=data> |
736 |
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 |
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 |
737 |
--- 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.old/root/usr/share/smanager/themes/default/templates/partials/_ddc_paramlist.html.ep 2023-11-10 16:11:05.902271946 +0000 |
738 |
+++ smeserver-ddclient-1.3.0/root/usr/share/smanager/themes/default/templates/partials/_ddc_paramlist.html.ep 2023-12-01 17:12:00.000000000 +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 |
739 |
@@ -1,4 +1,9 @@ |
@@ -1,4 +1,9 @@ |
740 |
<div id='paramlist'> |
<div id='paramlist'> |
741 |
+ <script> |
+ <script> |
760 |
</span><span class=data> |
</span><span class=data> |
761 |
% param retrievedeamonupdate=>$ddc_datas->{"params"}->{"DeamonUpdate"}; |
% param retrievedeamonupdate=>$ddc_datas->{"params"}->{"DeamonUpdate"}; |
762 |
%=number_field 'retrievedeamonupdate',min=>0 |
%=number_field 'retrievedeamonupdate',min=>0 |
763 |
@@ -19,33 +24,88 @@ |
@@ -19,33 +24,112 @@ |
764 |
<span class=label> |
<span class=label> |
765 |
%=l 'RETRIEVE_METHOD' |
%=l 'RETRIEVE_METHOD' |
766 |
</span><span class=data> |
</span><span class=data> |
768 |
- %=select_field retrievemethod=>$methodlabels |
- %=select_field retrievemethod=>$methodlabels |
769 |
- </span><br> |
- </span><br> |
770 |
- <span class=label> |
- <span class=label> |
771 |
|
- %=l 'RETRIEVE_IF' |
772 |
|
- </span><span class=data> |
773 |
|
- % param retrieveinterface=>$ddc_datas->{"params"}->{"Extinterface"}; |
774 |
|
- %=text_field 'retrieveinterface' |
775 |
|
- </span><br> |
776 |
|
- <span class=label> |
777 |
|
- %=l 'RETRIEVE_CMD' |
778 |
|
- </span><span class=data> |
779 |
|
- % param retrievecmd=>$ddc_datas->{"params"}->{"cmd"}; |
780 |
|
- %=text_field 'retrievecmd' |
781 |
|
- </span><br> |
782 |
|
- <span class=label> |
783 |
|
- %=l 'RETRIEVE_IP' |
784 |
|
- </span><span class=data> |
785 |
|
- % param retrieveip=>$ddc_datas->{"params"}->{"ForceIP"}; |
786 |
|
- %=text_field 'retrieveip' |
787 |
|
- </span><br> |
788 |
|
- <span class=label> |
789 |
|
- %=l 'RETRIEVE_URLCHECKIP' |
790 |
|
- </span><span class=data> |
791 |
|
- % param retrieveurlcheckip=>$ddc_datas->{"params"}->{"urlcheckip"}; |
792 |
|
- %=text_field 'retrieveurlcheckip' |
793 |
|
- </span><br> |
794 |
+ % param retrievemethod=>$ddc_datas->{"params"}->{"method"} unless param 'retrievemethod'; |
+ % param retrievemethod=>$ddc_datas->{"params"}->{"method"} unless param 'retrievemethod'; |
795 |
+ %=select_field retrievemethod=>$methodlabels,id=>"retrievemethod",onchange=>"SelectInput()" |
+ %=select_field retrievemethod=>$methodlabels,id=>"retrievemethod",onchange=>"SelectInput()" |
796 |
+ %= javascript begin |
+ %= javascript begin |
813 |
+ %# |
+ %# |
814 |
+ %# From here the one that is shown depends on the choice above |
+ %# From here the one that is shown depends on the choice above |
815 |
+ %# |
+ %# |
|
+ <div class = smeIF></div> |
|
|
+ <div class = smeIF></div> |
|
816 |
+ %# Only if "router" is chosen |
+ %# Only if "router" is chosen |
817 |
+ <div class = router> |
+ <div class = router> |
818 |
+ <span class=label> |
+ <span class=label> |
819 |
+ %=l 'Router type' |
+ %=l 'Router type' |
820 |
+ </span><span class=data> |
+ </span><span class=data> |
821 |
+ % param retrieveinterface=>$ddc_datas->{"params"}->{"Extinterface"} unless param 'retrieveinterface'; |
+ % param retrieverouter=>$ddc_datas->{"params"}->{"Extinterface"} unless param 'retrieverouter'; |
822 |
+ %=select_field retrieveinterface=>$devices |
+ %=select_field retrieverouter=>$devices |
823 |
+ </span><br> |
+ </span><br> |
824 |
|
+ %# Need login and password for router |
825 |
|
+ <span class=label> |
826 |
|
+ %=l 'Router login' |
827 |
|
+ </span><span class=data> |
828 |
|
+ % param retrieverouterlogin=>$ddc_datas->{"params"}->{"FWLogin"} unless param 'retrieverouter'; |
829 |
|
+ %=text_field 'retrieverouterlogin' |
830 |
|
+ </span><br> |
831 |
|
+ <span class=label> |
832 |
|
+ %=l 'Router password' |
833 |
|
+ </span><span class=data> |
834 |
|
+ % param retrieverouterpassword=>$ddc_datas->{"params"}->{"FWPassword"} unless param 'retrieverouterpassword'; |
835 |
|
+ %=password_field 'retrieverouterpassword', id=>'ddcPass' |
836 |
|
+ %=label_for show=>"Show" |
837 |
|
+ %=check_box show=>1,onclick=>"showPass()",style=>"vertical-align:middle;" |
838 |
|
+ %= javascript begin |
839 |
|
+ function showPass() { |
840 |
|
+ var x = document.getElementById("ddcPass"); |
841 |
|
+ if (x.type === "password") { |
842 |
|
+ x.type = "text"; |
843 |
|
+ } else { |
844 |
|
+ x.type = "password"; |
845 |
|
+ } |
846 |
|
+ } |
847 |
|
+ % end |
848 |
|
+ </span><br> |
849 |
+ </div> |
+ </div> |
850 |
+ |
+ |
851 |
+ %# Only if "web" is chosen" |
+ %# Only if "web" is chosen" |
852 |
+ <div class = web> |
+ <div class = web> |
853 |
+ <span class=label> |
+ <span class=label> |
854 |
+ %=l 'Web service' |
+ %=l 'Web service' |
855 |
+ </span><span class=data> |
+ </span><span class=data> |
856 |
+ % param retrieveurlcheckip=>$ddc_datas->{"params"}->{"urlcheckip"} unless param 'retrieveurlcheckip'; |
+ % param retrievewebservice=>$ddc_datas->{"params"}->{"urlcheckip"} unless param 'retrievewebservice'; |
857 |
+ %=select_field retrieveurlcheckip=>$dnslabels |
+ %=select_field retrievewebservice=>$dnslabels |
858 |
|
+ </span><br /> |
859 |
+ </div> |
+ </div> |
860 |
+ |
+ |
861 |
+ %# Only if "Interface" is chosen |
+ %# Only if "Interface" is chosen |
862 |
+ <div class=if> |
+ <div class=if> |
863 |
+ <span class=label Interface> |
+ <span class=label Interface> |
864 |
%=l 'RETRIEVE_IF' |
+ %=l 'RETRIEVE_IF' |
865 |
- </span><span class=data> |
+ </span><span class=data Interface> |
866 |
- % param retrieveinterface=>$ddc_datas->{"params"}->{"Extinterface"}; |
+ % param retrieveinterface=>$ddc_datas->{"params"}->{"Extinterface"} unless param 'retrieveinterface'; |
867 |
+ </span><span class=data Interface> |
+ %=text_field 'retrieveinterface' |
868 |
+ % param retrieveinterface=>$ddc_datas->{"params"}->{"Extinterface"} unless param 'retrieveinterface'; |
+ </span><br> |
|
%=text_field 'retrieveinterface' |
|
|
</span><br> |
|
|
- <span class=label> |
|
869 |
+ </div> |
+ </div> |
870 |
+ |
+ |
871 |
+ %# Only if "cmd" is chosen |
+ %# Only if "cmd" is chosen |
872 |
+ <div class=cmd> |
+ <div class=cmd> |
873 |
+ <span class=label cmd> |
+ <span class=label cmd> |
874 |
%=l 'RETRIEVE_CMD' |
+ %=l 'RETRIEVE_CMD' |
875 |
- </span><span class=data> |
+ </span><span class=data cmd> |
876 |
- % param retrievecmd=>$ddc_datas->{"params"}->{"cmd"}; |
+ % param retrievecmd=>$ddc_datas->{"params"}->{"cmd"} unless param 'retrievecmd'; |
877 |
+ </span><span class=data cmd> |
+ %=text_field 'retrievecmd' |
878 |
+ % param retrievecmd=>$ddc_datas->{"params"}->{"cmd"} unless param 'retrievecmd'; |
+ </span><br> |
|
%=text_field 'retrievecmd' |
|
|
</span><br> |
|
|
- <span class=label> |
|
879 |
+ </div> |
+ </div> |
880 |
+ |
+ |
881 |
+ %# Only if "ip" is chosen |
+ %# Only if "ip" is chosen |
882 |
+ <div class=ip> |
+ <div class=ip> |
883 |
+ <span class=label ip> |
+ <span class=label ip> |
884 |
%=l 'RETRIEVE_IP' |
+ %=l 'RETRIEVE_IP' |
885 |
- </span><span class=data> |
+ </span><span class=data ip> |
886 |
- % param retrieveip=>$ddc_datas->{"params"}->{"ForceIP"}; |
+ % param retrieveip=>$ddc_datas->{"params"}->{"ForceIP"} unless param 'retrieveip'; |
887 |
+ </span><span class=data ip> |
+ %=text_field 'retrieveip' |
888 |
+ % param retrieveip=>$ddc_datas->{"params"}->{"ForceIP"} unless param 'retrieveip'; |
+ </span><br> |
|
%=text_field 'retrieveip' |
|
|
</span><br> |
|
|
- <span class=label> |
|
889 |
+ </div> |
+ </div> |
890 |
+ |
+ |
891 |
+ %# Only if "custom web service" |
+ %# Only if "custom web service" |
892 |
+ <div class=custom> |
+ <div class=custom> |
893 |
+ <span class=label customweb> |
+ <span class=label customweb> |
894 |
%=l 'RETRIEVE_URLCHECKIP' |
+ %=l 'RETRIEVE_URLCHECKIP' |
895 |
- </span><span class=data> |
+ </span><span class=data customweb> |
896 |
- % param retrieveurlcheckip=>$ddc_datas->{"params"}->{"urlcheckip"}; |
+ % param retrieveurlcheckip=>$ddc_datas->{"params"}->{"urlcheckip"} unless param 'retrieveurlcheckip'; |
897 |
+ </span><span class=data customweb> |
+ %=text_field 'retrieveurlcheckip' |
898 |
+ % param retrieveurlcheckip=>$ddc_datas->{"params"}->{"urlcheckip"} unless param 'retrieveurlcheckip'; |
+ </span><br> |
|
%=text_field 'retrieveurlcheckip' |
|
|
</span><br> |
|
899 |
+ </div> |
+ </div> |
900 |
|
|
901 |
%= submit_button "$btn", class => 'action' |
%= submit_button "$btn", class => 'action' |