[EuroshareEu] fix #2551

1 files changed, 12 insertions, 19 deletions

diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py
index 5e6debe8e..4975d3fe1 100644
--- a/module/plugins/accounts/EuroshareEu.py
+++ b/module/plugins/accounts/EuroshareEu.py
@@ -2,16 +2,15 @@
 
 import re
 import time
-import urlparse
 
 from module.plugins.internal.Account import Account
-from module.plugins.internal.misc import parse_html_form
+from module.plugins.internal.misc import json
 
 
 class EuroshareEu(Account):
     __name__    = "EuroshareEu"
     __type__    = "account"
-    __version__ = "0.10"
+    __version__ = "0.11"
     __status__  = "testing"
 
     __description__ = """Euroshare.eu account plugin"""
@@ -24,34 +23,28 @@ class EuroshareEu(Account):
         html = self.load("http://euroshare.eu/",
                          get={'lang': "en"})
 
-        m = re.search(r'<span title="Premium do: (\d+\.\d+\.\d+ \d+:\d+:\d+)"', html)
+        m = re.search(r'<span class="btn btn--nav green darken-3">Premium account until: (\d+/\d+/\d+ \d+:\d+:\d+)<', html)
         if m is None:
             premium    = False
             validuntil = -1
         else:
             premium = True
-            validuntil = time.mktime(time.strptime(m.group(1), "%d.%m.%Y %H:%M:%S"))
+            validuntil = time.mktime(time.strptime(m.group(1), "%d/%m/%Y %H:%M:%S"))
 
         return {'validuntil': validuntil, 'trafficleft': -1, 'premium': premium}
 
 
     def signin(self, user, password, data):
-        login_url = "http://euroshare.eu/user/login/"
-        html = self.load(login_url,
-                         get={'lang' : "en"})
+        html = self.load("http://euroshare.eu/login.html")
 
-        if r'<li class="logout">' in html:
+        if r'href="http://euroshare.eu/logout.html"' in html:
             self.skip_login()
 
-        action, inputs = parse_html_form('id="frm-prihlaseni"', html)
-        if not inputs:
-            self.fail_login(_("Login form not found"))
+        json_data = json.loads(self.load("http://euroshare.eu/ajax/_account_login.ajax.php",
+                                         post={'username': user,
+                                               'password': password,
+                                               'remember': "false",
+                                               'backlink': ""}))
 
-        inputs['username'] = user
-        inputs['password'] = password
-
-        html = self.load(urlparse.urljoin(login_url, action),
-                         post=inputs)
-
-        if r'<li class="logout">' not in html:
+        if json_data.get("login_status") != "success":
             self.fail_login()