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, 7 insertions, 5 deletions

diff --git a/module/plugins/crypter/NetfolderIn.py b/module/plugins/crypter/NetfolderIn.py
index 28ee3a9dd..1c337391c 100644
--- a/module/plugins/crypter/NetfolderIn.py
+++ b/module/plugins/crypter/NetfolderIn.py
@@ -8,22 +8,25 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class NetfolderIn(SimpleCrypter):
     __name__ = "NetfolderIn"
     __type__ = "crypter"
-    __pattern__ = r'http://(?:www\.)?netfolder.in/((?P<id1>\w+)/\w+|folder.php\?folder_id=(?P<id2>\w+))'
     __version__ = "0.6"
+
+    __pattern__ = r'http://(?:www\.)?netfolder.in/((?P<id1>\w+)/\w+|folder.php\?folder_id=(?P<id2>\w+))'
+
     __description__ = """NetFolder.in decrypter plugin"""
     __author_name__ = ("RaNaN", "fragonib")
     __author_mail__ = ("RaNaN@pyload.org", "fragonib[AT]yahoo[DOT]es")
 
     TITLE_PATTERN = r'<div class="Text">Inhalt des Ordners <span(.*)>(?P<title>.+)</span></div>'
 
+
     def decrypt(self, pyfile):
         # Request package
         self.html = self.load(pyfile.url)
 
-        # Check for password protection    
+        # Check for password protection
         if self.isPasswordProtected():
             self.html = self.submitPassword()
-            if self.html is None:
+            if not self.html:
                 self.fail("Incorrect password, please set right password on Add package form and retry")
 
         # Get package name and folder
@@ -36,7 +39,6 @@ class NetfolderIn(SimpleCrypter):
         self.packages = [(package_name, package_links, folder_name)]
 
     def isPasswordProtected(self):
-
         if '<input type="password" name="password"' in self.html:
             self.logDebug("Links are password protected")
             return True
@@ -53,7 +55,7 @@ class NetfolderIn(SimpleCrypter):
         url = "http://netfolder.in/folder.php?folder_id=" + id
         password = self.getPassword()
 
-        # Submit package password     
+        # Submit package password
         post = {'password': password, 'save': 'Absenden'}
         self.logDebug("Submitting password [%s] for protected links with id [%s]" % (password, id))
         html = self.load(url, {}, post)