Merge remote-tracking branch 'origin/stable'

Conflicts:
	module/config/default.conf
	module/plugins/accounts/DdlstorageCom.py
	module/plugins/accounts/RealdebridCom.py
	module/plugins/accounts/UploadheroCom.py
	module/plugins/crypter/DownloadVimeoCom.py
	module/plugins/crypter/FilebeerInfoFolder.py
	module/plugins/crypter/Movie2kTo.py
	module/plugins/hooks/AlldebridCom.py
	module/plugins/hooks/DebridItaliaCom.py
	module/plugins/hooks/MultishareCz.py
	module/plugins/hooks/Premium4Me.py
	module/plugins/hooks/PremiumizeMe.py
	module/plugins/hooks/RealdebridCom.py
	module/plugins/hooks/XFileSharingPro.py
	module/plugins/hooks/ZeveraCom.py
	module/plugins/hoster/ChipDe.py
	module/plugins/hoster/DdlstorageCom.py
	module/plugins/hoster/MovReelCom.py
	module/plugins/hoster/RyushareCom.py
	module/plugins/hoster/ShareRapidCom.py
	module/plugins/hoster/SpeedLoadOrg.py
	module/plugins/hoster/ZeveraCom.py
	module/web/media/default/css/default.css
	module/web/media/default/css/window.css
	module/web/templates/default/base.html
	module/web/templates/default/captcha.html
	module/web/templates/default/home.html
	module/web/templates/default/queue.html
	module/web/templates/default/window.html
	pyload/plugins/accounts/AlldebridCom.py
	pyload/plugins/accounts/Http.py
	pyload/plugins/accounts/MultishareCz.py
	pyload/plugins/accounts/Premium4Me.py
	pyload/plugins/accounts/PremiumizeMe.py
	pyload/plugins/accounts/ZeveraCom.py
	pyload/plugins/addons/Captcha9kw.py
	pyload/plugins/addons/CaptchaTrader.py
	pyload/plugins/addons/ClickAndLoad.py
	pyload/plugins/addons/Ev0InFetcher.py
	pyload/plugins/addons/ExternalScripts.py
	pyload/plugins/addons/ExtractArchive.py
	pyload/plugins/addons/HotFolder.py
	pyload/plugins/addons/MergeFiles.py
	pyload/plugins/addons/MultiHome.py
	pyload/plugins/addons/XMPPInterface.py
	pyload/plugins/crypter/C1neonCom.py
	pyload/plugins/crypter/CryptItCom.py
	pyload/plugins/crypter/ILoadTo.py
	pyload/plugins/crypter/LofCc.py
	pyload/plugins/crypter/NCryptIn.py
	pyload/plugins/crypter/OronComFolder.py
	pyload/plugins/crypter/RSLayerCom.py
	pyload/plugins/crypter/SecuredIn.py
	pyload/plugins/crypter/TrailerzoneInfo.py
	pyload/plugins/crypter/WiiReloadedOrg.py
	pyload/plugins/hoster/AlldebridCom.py
	pyload/plugins/hoster/BasePlugin.py
	pyload/plugins/hoster/CzshareCom.py
	pyload/plugins/hoster/DepositfilesCom.py
	pyload/plugins/hoster/EgoFilesCom.py
	pyload/plugins/hoster/FastshareCz.py
	pyload/plugins/hoster/FreakshareCom.py
	pyload/plugins/hoster/MegasharesCom.py
	pyload/plugins/hoster/MultishareCz.py
	pyload/plugins/hoster/MyvideoDe.py
	pyload/plugins/hoster/NetloadIn.py
	pyload/plugins/hoster/NovafileCom.py
	pyload/plugins/hoster/NowDownloadEu.py
	pyload/plugins/hoster/PornhostCom.py
	pyload/plugins/hoster/Premium4Me.py
	pyload/plugins/hoster/PremiumizeMe.py
	pyload/plugins/hoster/PutlockerCom.py
	pyload/plugins/hoster/RapidshareCom.py
	pyload/plugins/hoster/RealdebridCom.py
	pyload/plugins/hoster/ShareplaceCom.py
	pyload/plugins/hoster/TusfilesNet.py
	pyload/plugins/hoster/UnrestrictLi.py
	pyload/plugins/hoster/UploadedTo.py
	pyload/plugins/hoster/WebshareCz.py
	pyload/plugins/hoster/X7To.py
	pyload/plugins/hoster/XHamsterCom.py
	pyload/plugins/hoster/YoupornCom.py
	pyload/plugins/hoster/YourfilesTo.py
	pyload/plugins/hoster/YoutubeCom.py
	pyload/plugins/hoster/ZippyshareCom.py
	pyload/plugins/internal/SimpleCrypter.py
	pyload/plugins/internal/SimpleHoster.py

1 files changed, 9 insertions, 8 deletions

diff --git a/pyload/plugins/hoster/NetloadIn.py b/pyload/plugins/hoster/NetloadIn.py
index 773f2e427..71c8dd4f2 100644
--- a/pyload/plugins/hoster/NetloadIn.py
+++ b/pyload/plugins/hoster/NetloadIn.py
@@ -4,10 +4,9 @@
 import re
 from time import sleep, time
 
-
 from module.plugins.Hoster import Hoster
 from module.network.RequestFactory import getURL
-from module.utils import chunks
+from module.plugins.Plugin import chunks
 
 
 def getInfo(urls):
@@ -54,16 +53,13 @@ class NetloadIn(Hoster):
     __name__ = "NetloadIn"
     __type__ = "hoster"
     __pattern__ = r"https?://.*netload\.in/(?:datei(.*?)(?:\.htm|/)|index.php?id=10&file_id=)"
-    __version__ = "0.44"
+    __version__ = "0.45"
     __description__ = """Netload.in Download Hoster"""
     __author_name__ = ("spoob", "RaNaN", "Gregy")
     __author_mail__ = ("spoob@pyload.org", "ranan@pyload.org", "gregy@gregy.cz")
 
     def setup(self):
-        self.multiDL = False
-        if self.premium:
-            self.multiDL = self.resumeDownload = True
-            self.chunkLimit = -1
+        self.multiDL = self.resumeDownload = self.premium
 
     def process(self, pyfile):
         self.url = pyfile.url
@@ -79,7 +75,12 @@ class NetloadIn(Hoster):
 
         if self.premium:
             self.logDebug("Netload: Use Premium Account")
-            return True
+            settings = self.load("http://www.netload.in/index.php?id=2&lang=en")
+            if '<option value="2" selected="selected">Direkter Download' in settings:
+                self.logDebug("Using direct download")
+                return True
+            else:
+                self.logDebug("Direct downloads not enabled. Parsing html for a download URL")
 
         if self.download_html():
             return True