Merge remote-tracking branch 'origin/stable'

Conflicts:
	module/plugins/accounts/Premium4Me.py
	pyload/plugins/addons/Premium4Me.py
	pyload/plugins/crypter/NCryptIn.py
	pyload/plugins/hooks/Captcha9kw.py
	pyload/plugins/hoster/Premium4Me.py
	pyload/plugins/hoster/Xdcc.py
	pyload/plugins/hoster/XvidstageCom.py

3 files changed, 54 insertions, 25 deletions

diff --git a/pyload/plugins/crypter/BitshareComFolder.py b/pyload/plugins/crypter/BitshareComFolder.py
new file mode 100644
index 000000000..b77ddb9d9
--- /dev/null
+++ b/pyload/plugins/crypter/BitshareComFolder.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+############################################################################
+# This program is free software: you can redistribute it and/or modify     #
+# it under the terms of the GNU Affero General Public License as           #
+# published by the Free Software Foundation, either version 3 of the       #
+# License, or (at your option) any later version.                          #
+#                                                                          #
+# This program is distributed in the hope that it will be useful,          #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU Affero General Public License for more details.                      #
+#                                                                          #
+# You should have received a copy of the GNU Affero General Public License #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.    #
+############################################################################
+
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
+
+
+class BitshareComFolder(SimpleCrypter):
+    __name__ = "BitshareComFolder"
+    __type__ = "crypter"
+    __pattern__ = r"http://(?:www\.)?bitshare\.com/\?d=\w+"
+    __version__ = "0.01"
+    __description__ = """Bitshare.com Folder Plugin"""
+    __author_name__ = ("stickell")
+    __author_mail__ = ("l.stickell@yahoo.it")
+
+    LINK_PATTERN = r'<a href="(http://bitshare.com/files/.+)">.+</a></td>'
+    TITLE_PATTERN = r'View public folder "(?P<title>.+)"</h1>'
diff --git a/pyload/plugins/crypter/DdlstorageComFolder.py b/pyload/plugins/crypter/DdlstorageComFolder.py
index d536032c6..d76988c92 100644
--- a/pyload/plugins/crypter/DdlstorageComFolder.py
+++ b/pyload/plugins/crypter/DdlstorageComFolder.py
@@ -1,32 +1,30 @@
 # -*- coding: utf-8 -*-
 
-import re
-from module.plugins.Crypter import Crypter
-from module.plugins.hoster.MediafireCom import checkHTMLHeader
-from module.common.json_layer import json_loads
+############################################################################
+# This program is free software: you can redistribute it and/or modify     #
+# it under the terms of the GNU Affero General Public License as           #
+# published by the Free Software Foundation, either version 3 of the       #
+# License, or (at your option) any later version.                          #
+#                                                                          #
+# This program is distributed in the hope that it will be useful,          #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU Affero General Public License for more details.                      #
+#                                                                          #
+# You should have received a copy of the GNU Affero General Public License #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.    #
+############################################################################
 
-class DdlstorageComFolder(Crypter):
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
+
+
+class DdlstorageComFolder(SimpleCrypter):
     __name__ = "DdlstorageComFolder"
     __type__ = "crypter"
     __pattern__ = r"http://(?:\w*\.)*?ddlstorage.com/folder/\w{10}"
-    __version__ = "0.01"
+    __version__ = "0.02"
     __description__ = """DDLStorage.com Folder Plugin"""
-    __author_name__ = ("godofdream")
-    __author_mail__ = ("soilfiction@gmail.com")
-
-    FILE_URL_PATTERN = '<a style="text-decoration:none;" href="http://www.ddlstorage.com/(.*)">'
+    __author_name__ = ("godofdream", "stickell")
+    __author_mail__ = ("soilfiction@gmail.com", "l.stickell@yahoo.it")
 
-    def decrypt(self, pyfile):
-        new_links = []
-        # load and parse html            
-        html = self.load(pyfile.url)
-        found = re.findall(self.FILE_URL_PATTERN, html)
-        self.logDebug(found)
-        for link in found:
-            # file page
-            new_links.append("http://www.ddlstorage.com/%s" % link)
-    
-        if new_links:
-            self.core.files.addLinks(new_links, self.pyfile.package().id)
-        else:
-            self.fail('Could not extract any links')
+    LINK_PATTERN = '<a class="sub_title" style="text-decoration:none;" href="(http://www.ddlstorage.com/.*)">'
diff --git a/pyload/plugins/crypter/NCryptIn.py b/pyload/plugins/crypter/NCryptIn.py
index bcb563fc6..821636821 100644
--- a/pyload/plugins/crypter/NCryptIn.py
+++ b/pyload/plugins/crypter/NCryptIn.py
@@ -11,7 +11,7 @@ class NCryptIn(Crypter):
     __name__ = "NCryptIn"
     __type__ = "crypter"
     __pattern__ = r"http://(?:www\.)?ncrypt.in/folder-([^/\?]+)"
-    __version__ = "1.21"
+    __version__ = "1.22"
     __description__ = """NCrypt.in Crypter Plugin"""
     __author_name__ = ("fragonib")
     __author_mail__ = ("fragonib[AT]yahoo[DOT]es")