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

4 files changed, 33 insertions, 24 deletions

diff --git a/pyload/plugin/container/CCF.py b/pyload/plugin/container/CCF.py
index f39318208..65f96033a 100644
--- a/pyload/plugin/container/CCF.py
+++ b/pyload/plugin/container/CCF.py
@@ -26,13 +26,13 @@ class CCF(Container):
 
 
     def decrypt(self, pyfile):
-        file   = fs_encode(pyfile.url.strip())
-        opener = build_opener(MultipartPostHandler)
+        fs_filename = fs_encode(pyfile.url.strip())
+        opener      = build_opener(MultipartPostHandler)
 
         dlc_content = opener.open('http://service.jdownloader.net/dlcrypt/getDLC.php',
                                   {'src'     : "ccf",
                                    'filename': "test.ccf",
-                                   'upload'  : open(file, "rb")}).read()
+                                   'upload'  : open(fs_filename, "rb")}).read()
 
         download_folder = self.config['general']['download_folder']
         dlc_file        = fs_join(download_folder, "tmp_%s.dlc" % pyfile.name)
diff --git a/pyload/plugin/container/DLC.py b/pyload/plugin/container/DLC.py
index 8b8a0199b..04dabb6b2 100644
--- a/pyload/plugin/container/DLC.py
+++ b/pyload/plugin/container/DLC.py
@@ -33,8 +33,8 @@ class DLC(Container):
 
 
     def decrypt(self, pyfile):
-        file = fs_encode(pyfile.url.strip())
-        with open(file) as dlc:
+        fs_filename = fs_encode(pyfile.url.strip())
+        with open(fs_filename) as dlc:
             data = dlc.read().strip()
 
         data += '=' * (-len(data) % 4)
@@ -49,11 +49,11 @@ class DLC(Container):
         except AttributeError:
             self.fail(_("Container is corrupted"))
 
-        cipher = AES.new(self.KEY, AES.MODE_CBC, self.IV).decrypt(rc)
+        key = iv = AES.new(self.KEY, AES.MODE_CBC, self.IV).decrypt(rc)
 
-        self.data     = AES.new(cipher, AES.MODE_CBC, cipher).decrypt(dlc_data).decode('base64')
-        self.packages = [(entry[0] if entry[0] else pyfile.name, entry[1], entry[0] if entry[0] else pyfile.name) \
-                         for entry in self.getPackages()]
+        self.data     = AES.new(key, AES.MODE_CBC, iv).decrypt(dlc_data).decode('base64')
+        self.packages = [(name or pyfile.name, links, name or pyfile.name) \
+                         for name, links in self.getPackages()]
 
 
     def getPackages(self):
diff --git a/pyload/plugin/container/RSDF.py b/pyload/plugin/container/RSDF.py
index c4b743d14..e43eb4c2b 100644
--- a/pyload/plugin/container/RSDF.py
+++ b/pyload/plugin/container/RSDF.py
@@ -14,7 +14,7 @@ from pyload.utils import fs_encode
 class RSDF(Container):
     __name__    = "RSDF"
     __type__    = "container"
-    __version__ = "0.27"
+    __version__ = "0.29"
 
     __pattern__ = r'.+\.rsdf$'
 
@@ -31,22 +31,31 @@ class RSDF(Container):
 
     def decrypt(self, pyfile):
         KEY = binascii.unhexlify(self.KEY)
-        IV  = AES.new(Key, AES.MODE_ECB).encrypt(binascii.unhexlify(self.IV))
+        IV  = binascii.unhexlify(self.IV)
 
-        cipher = AES.new(KEY, AES.MODE_CFB, IV)
+        iv     = AES.new(KEY, AES.MODE_ECB).encrypt(IV)
+        cipher = AES.new(KEY, AES.MODE_CFB, iv)
 
         try:
-            file = fs_encode(pyfile.url.strip())
-            with open(file, 'r') as rsdf:
+            fs_filename = fs_encode(pyfile.url.strip())
+            with open(fs_filename, 'r') as rsdf:
                 data = rsdf.read()
 
         except IOError, e:
             self.fail(e)
 
         if re.search(r"<title>404 - Not Found</title>", data):
-            return
+            pyfile.setStatus("offline")
 
-        for link in binascii.unhexlify(''.join(data.split())).splitlines():
-            if link:
+        else:
+            try:
+                raw_links = binascii.unhexlify(''.join(data.split())).splitlines()
+
+            except TypeError:
+                self.fail(_("Container is corrupted"))
+
+            for link in raw_links:
+                if not link:
+                    continue
                 link = cipher.decrypt(link.decode('base64')).replace('CCF: ', '')
                 self.urls.append(link)
diff --git a/pyload/plugin/container/TXT.py b/pyload/plugin/container/TXT.py
index 9a3df8bf1..75940f55d 100644
--- a/pyload/plugin/container/TXT.py
+++ b/pyload/plugin/container/TXT.py
@@ -23,15 +23,15 @@ class TXT(Container):
 
     def decrypt(self, pyfile):
         try:
-            encoding = codecs.lookup(self.getConfig("encoding")).name
+            encoding = codecs.lookup(self.getConfig('encoding')).name
 
         except Exception:
             encoding = "utf-8"
 
-        file     = fs_encode(pyfile.url.strip())
-        txt      = codecs.open(file, 'r', encoding)
-        curPack  = "Parsed links from %s" % pyfile.name
-        packages = {curPack:[],}
+        fs_filename = fs_encode(pyfile.url.strip())
+        txt         = codecs.open(fs_filename, 'r', encoding)
+        curPack     = "Parsed links from %s" % pyfile.name
+        packages    = {curPack:[],}
 
         for link in txt.readlines():
             link = link.strip()
@@ -57,9 +57,9 @@ class TXT(Container):
             if not value:
                 packages.pop(key, None)
 
-        if self.getConfig("flush"):
+        if self.getConfig('flush'):
             try:
-                txt = open(file, 'wb')
+                txt = open(fs_filename, 'wb')
                 txt.close()
 
             except IOError: