Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/accounts/Keep2ShareCc.py
	module/plugins/captcha/OCR.py
	module/plugins/captcha/captcha.py
	module/plugins/crypter/DailymotionBatch.py
	module/plugins/crypter/DailymotionComFolder.py
	module/plugins/crypter/YoutubeBatch.py
	module/plugins/crypter/YoutubeComFolder.py
	module/plugins/internal/CaptchaService.py
	pyload/plugin/Extractor.py
	pyload/plugin/OCR.py
	pyload/plugin/account/DebridItaliaCom.py
	pyload/plugin/account/MegaRapidCz.py
	pyload/plugin/account/NoPremiumPl.py
	pyload/plugin/account/RapideoPl.py
	pyload/plugin/addon/AndroidPhoneNotify.py
	pyload/plugin/addon/Checksum.py
	pyload/plugin/addon/ClickAndLoad.py
	pyload/plugin/addon/DeleteFinished.py
	pyload/plugin/addon/DownloadScheduler.py
	pyload/plugin/addon/ExternalScripts.py
	pyload/plugin/addon/ExtractArchive.py
	pyload/plugin/addon/HotFolder.py
	pyload/plugin/addon/IRCInterface.py
	pyload/plugin/addon/JustPremium.py
	pyload/plugin/addon/MergeFiles.py
	pyload/plugin/addon/MultiHome.py
	pyload/plugin/addon/RestartFailed.py
	pyload/plugin/addon/RestartSlow.py
	pyload/plugin/addon/SkipRev.py
	pyload/plugin/addon/UnSkipOnFail.py
	pyload/plugin/addon/UpdateManager.py
	pyload/plugin/addon/WindowsPhoneNotify.py
	pyload/plugin/crypter/DDLMusicOrg.py
	pyload/plugin/crypter/DailymotionBatch.py
	pyload/plugin/crypter/DevhostSt.py
	pyload/plugin/crypter/EmbeduploadCom.py
	pyload/plugin/crypter/MultiloadCz.py
	pyload/plugin/crypter/YoutubeBatch.py
	pyload/plugin/extractor/SevenZip.py
	pyload/plugin/extractor/UnRar.py
	pyload/plugin/extractor/UnZip.py
	pyload/plugin/hook/BypassCaptcha.py
	pyload/plugin/hook/Captcha9Kw.py
	pyload/plugin/hook/CaptchaBrotherhood.py
	pyload/plugin/hook/DeathByCaptcha.py
	pyload/plugin/hook/ExpertDecoders.py
	pyload/plugin/hook/ImageTyperz.py
	pyload/plugin/hook/XFileSharingPro.py
	pyload/plugin/hoster/AlldebridCom.py
	pyload/plugin/hoster/CzshareCom.py
	pyload/plugin/hoster/EuroshareEu.py
	pyload/plugin/hoster/FastixRu.py
	pyload/plugin/hoster/FastshareCz.py
	pyload/plugin/hoster/GooIm.py
	pyload/plugin/hoster/MediafireCom.py
	pyload/plugin/hoster/MegaDebridEu.py
	pyload/plugin/hoster/NitroflareCom.py
	pyload/plugin/hoster/OverLoadMe.py
	pyload/plugin/hoster/PremiumTo.py
	pyload/plugin/hoster/PremiumizeMe.py
	pyload/plugin/hoster/RapidgatorNet.py
	pyload/plugin/hoster/RealdebridCom.py
	pyload/plugin/hoster/SimplyPremiumCom.py
	pyload/plugin/hoster/SimplydebridCom.py
	pyload/plugin/hoster/SmoozedCom.py
	pyload/plugin/hoster/SoundcloudCom.py
	pyload/plugin/hoster/UlozTo.py
	pyload/plugin/hoster/UploadableCh.py
	pyload/plugin/hoster/UploadedTo.py
	pyload/plugin/hoster/UploadheroCom.py
	pyload/plugin/hoster/VeehdCom.py
	pyload/plugin/hoster/VimeoCom.py
	pyload/plugin/hoster/ZeveraCom.py
	pyload/plugin/hoster/ZippyshareCom.py
	pyload/plugin/internal/BasePlugin.py
	pyload/plugin/internal/MultiHoster.py
	pyload/plugin/internal/SimpleDereferer.py
	pyload/plugin/internal/SimpleHoster.py
	pyload/plugin/internal/XFSHoster.py
	pyload/plugin/ocr/GigasizeCom.py
	pyload/plugin/ocr/LinksaveIn.py
	pyload/plugin/ocr/NetloadIn.py
	pyload/plugin/ocr/ShareonlineBiz.py

1 files changed, 41 insertions, 22 deletions

diff --git a/pyload/plugin/account/NetloadIn.py b/pyload/plugin/account/NetloadIn.py
index 68982e828..bec4690a8 100644
--- a/pyload/plugin/account/NetloadIn.py
+++ b/pyload/plugin/account/NetloadIn.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
-from time import time
+import time
 
 from pyload.plugin.Account import Account
 
@@ -9,36 +9,55 @@ from pyload.plugin.Account import Account
 class NetloadIn(Account):
     __name__    = "NetloadIn"
     __type__    = "account"
-    __version__ = "0.23"
+    __version__ = "0.24"
 
     __description__ = """Netload.in account plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
-                       ("CryNickSystems", "webmaster@pcProfil.de")]
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    def api_response(self, id, password, req):
+        return req.load("http://api.netload.in/user_info.php",
+                        get={'auth'         : "BVm96BWDSoB4WkfbEhn42HgnjIe1ilMt",
+                             'user_id'      : id,
+                             'user_password': password}).strip()
 
 
     def loadAccountInfo(self, user, req):
-        html = req.load("http://netload.in/index.php", get={'id': 2, 'lang': "de"})
-        left = r'>(\d+) (Tag|Tage), (\d+) Stunden<'
-        left = re.search(left, html)
-        if left:
-            validuntil = time() + int(left.group(1)) * 24 * 60 * 60 + int(left.group(3)) * 60 * 60
-            trafficleft = -1
+        validuntil  = None
+        trafficleft = -1
+        premium     = False
+
+        html = self.api_response(user, self.getAccountData(user)['password'], req)
+
+        if html == "-1":
             premium = True
+
+        elif html == "0":
+            validuntil = -1
+
         else:
-            validuntil = None
-            premium = False
-            trafficleft = None
-        return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}
+            try:
+                validuntil = time.mktime(time.strptime(html, "%Y-%m-%d %H:%M"))
+
+            except Exception, e:
+                self.logError(e)
+
+            else:
+                self.logDebug("Valid until: %s" % validuntil)
+
+                if validuntil > time.mktime(time.gmtime()):
+                    premium = True
+                else:
+                    validuntil = -1
+
+        return {'validuntil' : validuntil,
+                'trafficleft': trafficleft,
+                'premium'    : premium}
 
 
     def login(self, user, data, req):
-        html = req.load("http://netload.in/index.php",
-                        post={"txtuser" : user,
-                              "txtpass" : data['password'],
-                              "txtcheck": "login",
-                              "txtlogin": "Login"},
-                        cookies=True,
-                        decode=True)
-        if "password or it might be invalid!" in html:
+        html = self.api_response(user, data['password'], req)
+
+        if not html or re.search(r'disallowed_agent|unknown_auth|login_failed', html):
             self.wrongPassword()