Merge remote-tracking branch 'origin/stable'

Conflicts:
	module/plugins/accounts/FilesonicCom.py
	module/plugins/accounts/OronCom.py
	module/plugins/accounts/ShareonlineBiz.py
	module/plugins/addons/UpdateManager.py
	module/plugins/crypter/FilesonicComFolder.py
	module/plugins/hoster/BezvadataCz.py
	module/plugins/hoster/EuroshareEu.py
	module/plugins/hoster/FilesonicCom.py
	module/plugins/hoster/MegauploadCom.py
	module/plugins/hoster/Premium4Me.py
	module/plugins/hoster/YoutubeCom.py
	module/plugins/internal/MultiHoster.py
	module/utils.py

1 files changed, 11 insertions, 12 deletions

diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py
index 379b10764..e2ee30731 100644
--- a/module/plugins/crypter/LixIn.py
+++ b/module/plugins/crypter/LixIn.py
@@ -9,12 +9,12 @@ class LixIn(Crypter):
     __name__ = "LixIn"
     __type__ = "container"
     __pattern__ = r"http://(www.)?lix.in/(?P<id>.*)"
-    __version__ = "0.21"
+    __version__ = "0.22"
     __description__ = """Lix.in Container Plugin"""
     __author_name__ = ("spoob")
     __author_mail__ = ("spoob@pyload.org")
     
-    CAPTCHA_PATTERN='<img src="(?P<image>captcha_img.php\?PHPSESSID=.*?)"'
+    CAPTCHA_PATTERN='<img src="(?P<image>captcha_img.php\?.*?)"'
     SUBMIT_PATTERN=r"value='continue.*?'"
     LINK_PATTERN=r'name="ifram" src="(?P<link>.*?)"'
     
@@ -33,7 +33,7 @@ class LixIn(Crypter):
         
         matches = re.search(self.SUBMIT_PATTERN,self.html)
         if not matches:
-	    self.fail("link doesn't seem valid")
+            self.fail("link doesn't seem valid")
 
         matches = re.search(self.CAPTCHA_PATTERN, self.html)
         if matches:
@@ -42,20 +42,19 @@ class LixIn(Crypter):
                 if matches:
                     self.logDebug("trying captcha")
                     captcharesult = self.decryptCaptcha("http://lix.in/"+matches.group("image"))
-	            self.html = self.req.load(url, decode=True, post={"capt" : captcharesult, "submit":"submit","tiny":id})
-	        else:
-	            self.logDebug("no captcha/captcha solved")
-	            break
-    	else:
+                self.html = self.req.load(url, decode=True, post={"capt" : captcharesult, "submit":"submit","tiny":id})
+            else:
+                self.logDebug("no captcha/captcha solved")
+                break
+        else:
             self.html = self.req.load(url, decode=True, post={"submit" : "submit",
-	                                                      "tiny"   : id})
-	                                     
+                                                          "tiny"   : id})
+                                         
         matches = re.search(self.LINK_PATTERN, self.html)
         if not matches:
-	    self.fail("can't find destination url")
+            self.fail("can't find destination url")
 
         new_link = matches.group("link")
         self.logDebug("Found link %s, adding to package" % new_link)
 
         self.packages.append((self.pyfile.package().name, [new_link], self.pyfile.package().name))
-           
\ No newline at end of file