/[smecontribs]/rpms/smeserver-ddclient/contribs10/smeserver-ddclient-1.3.0-Update-SM2-code-for-new-services-and-protocols.patch
ViewVC logotype

Diff of /rpms/smeserver-ddclient/contribs10/smeserver-ddclient-1.3.0-Update-SM2-code-for-new-services-and-protocols.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.4 by brianr, Wed Dec 13 16:19:50 2023 UTC Revision 1.6 by brianr, Thu Dec 14 11:50:29 2023 UTC
# Line 1  Line 1 
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  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  --- 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  +++ smeserver-ddclient-1.3.0/root/etc/e-smith/templates/etc/ddclient/ddclient.conf/10Headers    2023-12-14 11:40:00.000000000 +0000
4  @@ -57,10 +57,11 @@  @@ -52,15 +52,16 @@
5            } elsif ( $method eq 'ip') {
6                    # we want to force manually
7                    $OUT.="usev4=ipv4, ipv4=$ForceIP \n";
8    -       } elsif ( $method eq 'cmd') {
9    -               $OUT .="usev4=cmd, cmdv4='$cmd'\n";
10    +       } elsif ( $method eq 'cmdv4') {
11    +               $OUT .="usev4=cmdv4, cmdv4='$cmd'\n";
12          } else {          } else {
13                  # fw method                  # fw method
14                  my $fwaddress = $ddclient{'fwaddress'}||'';                  my $fwaddress = $ddclient{'fwaddress'}||'';
# Line 16  diff -urN smeserver-ddclient-1.3.0.old/r Line 23  diff -urN smeserver-ddclient-1.3.0.old/r
23                  $OUT .= ", fwv4-skip='$fwskip' " if ( $fwskip ne '' );                  $OUT .= ", fwv4-skip='$fwskip' " if ( $fwskip ne '' );
24  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
25  --- 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
26  +++ smeserver-ddclient-1.3.0/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm 2023-12-13 16:00:00.000000000 +0000  +++ smeserver-ddclient-1.3.0/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm 2023-12-14 11:33:00.000000000 +0000
27  @@ -114,90 +114,164 @@  @@ -114,90 +114,164 @@
28    
29   my %ddc_datas = ();   my %ddc_datas = ();
# Line 93  diff -urN smeserver-ddclient-1.3.0.old/r Line 100  diff -urN smeserver-ddclient-1.3.0.old/r
100  +       # Web Services from which it can get ip address  +       # Web Services from which it can get ip address
101  +       #  +       #
102  +       my $webservices = ( [  +       my $webservices = ( [
103  +               [ 'dyndnshttp://checkip.dyndns.org/' => 'dyndns' ],  +               [ 'dyndns-http://checkip.dyndns.org/' => 'dyndns' ],
104  +               [ 'freednshttps://freedns.afraid.org/dynamic/check.php' => 'freedns' ],  +               [ 'freedns-https://freedns.afraid.org/dynamic/check.php' => 'freedns' ],
105  +               [ 'googledomainshttps://domains.google.com/checkip' => 'googledomains' ],  +               [ 'googledomains-https://domains.google.com/checkip' => 'googledomains' ],
106  +               [ 'hehttps://checkip.dns.he.net/' => 'he' ],  +               [ 'he-https://checkip.dns.he.net/' => 'he' ],
107  +               [ 'ip4only.mehttps://ip4only.me/api/' => 'ip4only.me' ],  +               [ 'ip4only.me-https://ip4only.me/api/' => 'ip4only.me' ],
108  +               [ 'ip6only.mehttps://ip6only.me/api/' => 'ip6only.me' ],  +               [ 'ip6only.me-https://ip6only.me/api/' => 'ip6only.me' ],
109  +               [ 'ipify-ipv4https://api.ipify.org/' => 'ipify-ipv4' ],  +               [ 'ipify-ipv4-https://api.ipify.org/' => 'ipify-ipv4' ],
110  +               [ 'ipify-ipv6https://api6.ipify.org/' => 'ipify-ipv6' ],  +               [ 'ipify-ipv6-https://api6.ipify.org/' => 'ipify-ipv6' ],
111  +               [ 'loopiahttps://dns.loopia.se/checkip/checkip.php' => 'loopia' ],  +               [ 'loopia:-https://dns.loopia.se/checkip/checkip.php' => 'loopia' ],
112  +               [ 'myonlineportalhttps://myonlineportal.net/checkip' => 'myonlineportal' ],  +               [ 'myonlineportal-https://myonlineportal.net/checkip' => 'myonlineportal' ],
113  +               [ 'noip-ipv4http://ip1.dynupdate.no-ip.com/' => 'noip-ipv4' ],  +               [ 'noip-ipv4-http://ip1.dynupdate.no-ip.com/' => 'noip-ipv4' ],
114  +               [ 'noip-ipv6http://ip1.dynupdate6.no-ip.com/' => 'noip-ipv6' ],  +               [ 'noip-ipv6-http://ip1.dynupdate6.no-ip.com/' => 'noip-ipv6' ],
115  +               [ 'nsupdate.info-ipv4https://ipv4.nsupdate.info/myip' => 'nsupdate.info-ipv4' ],  +               [ 'nsupdate.info-ipv4-https://ipv4.nsupdate.info/myip' => 'nsupdate.info-ipv4' ],
116  +               [ 'nsupdate.info-ipv6https://ipv6.nsupdate.info/myip' => 'nsupdate.info-ipv6' ],  +               [ 'nsupdate.info-ipv6-https://ipv6.nsupdate.info/myip' => 'nsupdate.info-ipv6' ],
117  +               [ 'zoneedithttps://dynamic.zoneedit.com/checkip.html' => 'zoneedit' ]  +               [ 'zoneedit-https://dynamic.zoneedit.com/checkip.html' => 'zoneedit' ]
118  +       ] );  +       ] );
119  +       return $webservices  +       return $webservices
120  +  +
# Line 278  diff -urN smeserver-ddclient-1.3.0.old/r Line 285  diff -urN smeserver-ddclient-1.3.0.old/r
285  +                       [ $c->l('Router/Firewall') => 'router' ],  +                       [ $c->l('Router/Firewall') => 'router' ],
286  +                       [ $c->l('Interface') => 'if' ],  +                       [ $c->l('Interface') => 'if' ],
287  +                       [ $c->l('IP') => 'ip' ],  +                       [ $c->l('IP') => 'ip' ],
288  +                       [ $c->l('Command') => 'cmd' ]  +                       [ $c->l('Command') => 'cmdv4' ]
289  +               ]  +               ]
290       );       );
291    
# Line 744  diff -urN smeserver-ddclient-1.3.0.old/r Line 751  diff -urN smeserver-ddclient-1.3.0.old/r
751                  </span><span class=data>                  </span><span class=data>
752  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
753  --- 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
754  +++ 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 11:36:00.000000000 +0000
755  @@ -1,4 +1,9 @@  @@ -1,4 +1,9 @@
756   <div id='paramlist'>   <div id='paramlist'>
757  +  <script>  +  <script>
# Line 805  diff -urN smeserver-ddclient-1.3.0.old/r Line 812  diff -urN smeserver-ddclient-1.3.0.old/r
812  +                       %= javascript begin  +                       %= javascript begin
813  +                       function SelectInput() {  +                       function SelectInput() {
814  +                         var method = document.querySelector("#retrievemethod");  +                         var method = document.querySelector("#retrievemethod");
815  +                         const types=['smeIF','smeCMD','web','router','if','ip','cmd','custom'];  +                         const types=['smeIF','smeCMD','web','router','if','ip','cmdv4','custom'];
816  +                         types.forEach((type)=>{  +                         types.forEach((type)=>{
817  +                                 var service = document.querySelector(`.${type}`);  +                                 var service = document.querySelector(`.${type}`);
818  +                                 if (service != null) {  +                                 if (service != null) {
# Line 863  diff -urN smeserver-ddclient-1.3.0.old/r Line 870  diff -urN smeserver-ddclient-1.3.0.old/r
870  +                               %=l 'Web service'  +                               %=l 'Web service'
871  +                       </span><span class=data>  +                       </span><span class=data>
872  +                               % param retrievewebservice=>$ddc_datas->{"params"}->{"urlcheckip"} unless param 'retrievewebservice';  +                               % param retrievewebservice=>$ddc_datas->{"params"}->{"urlcheckip"} unless param 'retrievewebservice';
873  +                               %=select_field  retrievewebservice=>$dnslabels  +                               %=select_field  retrievewebservice=>$webservices
874  +                       </span><br />  +                       </span><br />
875  +               </div>  +               </div>
876  +  +
# Line 878  diff -urN smeserver-ddclient-1.3.0.old/r Line 885  diff -urN smeserver-ddclient-1.3.0.old/r
885  +               </div>  +               </div>
886  +                +              
887  +               %# Only if "cmd" is chosen  +               %# Only if "cmd" is chosen
888  +               <div class=cmd>  +               <div class=cmdv4>
889  +                       <span class=label cmd>  +                       <span class=label cmd>
890  +                               %=l 'RETRIEVE_CMD'  +                               %=l 'RETRIEVE_CMD'
891  +                       </span><span class=data cmd>  +                       </span><span class=data cmd>
892  +                               % param retrievecmd=>$ddc_datas->{"params"}->{"cmd"} unless param 'retrievecmd';  +                               % param retrievecmd=>$ddc_datas->{"params"}->{"cmdv4"} unless param 'retrievecmd';
893  +                               %=text_field  'retrievecmd'  +                               %=text_field  'retrievecmd'
894  +                       </span><br>  +                       </span><br>
895  +               </div>  +               </div>

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed