gui: status translation, core: added scheduler -> better account fetching UploadedTo + ShareonlineBiz account fix

2 files changed, 4 insertions, 5 deletions

diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py
index 15802c8e2..2eb78bf43 100644
--- a/module/plugins/accounts/ShareonlineBiz.py
+++ b/module/plugins/accounts/ShareonlineBiz.py
@@ -32,9 +32,8 @@ class ShareonlineBiz(Account):
     def getAccountInfo(self, user):
         try:
             req = self.core.requestFactory.getRequest(self.__name__, user)
-            src = req.load("https://www.share-online.biz/alpha/user/profile")
-            
-            validuntil = re.search(r"Account gültig bis:.*?<span class='.*?'>(.*?)</span>", src).group(1)
+            src = req.load("http://www.share-online.biz/alpha/lang/set/english")
+            validuntil = re.search(r"Account valid till:.*?<span class='.*?'>(.*?)</span>", src, re.S).group(1)
             validuntil = int(mktime(strptime(validuntil, "%m/%d/%Y, %I:%M:%S %p")))
             
             out = Account.getAccountInfo(self, user)
diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py
index e2a977d03..99141f20a 100644
--- a/module/plugins/accounts/UploadedTo.py
+++ b/module/plugins/accounts/UploadedTo.py
@@ -38,7 +38,7 @@ class UploadedTo(Account):
             if not data:
                 raise Exception
             req = self.core.requestFactory.getRequest(self.__name__, user)
-            html = req.load("http://ul.to/", cookies=True)
+            html = req.load("http://uploaded.to/?setlang=en", cookies=True)
             raw_traffic = re.search(r"Traffic left: </span><span class=.*?>(.*?)</span>", html).group(1)
             raw_valid = re.search(r"Valid until: </span> <span class=.*?>(.*?)</span>", html).group(1)
             traffic = int(self.parseTraffic(raw_traffic))
@@ -52,4 +52,4 @@ class UploadedTo(Account):
         
     def login(self, user, data):
         req = self.core.requestFactory.getRequest(self.__name__, user)
-        req.load("http://ul.to/login", post={ "email" : user, "password" : data["password"]}, cookies=True)
+        req.load("http://uploaded.to/login", post={ "email" : user, "password" : data["password"]}, cookies=True)