From 7943a306eb794e826d5ffeb54218f350fbc8e34f Mon Sep 17 00:00:00 2001
From: Jochen Oberreiter <joberreiter@users.noreply.github.com>
Date: Fri, 14 Aug 2015 08:14:30 +0200
Subject: Check if search has returned a result

Fixes #1753
---
 module/plugins/crypter/ShareLinksBiz.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py
index 6fbe59b38..da91cc065 100644
--- a/module/plugins/crypter/ShareLinksBiz.py
+++ b/module/plugins/crypter/ShareLinksBiz.py
@@ -68,8 +68,12 @@ class ShareLinksBiz(Crypter):
         url = pyfile.url
         if 's2l.biz' in url:
             url = self.load(url, just_header=True)['location']
-        self.base_url = "http://www.%s.biz" % re.match(self.__pattern__, url).group(1)
-        self.file_id = re.match(self.__pattern__, url).group('ID')
+        if re.match(self.__pattern__, url):
+            self.base_url = "http://www.%s.biz" % re.match(self.__pattern__, url).group(1)
+            self.file_id = re.match(self.__pattern__, url).group('ID')
+        else:
+            self.log_debug("Could not initialize, URL [%s] does not match pattern [%s]" % (url, self.__pattern__))
+            self.fail("Unsupported download link")
         self.package = pyfile.package()
 
 
-- 
cgit v1.2.3


From f705acb7621a6a4c9f8f11bf6a30d54b26de6918 Mon Sep 17 00:00:00 2001
From: Jochen Oberreiter <joberreiter@users.noreply.github.com>
Date: Fri, 14 Aug 2015 08:25:39 +0200
Subject: Update ShareLinksBiz.py

Bump version
---
 module/plugins/crypter/ShareLinksBiz.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py
index da91cc065..df6068908 100644
--- a/module/plugins/crypter/ShareLinksBiz.py
+++ b/module/plugins/crypter/ShareLinksBiz.py
@@ -10,7 +10,7 @@ from module.plugins.internal.Crypter import Crypter
 class ShareLinksBiz(Crypter):
     __name__    = "ShareLinksBiz"
     __type__    = "crypter"
-    __version__ = "1.16"
+    __version__ = "1.17"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)'
-- 
cgit v1.2.3


From dbf6a1394baff20d25e29ac070a70f1eda2af487 Mon Sep 17 00:00:00 2001
From: Jochen Oberreiter <joberreiter@users.noreply.github.com>
Date: Fri, 14 Aug 2015 08:27:08 +0200
Subject: Update FilecryptCc.py

Test if regexp search has returned an object before using it. Should fix #1753.
---
 module/plugins/crypter/FilecryptCc.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py
index 9f4ad69aa..ac78e9aa8 100644
--- a/module/plugins/crypter/FilecryptCc.py
+++ b/module/plugins/crypter/FilecryptCc.py
@@ -16,7 +16,7 @@ from module.plugins.captcha.ReCaptcha import ReCaptcha
 class FilecryptCc(Crypter):
     __name__    = "FilecryptCc"
     __type__    = "crypter"
-    __version__ = "0.18"
+    __version__ = "0.19"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?filecrypt\.cc/Container/\w+'
@@ -140,8 +140,9 @@ class FilecryptCc(Crypter):
             for link in weblinks:
                 res   = self.load("%s/Link/%s.html" % (self.base_url, link))
                 link2 = re.search('<iframe noresize src="(.*)"></iframe>', res)
-                res2  = self.load(link2.group(1), just_header=True)
-                self.links.append(res2['location'])
+                if link2:
+                    res2  = self.load(link2.group(1), just_header=True)
+                    self.links.append(res2['location'])
 
         except Exception, e:
             self.log_debug("Error decrypting weblinks: %s" % e)
-- 
cgit v1.2.3


From 67864826ef26c831c9fa216b154917d48b045f72 Mon Sep 17 00:00:00 2001
From: Jochen Oberreiter <joberreiter@users.noreply.github.com>
Date: Sun, 16 Aug 2015 21:42:08 +0200
Subject: Update ShareLinksBiz.py

Correct regex search for getting captcha url data
---
 module/plugins/crypter/ShareLinksBiz.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py
index df6068908..712b4fff2 100644
--- a/module/plugins/crypter/ShareLinksBiz.py
+++ b/module/plugins/crypter/ShareLinksBiz.py
@@ -118,7 +118,10 @@ class ShareLinksBiz(Crypter):
         self.log_debug("Captcha map with [%d] positions" % len(captchaMap.keys()))
 
         #: Request user for captcha coords
-        m = re.search(r'<img src="/captcha.gif\?d=(.*?)&amp;PHPSESSID=(.*?)&amp;legend=1"', self.html)
+        m = re.search(r'<img src="/captcha.gif\?d=(.+?)&PHPSESSID=(.+?)&legend=1"', self.html)
+        if not m:
+            self.log_debug("Captcha url data not found, maybe plugin out of date?")
+            self.fail("Captcha url data not found")
         captchaUrl = self.base_url + '/captcha.gif?d=%s&PHPSESSID=%s' % (m.group(1), m.group(2))
         self.log_debug("Waiting user for correct position")
         coords = self.captcha.decrypt(captchaUrl, input_type="gif", output_type='positional')
-- 
cgit v1.2.3