1 files changed, 31 insertions, 22 deletions
diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py
index b10e34314..2f1c914c1 100644
--- a/module/plugins/accounts/OneFichierCom.py
+++ b/module/plugins/accounts/OneFichierCom.py
@@ -1,46 +1,55 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 from time import strptime, mktime
+
 from pycurl import REFERER
 
 from module.plugins.Account import Account
 
 
 class OneFichierCom(Account):
-    __name__ = "OneFichierCom"
-    __version__ = "0.1"
-    __type__ = "account"
+    __name__    = "OneFichierCom"
+    __type__    = "account"
+    __version__ = "0.11"
+
     __description__ = """1fichier.com account plugin"""
-    __author_name__ = ("Elrick69")
-    __author_mail__ = ("elrick69[AT]rocketmail[DOT]com")
+    __license__     = "GPLv3"
+    __authors__     = [("Elrick69", "elrick69[AT]rocketmail[DOT]com"),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    VALID_UNTIL_PATTERN = r'Your Premium Status will end the (\d+/\d+/\d+)'
 
-    VALID_UNTIL_PATTERN = r'You are a premium user until (?P<d>\d{2})/(?P<m>\d{2})/(?P<y>\d{4})'
 
     def loadAccountInfo(self, user, req):
+        validuntil = None
+        trafficleft = -1
+        premium = None
 
-        html = req.load("http://1fichier.com/console/abo.pl")
+        html = req.load("https://1fichier.com/console/abo.pl")
 
         m = re.search(self.VALID_UNTIL_PATTERN, html)
-
         if m:
-            premium = True
-            validuntil = re.sub(self.VALID_UNTIL_PATTERN, '\g<d>/\g<m>/\g<y>', m.group(0))
-            validuntil = int(mktime(strptime(validuntil, "%d/%m/%Y")))
-        else:
-            premium = False
-            validuntil = -1
+            expiredate = m.group(1)
+            self.logDebug("Expire date: " + expiredate)
 
-        return {"premium": premium, "trafficleft": -1, "validuntil": validuntil}
+            try:
+                validuntil = mktime(strptime(expiredate, "%d/%m/%Y"))
+            except Exception, e:
+                self.logError(e)
+            else:
+                premium = True
 
-    def login(self, user, data, req):
+        return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium or False}
 
-        req.http.c.setopt(REFERER, "http://1fichier.com/login.pl?lg=en")
 
-        html = req.load("http://1fichier.com/login.pl?lg=en", post={
-            "mail": user,
-            "pass": data["password"],
-            "Login": "Login"})
+    def login(self, user, data, req):
+        req.http.c.setopt(REFERER, "https://1fichier.com/login.pl?lg=en")
+
+        html = req.load("https://1fichier.com/login.pl?lg=en",
+                        post={'mail': user, 'pass': data['password'], 'It': "on", 'purge': "off", 'valider': "Send"})
 
-        if r'<div class="error_message">Invalid username or password.</div>' in html:
+        if '>Invalid email address' in html or '>Invalid password' in html:
             self.wrongPassword()