Merge branch 'database'

diff --git a/README b/README
index fe6893e8789480c7f1318024bf23703b7c2f8d41..59441021ca1c5b4568d0701e077413aa313629c9 100644 (file)
--- a/README
+++ b/README
@@ -61,6 +61,7 @@ SUPPORTED PROVIDERS:
        enom.com
        entrydns.net
        freedns.afraid.org
+       myonlineportal.net
        namecheap.com
        no-ip.com
        nsupdate.info

diff --git a/ddns.conf.sample b/ddns.conf.sample
index c05a1ce6b4928a80cec5bcb0700eaf4e1f4700d4..d3ac53fa7e91fa043a835f70637ea2b27105dab1 100644 (file)
--- a/ddns.conf.sample
+++ b/ddns.conf.sample
@@ -77,6 +77,11 @@
 # provider = freedns.afraid.org
 # token = token
 
+# [test.myonlineportal.net]
+# provider = myonlineportal.net
+# username = user
+# password = pass
+
 # [test.namecheap.com]
 # provider = namecheap.com
 # password = pass
@@ -88,7 +93,7 @@
 
 # [test.nsupdate.info]
 # provider = nsupdate.info
-# secret = secret
+# token = token
 
 # [test.opendns.com]
 # handle = opendns.com

diff --git a/src/ddns/providers.py b/src/ddns/providers.py
index 28bdf41613cd0fd22649bbfa020fe5da82782510..c6ef5c0d7c0cd0a22e4f43d8ead72615e35d6e25 100644 (file)
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@ -864,6 +864,25 @@ class DDNSProviderLightningWireLabs(DDNSProvider):
                raise DDNSUpdateError
 
 
+class DDNSProviderMyOnlinePortal(DDNSProtocolDynDNS2, DDNSProvider):
+       handle    = "myonlineportal.net"
+       name      = "myonlineportal.net"
+       website   = "https:/myonlineportal.net/"
+
+       # Information about the request and response can be obtained here:
+       # https://myonlineportal.net/howto_dyndns
+
+       url = "https://myonlineportal.net/updateddns"
+
+       def prepare_request_data(self, proto):
+               data = {
+                       "hostname" : self.hostname,
+                       "ip"     : self.get_address(proto),
+               }
+
+               return data
+
+
 class DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider):
        handle    = "namecheap.com"
        name      = "Namecheap"
@@ -954,7 +973,7 @@ class DDNSProviderNsupdateINFO(DDNSProtocolDynDNS2, DDNSProvider):
 
        @property
        def password(self):
-               return self.get("secret")
+               return self.token or self.get("secret")
 
        @property
        def url(self):
@@ -1109,7 +1128,6 @@ class DDNSProviderSPDNS(DDNSProtocolDynDNS2, DDNSProvider):
        handle    = "spdns.org"
        name      = "SPDNS"
        website   = "http://spdns.org/"
-       protocols = ("ipv4",)
 
        # Detailed information about request and response codes are provided
        # by the vendor. They are using almost the same mechanism and status