Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/Account.py
	module/plugins/AccountManager.py
	module/plugins/Hook.py
	module/plugins/OCR.py
	module/plugins/Plugin.py
	module/plugins/PluginManager.py
	module/plugins/ReCaptcha.py
	module/plugins/accounts/Ftp.py
	module/plugins/accounts/Http.py
	module/plugins/internal/MultiHoster.py
	module/plugins/ocr/GigasizeCom.py
	module/plugins/ocr/LinksaveIn.py
	module/plugins/ocr/NetloadIn.py
	module/plugins/ocr/ShareonlineBiz.py

1 files changed, 14 insertions, 14 deletions

diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py
index 5e7051bad..7d43ec729 100644
--- a/module/plugins/crypter/MultiloadCz.py
+++ b/module/plugins/crypter/MultiloadCz.py
@@ -7,36 +7,36 @@ from module.plugins.Crypter import Crypter
 class MultiloadCz(Crypter):
     __name__ = "MultiloadCz"
     __type__ = "crypter"
-    __pattern__ = r'http://(?:[^/]*\.)?multiload.cz/(stahnout|slozka)/.*'
     __version__ = "0.4"
-    __description__ = """Multiload.cz decrypter plugin"""
+
+    __pattern__ = r'http://(?:[^/]*\.)?multiload.cz/(stahnout|slozka)/.*'
     __config__ = [("usedHoster", "str", "Prefered hoster list (bar-separated) ", ""),
                   ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")]
+
+    __description__ = """Multiload.cz decrypter plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
     FOLDER_PATTERN = r'<form action="" method="get"><textarea[^>]*>([^>]*)</textarea></form>'
     LINK_PATTERN = r'<p class="manager-server"><strong>([^<]+)</strong></p><p class="manager-linky"><a href="([^"]+)">'
 
+
     def decrypt(self, pyfile):
         self.html = self.load(pyfile.url, decode=True)
-        new_links = []
 
         if re.match(self.__pattern__, pyfile.url).group(1) == "slozka":
-            found = re.search(self.FOLDER_PATTERN, self.html)
-            if found is not None:
-                new_links.extend(found.group(1).split())
+            m = re.search(self.FOLDER_PATTERN, self.html)
+            if m:
+                self.urls.extend(m.group(1).split())
         else:
-            found = re.findall(self.LINK_PATTERN, self.html)
-            if found:
+            m = re.findall(self.LINK_PATTERN, self.html)
+            if m:
                 prefered_set = set(self.getConfig("usedHoster").split('|'))
-                new_links.extend([x[1] for x in found if x[0] in prefered_set])
+                self.urls.extend([x[1] for x in m if x[0] in prefered_set])
 
-                if not new_links:
+                if not self.urls:
                     ignored_set = set(self.getConfig("ignoredHoster").split('|'))
-                    new_links.extend([x[1] for x in found if x[0] not in ignored_set])
+                    self.urls.extend([x[1] for x in m if x[0] not in ignored_set])
 
-        if new_links:
-            self.core.files.addLinks(new_links, pyfile.package().id)
-        else:
+        if not self.urls:
             self.fail('Could not extract any links')