Fix __pattern__ www

Merges vuolter/pyload@d3be840 (cherry picked from commit f2deb6e7001e97d14bc4e9ee28c49eea806e62c6) Conflicts: pyload/plugins/crypter/HoerbuchIn.py pyload/plugins/hoster/DebridItaliaCom.py pyload/plugins/hoster/MultiDebridCom.py
author: Walter Purcaro <vuolter@gmail.com> 2014-04-11 12:25:21 +0200
committer: Stefano <l.stickell@yahoo.it> 2014-04-21 17:22:13 +0200
commit: e6195a2609d0880b518eee8d94b5f34582341ffa (patch)
tree: faae78437c27291c00397ea343639f6a3a9a5a3e
parent: Fix header # -*- coding: utf-8 -*- (diff)
download: pyload-e6195a2609d0880b518eee8d94b5f34582341ffa.tar.xz
128 files changed, 129 insertions, 129 deletions
diff --git a/module/plugins/hoster/FileStoreTo.py b/module/plugins/hoster/FileStoreTo.py
index ad498b213..467d8eae5 100644
--- a/module/plugins/hoster/FileStoreTo.py
+++ b/module/plugins/hoster/FileStoreTo.py
@@ -25,7 +25,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class FileStoreTo(SimpleHoster):
     __name__ = "FileStoreTo"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?filestore\.to/\?d=(?P<ID>\w+)"
+    __pattern__ = r"http://(?:www\.)?filestore\.to/\?d=(?P<ID>\w+)"
     __version__ = "0.01"
     __description__ = """FileStore.to hoster plugin"""
     __author_name__ = ("Walter Purcaro", "stickell")
diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py
index 2cb0d36c2..dbdf8b34f 100644
--- a/module/plugins/hoster/FreeWayMe.py
+++ b/module/plugins/hoster/FreeWayMe.py
@@ -23,7 +23,7 @@ class FreeWayMe(Hoster):
     __name__ = "FreeWayMe"
     __version__ = "0.11"
     __type__ = "hoster"
-    __pattern__ = r"https://free-way.me/.*"
+    __pattern__ = r"https://(?:www\.)?free-way.me/.*"
     __description__ = """FreeWayMe hoster plugin"""
     __author_name__ = "Nicolas Giese"
     __author_mail__ = "james@free-way.me"
diff --git a/pyload/plugins/crypter/C1neonCom.py b/pyload/plugins/crypter/C1neonCom.py
index fd4d64d44..02e56ba00 100644
--- a/pyload/plugins/crypter/C1neonCom.py
+++ b/pyload/plugins/crypter/C1neonCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter
 class C1neonCom(DeadCrypter):
     __name__ = "C1neonCom"
     __type__ = "crypter"
-    __pattern__ = r"http://(www\.)?c1neon.com/.*?"
+    __pattern__ = r"http://(?:www\.)?c1neon.com/.*?"
     __version__ = "0.05"
     __description__ = """C1neon.com decrypter plugin"""
     __author_name__ = "godofdream"
diff --git a/pyload/plugins/crypter/CrockoComFolder.py b/pyload/plugins/crypter/CrockoComFolder.py
index f6778bb6f..8148aa3ea 100644
--- a/pyload/plugins/crypter/CrockoComFolder.py
+++ b/pyload/plugins/crypter/CrockoComFolder.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class CrockoComFolder(SimpleCrypter):
     __name__ = "CrockoComFolder"
     __type__ = "crypter"
-    __pattern__ = r"http://(www\.)?crocko.com/f/.*"
+    __pattern__ = r"http://(?:www\.)?crocko.com/f/.*"
     __version__ = "0.01"
     __description__ = """Crocko.com folder decrypter plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/crypter/CryptItCom.py b/pyload/plugins/crypter/CryptItCom.py
index f00b3c5e6..8f2fa7411 100644
--- a/pyload/plugins/crypter/CryptItCom.py
+++ b/pyload/plugins/crypter/CryptItCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter
 class CryptItCom(DeadCrypter):
     __name__ = "CryptItCom"
     __type__ = "crypter"
-    __pattern__ = r"http://[\w\.]*?crypt-it\.com/(s|e|d|c)/[\w]+"
+    __pattern__ = r"http://(?:www\.)?crypt-it\.com/(s|e|d|c)/[\w]+"
     __version__ = "0.11"
     __description__ = """Crypt-it.com decrypter plugin"""
     __author_name__ = "jeix"
diff --git a/pyload/plugins/crypter/CzshareComFolder.py b/pyload/plugins/crypter/CzshareComFolder.py
index 7cddcae6d..500af0bb3 100644
--- a/pyload/plugins/crypter/CzshareComFolder.py
+++ b/pyload/plugins/crypter/CzshareComFolder.py
@@ -7,7 +7,7 @@ from module.plugins.Crypter import Crypter
 class CzshareComFolder(Crypter):
     __name__ = "CzshareComFolder"
     __type__ = "crypter"
-    __pattern__ = r"http://(\w*\.)*czshare\.(com|cz)/folders/.*"
+    __pattern__ = r"http://(?:www\.)?czshare\.(com|cz)/folders/.*"
     __version__ = "0.1"
     __description__ = """Czshare.com folder decrypter plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/crypter/DDLMusicOrg.py b/pyload/plugins/crypter/DDLMusicOrg.py
index 69f6f664c..16ab63594 100644
--- a/pyload/plugins/crypter/DDLMusicOrg.py
+++ b/pyload/plugins/crypter/DDLMusicOrg.py
@@ -9,7 +9,7 @@ from module.plugins.Crypter import Crypter
 class DDLMusicOrg(Crypter):
     __name__ = "DDLMusicOrg"
     __type__ = "crypter"
-    __pattern__ = r"http://[\w\.]*?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+"
+    __pattern__ = r"http://(?:www\.)?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+"
     __version__ = "0.3"
     __description__ = """Ddl-music.org decrypter plugin"""
     __author_name__ = "mkaay"
diff --git a/pyload/plugins/crypter/DataHuFolder.py b/pyload/plugins/crypter/DataHuFolder.py
index 65e41dd9b..eb604d255 100644
--- a/pyload/plugins/crypter/DataHuFolder.py
+++ b/pyload/plugins/crypter/DataHuFolder.py
@@ -22,7 +22,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class DataHuFolder(SimpleCrypter):
     __name__ = "DataHuFolder"
     __type__ = "crypter"
-    __pattern__ = r"http://(www\.)?data.hu/dir/\w+"
+    __pattern__ = r"http://(?:www\.)?data.hu/dir/\w+"
     __version__ = "0.03"
     __description__ = """Data.hu folder decrypter plugin"""
     __author_name__ = ("crash", "stickell")
diff --git a/pyload/plugins/crypter/DdlstorageComFolder.py b/pyload/plugins/crypter/DdlstorageComFolder.py
index 6095d0001..a66d8053b 100644
--- a/pyload/plugins/crypter/DdlstorageComFolder.py
+++ b/pyload/plugins/crypter/DdlstorageComFolder.py
@@ -20,7 +20,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class DdlstorageComFolder(SimpleCrypter):
     __name__ = "DdlstorageComFolder"
     __type__ = "crypter"
-    __pattern__ = r"http://(?:\w*\.)*?ddlstorage.com/folder/\w{10}"
+    __pattern__ = r"http://(?:www\.)?ddlstorage.com/folder/\w{10}"
     __version__ = "0.02"
     __description__ = """DDLStorage.com folder decrypter plugin"""
     __author_name__ = ("godofdream", "stickell")
diff --git a/pyload/plugins/crypter/DepositfilesComFolder.py b/pyload/plugins/crypter/DepositfilesComFolder.py
index f75d942ca..b81141a59 100644
--- a/pyload/plugins/crypter/DepositfilesComFolder.py
+++ b/pyload/plugins/crypter/DepositfilesComFolder.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class DepositfilesComFolder(SimpleCrypter):
     __name__ = "DepositfilesComFolder"
     __type__ = "crypter"
-    __pattern__ = r"http://(www\.)?depositfiles.com/folders/\w+"
+    __pattern__ = r"http://(?:www\.)?depositfiles.com/folders/\w+"
     __version__ = "0.01"
     __description__ = """Depositfiles.com folder decrypter plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/crypter/DontKnowMe.py b/pyload/plugins/crypter/DontKnowMe.py
index 67ede18eb..1a7cf57bb 100644
--- a/pyload/plugins/crypter/DontKnowMe.py
+++ b/pyload/plugins/crypter/DontKnowMe.py
@@ -9,7 +9,7 @@ from module.plugins.Crypter import Crypter
 class DontKnowMe(Crypter):
     __name__ = "DontKnowMe"
     __type__ = "crypter"
-    __pattern__ = r"http://dontknow.me/at/\?.+$"
+    __pattern__ = r"http://(?:www\.)?dontknow.me/at/\?.+$"
     __version__ = "0.1"
     __description__ = """DontKnow.me decrypter plugin"""
     __author_name__ = "selaux"
diff --git a/pyload/plugins/crypter/DuploadOrgFolder.py b/pyload/plugins/crypter/DuploadOrgFolder.py
index 0e20d9c19..8eb746001 100644
--- a/pyload/plugins/crypter/DuploadOrgFolder.py
+++ b/pyload/plugins/crypter/DuploadOrgFolder.py
@@ -20,7 +20,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class DuploadOrgFolder(SimpleCrypter):
     __name__ = "DuploadOrgFolder"
     __type__ = "crypter"
-    __pattern__ = r"http://(www\.)?dupload\.org/folder/\d+/"
+    __pattern__ = r"http://(?:www\.)?dupload\.org/folder/\d+/"
     __version__ = "0.01"
     __description__ = """Dupload.org folder decrypter plugin"""
     __author_name__ = "stickell"
diff --git a/pyload/plugins/crypter/EmbeduploadCom.py b/pyload/plugins/crypter/EmbeduploadCom.py
index 1c6f2cec3..dd0fcb533 100644
--- a/pyload/plugins/crypter/EmbeduploadCom.py
+++ b/pyload/plugins/crypter/EmbeduploadCom.py
@@ -8,7 +8,7 @@ from module.network.HTTPRequest import BadHeader
 class EmbeduploadCom(Crypter):
     __name__ = "EmbeduploadCom"
     __type__ = "crypter"
-    __pattern__ = r"http://(www\.)?embedupload.com/\?d=.*"
+    __pattern__ = r"http://(?:www\.)?embedupload.com/\?d=.*"
     __version__ = "0.02"
     __description__ = """EmbedUpload.com decrypter plugin"""
     __config__ = [("preferedHoster", "str", "Prefered hoster list (bar-separated) ", "embedupload"),
diff --git a/pyload/plugins/crypter/FilefactoryComFolder.py b/pyload/plugins/crypter/FilefactoryComFolder.py
index ed4ffebb6..dce14cf04 100644
--- a/pyload/plugins/crypter/FilefactoryComFolder.py
+++ b/pyload/plugins/crypter/FilefactoryComFolder.py
@@ -7,7 +7,7 @@ from module.plugins.Crypter import Crypter
 class FilefactoryComFolder(Crypter):
     __name__ = "FilefactoryComFolder"
     __type__ = "crypter"
-    __pattern__ = r"(http://(www\.)?filefactory\.com/f/\w+).*"
+    __pattern__ = r"(http://(?:www\.)?filefactory\.com/f/\w+).*"
     __version__ = "0.1"
     __description__ = """Filefactory.com folder decrypter plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/crypter/FilestubeCom.py b/pyload/plugins/crypter/FilestubeCom.py
index bd4377824..c6943327e 100644
--- a/pyload/plugins/crypter/FilestubeCom.py
+++ b/pyload/plugins/crypter/FilestubeCom.py
@@ -20,7 +20,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class FilestubeCom(SimpleCrypter):
     __name__ = "FilestubeCom"
     __type__ = "crypter"
-    __pattern__ = r"http://(?:w{3}.)?filestube\.(?:com|to)/\w+"
+    __pattern__ = r"http://(?:www\.)?filestube\.(?:com|to)/\w+"
     __version__ = "0.03"
     __description__ = """Filestube.com decrypter plugin"""
     __author_name__ = "stickell"
diff --git a/pyload/plugins/crypter/FourChanOrg.py b/pyload/plugins/crypter/FourChanOrg.py
index 9386e4a7c..9d4c9fd76 100644
--- a/pyload/plugins/crypter/FourChanOrg.py
+++ b/pyload/plugins/crypter/FourChanOrg.py
@@ -11,7 +11,7 @@ class FourChanOrg(Crypter):
     __name__ = "FourChanOrg"
     __type__ = "crypter"
     __version__ = "0.3"
-    __pattern__ = r"http://boards\.4chan.org/\w+/res/(\d+)"
+    __pattern__ = r"http://(?:www\.)?boards\.4chan.org/\w+/res/(\d+)"
     __description__ = """4chan.org folder decrypter plugin"""
 
     def decrypt(self, pyfile):
diff --git a/pyload/plugins/crypter/FreetexthostCom.py b/pyload/plugins/crypter/FreetexthostCom.py
index e32d57e99..50fdaec43 100644
--- a/pyload/plugins/crypter/FreetexthostCom.py
+++ b/pyload/plugins/crypter/FreetexthostCom.py
@@ -22,7 +22,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class FreetexthostCom(SimpleCrypter):
     __name__ = "FreetexthostCom"
     __type__ = "crypter"
-    __pattern__ = r"http://(?:w{3}.)?freetexthost\.com/\w+"
+    __pattern__ = r"http://(?:www\.)?freetexthost\.com/\w+"
     __version__ = "0.01"
     __description__ = """Freetexthost.com decrypter plugin"""
     __author_name__ = "stickell"
diff --git a/pyload/plugins/crypter/FshareVnFolder.py b/pyload/plugins/crypter/FshareVnFolder.py
index 5b4c0bfac..347236e68 100644
--- a/pyload/plugins/crypter/FshareVnFolder.py
+++ b/pyload/plugins/crypter/FshareVnFolder.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class FshareVnFolder(SimpleCrypter):
     __name__ = "FshareVnFolder"
     __type__ = "crypter"
-    __pattern__ = r"http://(www\.)?fshare.vn/folder/.*"
+    __pattern__ = r"http://(?:www\.)?fshare.vn/folder/.*"
     __version__ = "0.01"
     __description__ = """Fshare.vn folder decrypter plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/crypter/GooGl.py b/pyload/plugins/crypter/GooGl.py
index ce5471e5b..b05009c58 100644
--- a/pyload/plugins/crypter/GooGl.py
+++ b/pyload/plugins/crypter/GooGl.py
@@ -21,7 +21,7 @@ from module.common.json_layer import json_loads
 class GooGl(Crypter):
     __name__ = "GooGl"
     __type__ = "crypter"
-    __pattern__ = r"https?://(www\.)?goo\.gl/\w+"
+    __pattern__ = r"https?://(?:www\.)?goo\.gl/\w+"
     __version__ = "0.01"
     __description__ = """Goo.gl decrypter plugin"""
     __author_name__ = "stickell"
diff --git a/pyload/plugins/crypter/ILoadTo.py b/pyload/plugins/crypter/ILoadTo.py
index 09c08604f..967b1a2db 100644
--- a/pyload/plugins/crypter/ILoadTo.py
+++ b/pyload/plugins/crypter/ILoadTo.py
@@ -6,7 +6,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter
 class ILoadTo(DeadCrypter):
     __name__ = "ILoadTo"
     __type__ = "crypter"
-    __pattern__ = r"http://iload\.to/go/\d+-[\w\.-]+/"
+    __pattern__ = r"http://(?:www\.)?iload\.to/go/\d+-[\w\.-]+/"
     __version__ = "0.11"
     __description__ = """Iload.to decrypter plugin"""
     __author_name__ = "hzpz"
diff --git a/pyload/plugins/crypter/LinkSaveIn.py b/pyload/plugins/crypter/LinkSaveIn.py
index 4646b3549..25290af2d 100644
--- a/pyload/plugins/crypter/LinkSaveIn.py
+++ b/pyload/plugins/crypter/LinkSaveIn.py
@@ -18,7 +18,7 @@ from module.unescape import unescape
 class LinkSaveIn(Crypter):
     __name__ = "LinkSaveIn"
     __type__ = "crypter"
-    __pattern__ = r"http://(www\.)?linksave.in/(?P<id>\w+)$"
+    __pattern__ = r"http://(?:www\.)?linksave.in/(?P<id>\w+)$"
     __version__ = "2.01"
     __description__ = """LinkSave.in decrypter plugin"""
     __author_name__ = "fragonib"
diff --git a/pyload/plugins/crypter/LofCc.py b/pyload/plugins/crypter/LofCc.py
index 1f0113d55..b85c6f91d 100644
--- a/pyload/plugins/crypter/LofCc.py
+++ b/pyload/plugins/crypter/LofCc.py
@@ -6,7 +6,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter
 class LofCc(DeadCrypter):
     __name__ = "LofCc"
     __type__ = "crypter"
-    __pattern__ = r"http://lof.cc/(.*)"
+    __pattern__ = r"http://(?:www\.)?lof.cc/(.*)"
     __version__ = "0.21"
     __description__ = """Lof.cc decrypter plugin"""
     __author_name__ = "mkaay"
diff --git a/pyload/plugins/crypter/MediafireComFolder.py b/pyload/plugins/crypter/MediafireComFolder.py
index 6bc6e16f5..917d93964 100644
--- a/pyload/plugins/crypter/MediafireComFolder.py
+++ b/pyload/plugins/crypter/MediafireComFolder.py
@@ -9,7 +9,7 @@ from module.common.json_layer import json_loads
 class MediafireComFolder(Crypter):
     __name__ = "MediafireComFolder"
     __type__ = "crypter"
-    __pattern__ = r"http://(\w*\.)*mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))"
+    __pattern__ = r"http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))"
     __version__ = "0.14"
     __description__ = """Mediafire.com folder decrypter plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/crypter/MultiloadCz.py b/pyload/plugins/crypter/MultiloadCz.py
index 4800bf309..6cc9a1171 100644
--- a/pyload/plugins/crypter/MultiloadCz.py
+++ b/pyload/plugins/crypter/MultiloadCz.py
@@ -7,7 +7,7 @@ from module.plugins.Crypter import Crypter
 class MultiloadCz(Crypter):
     __name__ = "MultiloadCz"
     __type__ = "crypter"
-    __pattern__ = r"http://.*multiload.cz/(stahnout|slozka)/.*"
+    __pattern__ = r"http://(?:[^/]*\.)?multiload.cz/(stahnout|slozka)/.*"
     __version__ = "0.4"
     __description__ = """Multiload.cz decrypter plugin"""
     __config__ = [("usedHoster", "str", "Prefered hoster list (bar-separated) ", ""),
diff --git a/pyload/plugins/crypter/OneKhDe.py b/pyload/plugins/crypter/OneKhDe.py
index d4b10c141..f0988d9fe 100644
--- a/pyload/plugins/crypter/OneKhDe.py
+++ b/pyload/plugins/crypter/OneKhDe.py
@@ -9,7 +9,7 @@ from module.plugins.Crypter import Crypter
 class OneKhDe(Crypter):
     __name__ = "OneKhDe"
     __type__ = "crypter"
-    __pattern__ = r"http://(www\.)?1kh.de/f/"
+    __pattern__ = r"http://(?:www\.)?1kh.de/f/"
     __version__ = "0.1"
     __description__ = """1kh.de decrypter plugin"""
     __author_name__ = "spoob"
diff --git a/pyload/plugins/crypter/PastebinCom.py b/pyload/plugins/crypter/PastebinCom.py
index a166c60f2..03898ef0f 100644
--- a/pyload/plugins/crypter/PastebinCom.py
+++ b/pyload/plugins/crypter/PastebinCom.py
@@ -20,7 +20,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class PastebinCom(SimpleCrypter):
     __name__ = "PastebinCom"
     __type__ = "crypter"
-    __pattern__ = r"http://(?:w{3}.)?pastebin\.com/\w+"
+    __pattern__ = r"http://(?:www\.)?pastebin\.com/\w+"
     __version__ = "0.01"
     __description__ = """Pastebin.com decrypter plugin"""
     __author_name__ = "stickell"
diff --git a/pyload/plugins/crypter/QuickshareCzFolder.py b/pyload/plugins/crypter/QuickshareCzFolder.py
index 887d9c154..c3a7e0ec6 100644
--- a/pyload/plugins/crypter/QuickshareCzFolder.py
+++ b/pyload/plugins/crypter/QuickshareCzFolder.py
@@ -7,7 +7,7 @@ from module.plugins.Crypter import Crypter
 class QuickshareCzFolder(Crypter):
     __name__ = "QuickshareCzFolder"
     __type__ = "crypter"
-    __pattern__ = r"http://(www\.)?quickshare.cz/slozka-\d+.*"
+    __pattern__ = r"http://(?:www\.)?quickshare.cz/slozka-\d+.*"
     __version__ = "0.1"
     __description__ = """Quickshare.cz folder decrypter plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/crypter/RSLayerCom.py b/pyload/plugins/crypter/RSLayerCom.py
index 320ae2186..463327019 100644
--- a/pyload/plugins/crypter/RSLayerCom.py
+++ b/pyload/plugins/crypter/RSLayerCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter
 class RSLayerCom(DeadCrypter):
     __name__ = "RSLayerCom"
     __type__ = "crypter"
-    __pattern__ = r"http://(www\.)?rs-layer.com/directory-"
+    __pattern__ = r"http://(?:www\.)?rs-layer.com/directory-"
     __version__ = "0.21"
     __description__ = """RS-Layer.com decrypter plugin"""
     __author_name__ = "hzpz"
diff --git a/pyload/plugins/crypter/RelinkUs.py b/pyload/plugins/crypter/RelinkUs.py
index 3241d21d8..7d22f2ef4 100644
--- a/pyload/plugins/crypter/RelinkUs.py
+++ b/pyload/plugins/crypter/RelinkUs.py
@@ -12,7 +12,7 @@ from module.plugins.Crypter import Crypter
 class RelinkUs(Crypter):
     __name__ = "RelinkUs"
     __type__ = "crypter"
-    __pattern__ = r"http://(www\.)?relink.us/(f/|((view|go).php\?id=))(?P<id>.+)"
+    __pattern__ = r"http://(?:www\.)?relink.us/(f/|((view|go).php\?id=))(?P<id>.+)"
     __version__ = "3.0"
     __description__ = """Relink.us decrypter plugin"""
     __author_name__ = "fragonib"
diff --git a/pyload/plugins/crypter/SafelinkingNet.py b/pyload/plugins/crypter/SafelinkingNet.py
index aaf1622c6..8a11d13a1 100644
--- a/pyload/plugins/crypter/SafelinkingNet.py
+++ b/pyload/plugins/crypter/SafelinkingNet.py
@@ -12,7 +12,7 @@ from module.lib.BeautifulSoup import BeautifulSoup
 class SafelinkingNet(Crypter):
     __name__ = 'SafelinkingNet'
     __type__ = 'crypter'
-    __pattern__ = r'https?://safelinking.net/([pd])/\w+'
+    __pattern__ = r'https?://(?:www\.)?safelinking.net/([pd])/\w+'
     __version__ = '0.1'
     __description__ = """Safelinking.net decrypter plugin"""
     __author_name__ = "quareevo"
diff --git a/pyload/plugins/crypter/SecuredIn.py b/pyload/plugins/crypter/SecuredIn.py
index 299013c49..f89477ff6 100644
--- a/pyload/plugins/crypter/SecuredIn.py
+++ b/pyload/plugins/crypter/SecuredIn.py
@@ -6,7 +6,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter
 class SecuredIn(DeadCrypter):
     __name__ = "SecuredIn"
     __type__ = "crypter"
-    __pattern__ = r"http://[\w\.]*?secured\.in/download-[\d]+-[\w]{8}\.html"
+    __pattern__ = r"http://(?:www\.)?secured\.in/download-[\d]+-[\w]{8}\.html"
     __version__ = "0.21"
     __description__ = """Secured.in decrypter plugin"""
     __author_name__ = "mkaay"
diff --git a/pyload/plugins/crypter/SerienjunkiesOrg.py b/pyload/plugins/crypter/SerienjunkiesOrg.py
index b8e492baa..0b698bf94 100644
--- a/pyload/plugins/crypter/SerienjunkiesOrg.py
+++ b/pyload/plugins/crypter/SerienjunkiesOrg.py
@@ -13,7 +13,7 @@ from module.unescape import unescape
 class SerienjunkiesOrg(Crypter):
     __name__ = "SerienjunkiesOrg"
     __type__ = "crypter"
-    __pattern__ = r"http://.*?(serienjunkies.org|dokujunkies.org)/.*?"
+    __pattern__ = r"http://(?:www\.)?(serienjunkies.org|dokujunkies.org)/.*?"
     __version__ = "0.39"
     __config__ = [("changeNameSJ", "Packagename;Show;Season;Format;Episode", "Take SJ.org name", "Show"),
                   ("changeNameDJ", "Packagename;Show;Format;Episode", "Take DJ.org name", "Show"),
diff --git a/pyload/plugins/crypter/ShareLinksBiz.py b/pyload/plugins/crypter/ShareLinksBiz.py
index 0c0ab3851..2027ecb61 100644
--- a/pyload/plugins/crypter/ShareLinksBiz.py
+++ b/pyload/plugins/crypter/ShareLinksBiz.py
@@ -11,7 +11,7 @@ from module.plugins.Crypter import Crypter
 class ShareLinksBiz(Crypter):
     __name__ = "ShareLinksBiz"
     __type__ = "crypter"
-    __pattern__ = r"(?P<base>http://[\w\.]*?(share-links|s2l)\.biz)/(?P<id>_?[0-9a-z]+)(/.*)?"
+    __pattern__ = r"(?P<base>http://(?:www\.)?(share-links|s2l)\.biz)/(?P<id>_?[0-9a-z]+)(/.*)?"
     __version__ = "1.13"
     __description__ = """Share-Links.biz decrypter plugin"""
     __author_name__ = "fragonib"
diff --git a/pyload/plugins/crypter/SpeedLoadOrgFolder.py b/pyload/plugins/crypter/SpeedLoadOrgFolder.py
index d5222941d..0a7c88f1a 100644
--- a/pyload/plugins/crypter/SpeedLoadOrgFolder.py
+++ b/pyload/plugins/crypter/SpeedLoadOrgFolder.py
@@ -20,7 +20,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter
 class SpeedLoadOrgFolder(DeadCrypter):
     __name__ = "SpeedLoadOrgFolder"
     __type__ = "crypter"
-    __pattern__ = r"http://(www\.)?speedload\.org/(\d+~f$|folder/\d+/)"
+    __pattern__ = r"http://(?:www\.)?speedload\.org/(\d+~f$|folder/\d+/)"
     __version__ = "0.3"
     __description__ = """Speedload decrypter plugin"""
     __author_name__ = "stickell"
diff --git a/pyload/plugins/crypter/StealthTo.py b/pyload/plugins/crypter/StealthTo.py
index a447f4e09..b934c518b 100644
--- a/pyload/plugins/crypter/StealthTo.py
+++ b/pyload/plugins/crypter/StealthTo.py
@@ -8,7 +8,7 @@ from module.plugins.Crypter import Crypter
 class StealthTo(Crypter):
     __name__ = "StealthTo"
     __type__ = "crypter"
-    __pattern__ = r"http://(www\.)?stealth.to/folder/"
+    __pattern__ = r"http://(?:www\.)?stealth.to/folder/"
     __version__ = "0.1"
     __description__ = """Stealth.to decrypter plugin"""
     __author_name__ = "spoob"
diff --git a/pyload/plugins/crypter/TrailerzoneInfo.py b/pyload/plugins/crypter/TrailerzoneInfo.py
index 45c9590a3..6459edad8 100644
--- a/pyload/plugins/crypter/TrailerzoneInfo.py
+++ b/pyload/plugins/crypter/TrailerzoneInfo.py
@@ -6,7 +6,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter
 class TrailerzoneInfo(DeadCrypter):
     __name__ = "TrailerzoneInfo"
     __type__ = "crypter"
-    __pattern__ = r"http://(www\.)?trailerzone.info/.*?"
+    __pattern__ = r"http://(?:www\.)?trailerzone.info/.*?"
     __version__ = "0.03"
     __description__ = """TrailerZone.info decrypter plugin"""
     __author_name__ = "godofdream"
diff --git a/pyload/plugins/crypter/UlozToFolder.py b/pyload/plugins/crypter/UlozToFolder.py
index ba049d3b9..0526ed761 100644
--- a/pyload/plugins/crypter/UlozToFolder.py
+++ b/pyload/plugins/crypter/UlozToFolder.py
@@ -7,7 +7,7 @@ from module.plugins.Crypter import Crypter
 class UlozToFolder(Crypter):
     __name__ = "UlozToFolder"
     __type__ = "crypter"
-    __pattern__ = r"http://.*(uloz\.to|ulozto\.(cz|sk|net)|bagruj.cz|zachowajto.pl)/(m|soubory)/.*"
+    __pattern__ = r"http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj.cz|zachowajto.pl)/(m|soubory)/.*"
     __version__ = "0.2"
     __description__ = """Uloz.to folder decrypter plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/crypter/WiiReloadedOrg.py b/pyload/plugins/crypter/WiiReloadedOrg.py
index 4e172bd08..f0ac781e4 100644
--- a/pyload/plugins/crypter/WiiReloadedOrg.py
+++ b/pyload/plugins/crypter/WiiReloadedOrg.py
@@ -6,7 +6,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter
 class WiiReloadedOrg(DeadCrypter):
     __name__ = "WiiReloadedOrg"
     __type__ = "crypter"
-    __pattern__ = r"http://www\.wii-reloaded\.org/protect/get\.php\?i=.+"
+    __pattern__ = r"http://(?:www\.)?wii-reloaded\.org/protect/get\.php\?i=.+"
     __version__ = "0.11"
     __description__ = """Wii-Reloaded.org decrypter plugin"""
     __author_name__ = "hzpz"
diff --git a/pyload/plugins/crypter/XupPl.py b/pyload/plugins/crypter/XupPl.py
index 4d3bc4e72..ea675b2d2 100644
--- a/pyload/plugins/crypter/XupPl.py
+++ b/pyload/plugins/crypter/XupPl.py
@@ -6,7 +6,7 @@ from module.plugins.Crypter import Crypter
 class XupPl(Crypter):
     __name__ = "XupPl"
     __type__ = "crypter"
-    __pattern__ = r"https?://.*\.xup\.pl/.*"
+    __pattern__ = r"https?://(?:[^/]*\.)?xup\.pl/.*"
     __version__ = "0.1"
     __description__ = """Xup.pl decrypter plugin"""
     __author_name__ = "z00nx"
diff --git a/pyload/plugins/hoster/AlldebridCom.py b/pyload/plugins/hoster/AlldebridCom.py
index 13bfb018c..b094c805b 100644
--- a/pyload/plugins/hoster/AlldebridCom.py
+++ b/pyload/plugins/hoster/AlldebridCom.py
@@ -13,7 +13,7 @@ class AlldebridCom(Hoster):
     __version__ = "0.34"
     __type__ = "hoster"
 
-    __pattern__ = r"https?://.*alldebrid\..*"
+    __pattern__ = r"https?://(?:[^/]*\.)?alldebrid\..*"
     __description__ = """Alldebrid.com hoster plugin"""
     __author_name__ = "Andy Voigt"
     __author_mail__ = "spamsales@online.de"
diff --git a/pyload/plugins/hoster/BezvadataCz.py b/pyload/plugins/hoster/BezvadataCz.py
index fa06683e7..9f4cf530d 100644
--- a/pyload/plugins/hoster/BezvadataCz.py
+++ b/pyload/plugins/hoster/BezvadataCz.py
@@ -25,7 +25,7 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class BezvadataCz(SimpleHoster):
     __name__ = "BezvadataCz"
     __type__ = "hoster"
-    __pattern__ = r"http://(\w*\.)*bezvadata.cz/stahnout/.*"
+    __pattern__ = r"http://(?:www\.)?bezvadata.cz/stahnout/.*"
     __version__ = "0.24"
     __description__ = """BezvaData.cz hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/BillionuploadsCom.py b/pyload/plugins/hoster/BillionuploadsCom.py
index 83c3512e5..33f16dd03 100644
--- a/pyload/plugins/hoster/BillionuploadsCom.py
+++ b/pyload/plugins/hoster/BillionuploadsCom.py
@@ -6,7 +6,7 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf
 class BillionuploadsCom(XFileSharingPro):
     __name__ = "BillionuploadsCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*?billionuploads.com/\w{12}"
+    __pattern__ = r"http://(?:www\.)?billionuploads.com/\w{12}"
     __version__ = "0.01"
     __description__ = """Billionuploads.com hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/BitshareCom.py b/pyload/plugins/hoster/BitshareCom.py
index 0ad93a570..82a1dcfab 100644
--- a/pyload/plugins/hoster/BitshareCom.py
+++ b/pyload/plugins/hoster/BitshareCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.CaptchaService import ReCaptcha
 class BitshareCom(SimpleHoster):
     __name__ = "BitshareCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?bitshare\.com/(files/(?P<id1>[a-zA-Z0-9]+)(/(?P<name>.*?)\.html)?|\?f=(?P<id2>[a-zA-Z0-9]+))"
+    __pattern__ = r"http://(?:www\.)?bitshare\.com/(files/(?P<id1>[a-zA-Z0-9]+)(/(?P<name>.*?)\.html)?|\?f=(?P<id2>[a-zA-Z0-9]+))"
     __version__ = "0.49"
     __description__ = """Bitshare.com hoster plugin"""
     __author_name__ = ("Paul King", "fragonib")
diff --git a/pyload/plugins/hoster/BoltsharingCom.py b/pyload/plugins/hoster/BoltsharingCom.py
index 40bd06564..7615c70a8 100644
--- a/pyload/plugins/hoster/BoltsharingCom.py
+++ b/pyload/plugins/hoster/BoltsharingCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 class BoltsharingCom(DeadHoster):
     __name__ = "BoltsharingCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*?boltsharing.com/\w{12}"
+    __pattern__ = r"http://(?:www\.)?boltsharing.com/\w{12}"
     __version__ = "0.02"
     __description__ = """Boltsharing.com hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/CatShareNet.py b/pyload/plugins/hoster/CatShareNet.py
index 23f19653c..ad626599e 100644
--- a/pyload/plugins/hoster/CatShareNet.py
+++ b/pyload/plugins/hoster/CatShareNet.py
@@ -8,7 +8,7 @@ from module.plugins.internal.CaptchaService import ReCaptcha
 class CatShareNet(SimpleHoster):
     __name__ = "CatShareNet"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?catshare.net/\w{16}.*"
+    __pattern__ = r"http://(?:www\.)?catshare.net/\w{16}.*"
     __version__ = "0.01"
     __description__ = """CatShare.net hoster plugin"""
     __author_name__ = "z00nx"
diff --git a/pyload/plugins/hoster/CramitIn.py b/pyload/plugins/hoster/CramitIn.py
index 5d4e65a74..4dc91cfe6 100644
--- a/pyload/plugins/hoster/CramitIn.py
+++ b/pyload/plugins/hoster/CramitIn.py
@@ -6,7 +6,7 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf
 class CramitIn(XFileSharingPro):
     __name__ = "CramitIn"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*cramit.in/\w{12}"
+    __pattern__ = r"http://(?:www\.)?cramit.in/\w{12}"
     __version__ = "0.04"
     __description__ = """Cramit.in hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/CrockoCom.py b/pyload/plugins/hoster/CrockoCom.py
index 8bd21f041..649564e9c 100644
--- a/pyload/plugins/hoster/CrockoCom.py
+++ b/pyload/plugins/hoster/CrockoCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.CaptchaService import ReCaptcha
 class CrockoCom(SimpleHoster):
     __name__ = "CrockoCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?(crocko|easy-share).com/\w+"
+    __pattern__ = r"http://(?:www\.)?(crocko|easy-share).com/\w+"
     __version__ = "0.16"
     __description__ = """Crocko hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/CzshareCom.py b/pyload/plugins/hoster/CzshareCom.py
index b57696468..568387016 100644
--- a/pyload/plugins/hoster/CzshareCom.py
+++ b/pyload/plugins/hoster/CzshareCom.py
@@ -28,7 +28,7 @@ from module.utils import parseFileSize
 class CzshareCom(SimpleHoster):
     __name__ = "CzshareCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(\w*\.)*czshare\.(com|cz)/(\d+/|download.php\?).*"
+    __pattern__ = r"http://(?:www\.)?czshare\.(com|cz)/(\d+/|download.php\?).*"
     __version__ = "0.93"
     __description__ = """CZshare.com hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/DataHu.py b/pyload/plugins/hoster/DataHu.py
index bf20f4126..a354c7094 100644
--- a/pyload/plugins/hoster/DataHu.py
+++ b/pyload/plugins/hoster/DataHu.py
@@ -25,7 +25,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class DataHu(SimpleHoster):
     __name__ = "DataHu"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?data.hu/get/\w+"
+    __pattern__ = r"http://(?:www\.)?data.hu/get/\w+"
     __version__ = "0.01"
     __description__ = """Data.hu hoster plugin"""
     __author_name__ = ("crash", "stickell")
diff --git a/pyload/plugins/hoster/DataportCz.py b/pyload/plugins/hoster/DataportCz.py
index a6a4c57c4..151e56681 100644
--- a/pyload/plugins/hoster/DataportCz.py
+++ b/pyload/plugins/hoster/DataportCz.py
@@ -23,7 +23,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, P
 class DataportCz(SimpleHoster):
     __name__ = "DataportCz"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:.*?\.)?dataport.cz/file/(.*)"
+    __pattern__ = r"http://(?:www\.)?dataport.cz/file/(.*)"
     __version__ = "0.37"
     __description__ = """Dataport.cz hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/DdlstorageCom.py b/pyload/plugins/hoster/DdlstorageCom.py
index 1d36978f6..c59980d3c 100644
--- a/pyload/plugins/hoster/DdlstorageCom.py
+++ b/pyload/plugins/hoster/DdlstorageCom.py
@@ -39,7 +39,7 @@ def getInfo(urls):
 class DdlstorageCom(XFileSharingPro):
     __name__ = "DdlstorageCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*?ddlstorage.com/(?P<ID>\w{12})"
+    __pattern__ = r"http://(?:www\.)?ddlstorage.com/(?P<ID>\w{12})"
     __version__ = "1.00"
     __description__ = """DDLStorage.com hoster plugin"""
     __author_name__ = ("zoidberg", "stickell")
diff --git a/pyload/plugins/hoster/DepositfilesCom.py b/pyload/plugins/hoster/DepositfilesCom.py
index 9ed974f5b..2d7487a02 100644
--- a/pyload/plugins/hoster/DepositfilesCom.py
+++ b/pyload/plugins/hoster/DepositfilesCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.CaptchaService import ReCaptcha
 class DepositfilesCom(SimpleHoster):
     __name__ = "DepositfilesCom"
     __type__ = "hoster"
-    __pattern__ = r"https?://[\w\.]*?(depositfiles\.com|dfiles\.(eu|ru))(/\w{1,3})?/files/[\w]+"
+    __pattern__ = r"https?://(?:www\.)?(depositfiles\.com|dfiles\.(eu|ru))(/\w{1,3})?/files/[\w]+"
     __version__ = "0.46"
     __description__ = """Depositfiles.com hoster plugin"""
     __author_name__ = ("spoob", "zoidberg")
diff --git a/pyload/plugins/hoster/DlFreeFr.py b/pyload/plugins/hoster/DlFreeFr.py
index 8dfb55bc4..fdd8b09ec 100644
--- a/pyload/plugins/hoster/DlFreeFr.py
+++ b/pyload/plugins/hoster/DlFreeFr.py
@@ -106,7 +106,7 @@ class AdYouLike():
 class DlFreeFr(SimpleHoster):
     __name__ = "DlFreeFr"
     __type__ = "hoster"
-    __pattern__ = r"http://dl\.free\.fr/([a-zA-Z0-9]+|getfile\.pl\?file=/[a-zA-Z0-9]+)"
+    __pattern__ = r"http://(?:www\.)?dl\.free\.fr/([a-zA-Z0-9]+|getfile\.pl\?file=/[a-zA-Z0-9]+)"
     __version__ = "0.25"
     __description__ = """Dl.free.fr hoster plugin"""
     __author_name__ = ("the-razer", "zoidberg", "Toilal")
diff --git a/pyload/plugins/hoster/DuploadOrg.py b/pyload/plugins/hoster/DuploadOrg.py
index e293cf371..430f25c1b 100644
--- a/pyload/plugins/hoster/DuploadOrg.py
+++ b/pyload/plugins/hoster/DuploadOrg.py
@@ -20,7 +20,7 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf
 class DuploadOrg(XFileSharingPro):
     __name__ = "DuploadOrg"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?dupload\.org/\w{12}"
+    __pattern__ = r"http://(?:www\.)?dupload\.org/\w{12}"
     __version__ = "0.01"
     __description__ = """Dupload.grg hoster plugin"""
     __author_name__ = "stickell"
diff --git a/pyload/plugins/hoster/EasybytezCom.py b/pyload/plugins/hoster/EasybytezCom.py
index ace7e82e6..843905fff 100644
--- a/pyload/plugins/hoster/EasybytezCom.py
+++ b/pyload/plugins/hoster/EasybytezCom.py
@@ -23,7 +23,7 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf
 class EasybytezCom(XFileSharingPro):
     __name__ = "EasybytezCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)?easybytez.com/(\w+).*"
+    __pattern__ = r"http://(?:www\.)?easybytez.com/(\w+).*"
     __version__ = "0.17"
     __description__ = """Easybytez.com hoster plugin"""
     __author_name__ = ("zoidberg", "stickell")
diff --git a/pyload/plugins/hoster/EdiskCz.py b/pyload/plugins/hoster/EdiskCz.py
index 50cf421ca..ade714dae 100644
--- a/pyload/plugins/hoster/EdiskCz.py
+++ b/pyload/plugins/hoster/EdiskCz.py
@@ -24,7 +24,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class EdiskCz(SimpleHoster):
     __name__ = "EdiskCz"
     __type__ = "hoster"
-    __pattern__ = r"http://(\w*\.)?edisk.(cz|sk|eu)/(stahni|sk/stahni|en/download)/.*"
+    __pattern__ = r"http://(?:www\.)?edisk.(cz|sk|eu)/(stahni|sk/stahni|en/download)/.*"
     __version__ = "0.21"
     __description__ = """Edisk.cz hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/EgoFilesCom.py b/pyload/plugins/hoster/EgoFilesCom.py
index 5e03710da..d23443d28 100644
--- a/pyload/plugins/hoster/EgoFilesCom.py
+++ b/pyload/plugins/hoster/EgoFilesCom.py
@@ -26,7 +26,7 @@ from module.plugins.internal.CaptchaService import ReCaptcha
 class EgoFilesCom(SimpleHoster):
     __name__ = "EgoFilesCom"
     __type__ = "hoster"
-    __pattern__ = r"https?://(www\.)?egofiles.com/(\w+)"
+    __pattern__ = r"https?://(?:www\.)?egofiles.com/(\w+)"
     __version__ = "0.13"
     __description__ = """Egofiles.com hoster plugin"""
     __author_name__ = "stickell"
diff --git a/pyload/plugins/hoster/EuroshareEu.py b/pyload/plugins/hoster/EuroshareEu.py
index 8bb248dae..ac9275cd3 100644
--- a/pyload/plugins/hoster/EuroshareEu.py
+++ b/pyload/plugins/hoster/EuroshareEu.py
@@ -24,7 +24,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class EuroshareEu(SimpleHoster):
     __name__ = "EuroshareEu"
     __type__ = "hoster"
-    __pattern__ = r"http://(\w*\.)?euroshare.(eu|sk|cz|hu|pl)/file/.*"
+    __pattern__ = r"http://(?:www\.)?euroshare.(eu|sk|cz|hu|pl)/file/.*"
     __version__ = "0.25"
     __description__ = """Euroshare.eu hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/FileApeCom.py b/pyload/plugins/hoster/FileApeCom.py
index ff56d0786..1429630a7 100644
--- a/pyload/plugins/hoster/FileApeCom.py
+++ b/pyload/plugins/hoster/FileApeCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 class FileApeCom(DeadHoster):
     __name__ = "FileApeCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?fileape\.com/(index\.php\?act=download\&id=|dl/)\w+"
+    __pattern__ = r"http://(?:www\.)?fileape\.com/(index\.php\?act=download\&id=|dl/)\w+"
     __version__ = "0.12"
     __description__ = """FileApe.com hoster plugin"""
     __author_name__ = "espes"
diff --git a/pyload/plugins/hoster/FilecloudIo.py b/pyload/plugins/hoster/FilecloudIo.py
index 75981c8e8..7afb5e13f 100644
--- a/pyload/plugins/hoster/FilecloudIo.py
+++ b/pyload/plugins/hoster/FilecloudIo.py
@@ -26,7 +26,7 @@ from module.plugins.internal.CaptchaService import ReCaptcha
 class FilecloudIo(SimpleHoster):
     __name__ = "FilecloudIo"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*(?:filecloud\.io|ifile\.it|mihd\.net)/(?P<ID>\w+).*"
+    __pattern__ = r"http://(?:www\.)?(?:filecloud\.io|ifile\.it|mihd\.net)/(?P<ID>\w+).*"
     __version__ = "0.02"
     __description__ = """Filecloud.io hoster plugin"""
     __author_name__ = ("zoidberg", "stickell")
diff --git a/pyload/plugins/hoster/FilerNet.py b/pyload/plugins/hoster/FilerNet.py
index 4d5553df7..17c350630 100644
--- a/pyload/plugins/hoster/FilerNet.py
+++ b/pyload/plugins/hoster/FilerNet.py
@@ -29,7 +29,7 @@ from module.plugins.internal.CaptchaService import ReCaptcha
 class FilerNet(SimpleHoster):
     __name__ = "FilerNet"
     __type__ = "hoster"
-    __pattern__ = r"https?://(www\.)?filer\.net/get/(\w+)"
+    __pattern__ = r"https?://(?:www\.)?filer\.net/get/(\w+)"
     __version__ = "0.03"
     __description__ = """Filer.net hoster plugin"""
     __author_name__ = "stickell"
diff --git a/pyload/plugins/hoster/FilerioCom.py b/pyload/plugins/hoster/FilerioCom.py
index f12136f46..68f81f524 100644
--- a/pyload/plugins/hoster/FilerioCom.py
+++ b/pyload/plugins/hoster/FilerioCom.py
@@ -6,7 +6,7 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf
 class FilerioCom(XFileSharingPro):
     __name__ = "FilerioCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*(filerio\.(in|com)|filekeen\.com)/\w{12}"
+    __pattern__ = r"http://(?:www\.)?(filerio\.(in|com)|filekeen\.com)/\w{12}"
     __version__ = "0.02"
     __description__ = """FileRio.in hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/FilesMailRu.py b/pyload/plugins/hoster/FilesMailRu.py
index 9f660713e..bd3d98363 100644
--- a/pyload/plugins/hoster/FilesMailRu.py
+++ b/pyload/plugins/hoster/FilesMailRu.py
@@ -31,7 +31,7 @@ def getInfo(urls):
 class FilesMailRu(Hoster):
     __name__ = "FilesMailRu"
     __type__ = "hoster"
-    __pattern__ = r"http://files\.mail\.ru/.*"
+    __pattern__ = r"http://(?:www\.)?files\.mail\.ru/.*"
     __version__ = "0.31"
     __description__ = """Files.mail.ru hoster plugin"""
     __author_name__ = "oZiRiz"
diff --git a/pyload/plugins/hoster/FileshareInUa.py b/pyload/plugins/hoster/FileshareInUa.py
index 8b5e2f545..95068e66b 100644
--- a/pyload/plugins/hoster/FileshareInUa.py
+++ b/pyload/plugins/hoster/FileshareInUa.py
@@ -9,7 +9,7 @@ from module.utils import parseFileSize
 class FileshareInUa(Hoster):
     __name__ = "FileshareInUa"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*?fileshare.in.ua/[A-Za-z0-9]+"
+    __pattern__ = r"http://(?:www\.)?fileshare.in.ua/[A-Za-z0-9]+"
     __version__ = "0.01"
     __description__ = """Fileshare.in.ua hoster plugin"""
     __author_name__ = "fwannmacher"
diff --git a/pyload/plugins/hoster/FilezyNet.py b/pyload/plugins/hoster/FilezyNet.py
index 4a975cab9..d5c2f3c94 100644
--- a/pyload/plugins/hoster/FilezyNet.py
+++ b/pyload/plugins/hoster/FilezyNet.py
@@ -8,7 +8,7 @@ class FilezyNet(XFileSharingPro):
     __name__ = "FilezyNet"
     __type__ = "hoster"
     __version__ = "0.1"
-    __pattern__ = r"http://filezy.net/.*/.*.html"
+    __pattern__ = r"http://(?:www\.)?filezy.net/.*/.*.html"
     __description__ = """Filezy.net hoster plugin"""
 
     HOSTER_NAME = "filezy.net"
diff --git a/pyload/plugins/hoster/FlyFilesNet.py b/pyload/plugins/hoster/FlyFilesNet.py
index 57b3784c3..3e0466a41 100644
--- a/pyload/plugins/hoster/FlyFilesNet.py
+++ b/pyload/plugins/hoster/FlyFilesNet.py
@@ -11,7 +11,7 @@ class FlyFilesNet(SimpleHoster):
     __name__ = "FlyFilesNet"
     __version__ = "0.1"
     __type__ = "hoster"
-    __pattern__ = r'http://flyfiles\.net/.*'
+    __pattern__ = r'http://(?:www\.)?flyfiles\.net/.*'
 
     SESSION_PATTERN = r'flyfiles\.net/(.*)/.*'
     FILE_NAME_PATTERN = r'flyfiles\.net/.*/(.*)'
diff --git a/pyload/plugins/hoster/FourSharedCom.py b/pyload/plugins/hoster/FourSharedCom.py
index dfc1aaa0f..d22bcf462 100644
--- a/pyload/plugins/hoster/FourSharedCom.py
+++ b/pyload/plugins/hoster/FourSharedCom.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class FourSharedCom(SimpleHoster):
     __name__ = "FourSharedCom"
     __type__ = "hoster"
-    __pattern__ = r"https?://(www\.)?4shared(\-china)?\.com/(account/)?(download|get|file|document|photo|video|audio|mp3|office|rar|zip|archive|music)/.+?/.*"
+    __pattern__ = r"https?://(?:www\.)?4shared(\-china)?\.com/(account/)?(download|get|file|document|photo|video|audio|mp3|office|rar|zip|archive|music)/.+?/.*"
     __version__ = "0.29"
     __description__ = """4Shared.com hoster plugin"""
     __author_name__ = ("jeix", "zoidberg")
diff --git a/pyload/plugins/hoster/FreevideoCz.py b/pyload/plugins/hoster/FreevideoCz.py
index 8748d70b4..9f9e2b4b3 100644
--- a/pyload/plugins/hoster/FreevideoCz.py
+++ b/pyload/plugins/hoster/FreevideoCz.py
@@ -39,7 +39,7 @@ def getInfo(urls):
 class FreevideoCz(Hoster):
     __name__ = "FreevideoCz"
     __type__ = "hoster"
-    __pattern__ = r"http://www.freevideo.cz/vase-videa/(.*)\.html"
+    __pattern__ = r"http://(?:www\.)?freevideo.cz/vase-videa/(.*)\.html"
     __version__ = "0.2"
     __description__ = """Freevideo.cz hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/FshareVn.py b/pyload/plugins/hoster/FshareVn.py
index 2a9ade622..a61466eac 100644
--- a/pyload/plugins/hoster/FshareVn.py
+++ b/pyload/plugins/hoster/FshareVn.py
@@ -26,7 +26,7 @@ def doubleDecode(m):
 class FshareVn(SimpleHoster):
     __name__ = "FshareVn"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?fshare.vn/file/.*"
+    __pattern__ = r"http://(?:www\.)?fshare.vn/file/.*"
     __version__ = "0.16"
     __description__ = """FshareVn hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/GamefrontCom.py b/pyload/plugins/hoster/GamefrontCom.py
index 25179fcd9..e130ca5c0 100644
--- a/pyload/plugins/hoster/GamefrontCom.py
+++ b/pyload/plugins/hoster/GamefrontCom.py
@@ -9,7 +9,7 @@ from module.utils import parseFileSize
 class GamefrontCom(Hoster):
     __name__ = "GamefrontCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*?gamefront.com/files/[A-Za-z0-9]+"
+    __pattern__ = r"http://(?:www\.)?gamefront.com/files/[A-Za-z0-9]+"
     __version__ = "0.04"
     __description__ = """Gamefront.com hoster plugin"""
     __author_name__ = "fwannmacher"
diff --git a/pyload/plugins/hoster/HellshareCz.py b/pyload/plugins/hoster/HellshareCz.py
index 26c27f0d5..1a34b6163 100644
--- a/pyload/plugins/hoster/HellshareCz.py
+++ b/pyload/plugins/hoster/HellshareCz.py
@@ -24,7 +24,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class HellshareCz(SimpleHoster):
     __name__ = "HellshareCz"
     __type__ = "hoster"
-    __pattern__ = r"(http://(?:.*\.)*hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+).*"
+    __pattern__ = r"(http://(?:www\.)?hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+).*"
     __version__ = "0.82"
     __description__ = """Hellshare.cz hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/HellspyCz.py b/pyload/plugins/hoster/HellspyCz.py
index b3e749394..3d98b961a 100644
--- a/pyload/plugins/hoster/HellspyCz.py
+++ b/pyload/plugins/hoster/HellspyCz.py
@@ -23,7 +23,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 class HellspyCz(DeadHoster):
     __name__ = "HellspyCz"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*(?:hellspy\.(?:cz|com|sk|hu|pl)|sciagaj.pl)(/\S+/\d+)/?.*"
+    __pattern__ = r"http://(?:www\.)?(?:hellspy\.(?:cz|com|sk|hu|pl)|sciagaj.pl)(/\S+/\d+)/?.*"
     __version__ = "0.28"
     __description__ = """HellSpy.cz hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/HugefilesNet.py b/pyload/plugins/hoster/HugefilesNet.py
index 4a6d6fd66..8faccc56d 100644
--- a/pyload/plugins/hoster/HugefilesNet.py
+++ b/pyload/plugins/hoster/HugefilesNet.py
@@ -23,7 +23,7 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf
 class HugefilesNet(XFileSharingPro):
     __name__ = "HugefilesNet"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?hugefiles\.net/\w{12}"
+    __pattern__ = r"http://(?:www\.)?hugefiles\.net/\w{12}"
     __version__ = "0.01"
     __description__ = """Hugefiles.net hoster plugin"""
     __author_name__ = "stickell"
diff --git a/pyload/plugins/hoster/HundredEightyUploadCom.py b/pyload/plugins/hoster/HundredEightyUploadCom.py
index f4b831fc5..1378055dd 100644
--- a/pyload/plugins/hoster/HundredEightyUploadCom.py
+++ b/pyload/plugins/hoster/HundredEightyUploadCom.py
@@ -23,7 +23,7 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf
 class HundredEightyUploadCom(XFileSharingPro):
     __name__ = "HundredEightyUploadCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)?180upload\.com/(\w+).*"
+    __pattern__ = r"http://(?:www\.)?180upload\.com/(\w+).*"
     __version__ = "0.01"
     __description__ = """180upload.com hoster plugin"""
     __author_name__ = "stickell"
diff --git a/pyload/plugins/hoster/IFileWs.py b/pyload/plugins/hoster/IFileWs.py
index 76edf1892..e95a28cc0 100644
--- a/pyload/plugins/hoster/IFileWs.py
+++ b/pyload/plugins/hoster/IFileWs.py
@@ -6,7 +6,7 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf
 class IFileWs(XFileSharingPro):
     __name__ = "IFileWs"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?ifile\.ws/\w+(/.+)?"
+    __pattern__ = r"http://(?:www\.)?ifile\.ws/\w+(/.+)?"
     __version__ = "0.01"
     __description__ = """Ifile.ws hoster plugin"""
     __author_name__ = "z00nx"
diff --git a/pyload/plugins/hoster/IfolderRu.py b/pyload/plugins/hoster/IfolderRu.py
index 808b97457..369a88a00 100644
--- a/pyload/plugins/hoster/IfolderRu.py
+++ b/pyload/plugins/hoster/IfolderRu.py
@@ -24,7 +24,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class IfolderRu(SimpleHoster):
     __name__ = "IfolderRu"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:[^.]*\.)?(?:ifolder\.ru|rusfolder\.(?:com|net|ru))/(?:files/)?(?P<ID>\d+).*"
+    __pattern__ = r"http://(?:www\.)?(?:ifolder\.ru|rusfolder\.(?:com|net|ru))/(?:files/)?(?P<ID>\d+).*"
     __version__ = "0.38"
     __description__ = """Ifolder.ru hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/JumbofilesCom.py b/pyload/plugins/hoster/JumbofilesCom.py
index e06c4dcf2..21c696f05 100644
--- a/pyload/plugins/hoster/JumbofilesCom.py
+++ b/pyload/plugins/hoster/JumbofilesCom.py
@@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class JumbofilesCom(SimpleHoster):
     __name__ = "JumbofilesCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*jumbofiles.com/(\w{12}).*"
+    __pattern__ = r"http://(?:www\.)?jumbofiles.com/(\w{12}).*"
     __version__ = "0.02"
     __description__ = """JumboFiles.com hoster plugin"""
     __author_name__ = "godofdream"
diff --git a/pyload/plugins/hoster/LetitbitNet.py b/pyload/plugins/hoster/LetitbitNet.py
index d8de12971..8dcb6e7cf 100644
--- a/pyload/plugins/hoster/LetitbitNet.py
+++ b/pyload/plugins/hoster/LetitbitNet.py
@@ -51,7 +51,7 @@ def getInfo(urls):
 class LetitbitNet(SimpleHoster):
     __name__ = "LetitbitNet"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*(letitbit|shareflare).net/download/.*"
+    __pattern__ = r"http://(?:www\.)?(letitbit|shareflare).net/download/.*"
     __version__ = "0.23"
     __description__ = """Letitbit.net hoster plugin"""
     __author_name__ = ("zoidberg", "z00nx")
diff --git a/pyload/plugins/hoster/LuckyShareNet.py b/pyload/plugins/hoster/LuckyShareNet.py
index ab9c3478f..0c46466a4 100644
--- a/pyload/plugins/hoster/LuckyShareNet.py
+++ b/pyload/plugins/hoster/LuckyShareNet.py
@@ -10,7 +10,7 @@ from module.plugins.internal.CaptchaService import ReCaptcha
 class LuckyShareNet(SimpleHoster):
     __name__ = "LuckyShareNet"
     __type__ = "hoster"
-    __pattern__ = r"https?://(www\.)?luckyshare.net/(?P<ID>\d{10,})"
+    __pattern__ = r"https?://(?:www\.)?luckyshare.net/(?P<ID>\d{10,})"
     __version__ = "0.02"
     __description__ = """LuckyShare.net hoster plugin"""
     __author_name__ = "stickell"
diff --git a/pyload/plugins/hoster/MediafireCom.py b/pyload/plugins/hoster/MediafireCom.py
index 44fbbe61d..b9242dc24 100644
--- a/pyload/plugins/hoster/MediafireCom.py
+++ b/pyload/plugins/hoster/MediafireCom.py
@@ -63,7 +63,7 @@ def getInfo(urls):
 class MediafireCom(SimpleHoster):
     __name__ = "MediafireCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*mediafire\.com/(file/|(view/?|download.php)?\?)(\w{11}|\w{15})($|/)"
+    __pattern__ = r"http://(?:www\.)?mediafire\.com/(file/|(view/?|download.php)?\?)(\w{11}|\w{15})($|/)"
     __version__ = "0.79"
     __description__ = """Mediafire.com hoster plugin"""
     __author_name__ = ("zoidberg", "stickell")
diff --git a/pyload/plugins/hoster/MegasharesCom.py b/pyload/plugins/hoster/MegasharesCom.py
index 1876cce75..90683b3ef 100644
--- a/pyload/plugins/hoster/MegasharesCom.py
+++ b/pyload/plugins/hoster/MegasharesCom.py
@@ -25,7 +25,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class MegasharesCom(SimpleHoster):
     __name__ = "MegasharesCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(\w+\.)?megashares.com/.*"
+    __pattern__ = r"http://(?:www\.)?megashares.com/.*"
     __version__ = "0.24"
     __description__ = """Megashares.com hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/MovReelCom.py b/pyload/plugins/hoster/MovReelCom.py
index db9af9742..056be5276 100644
--- a/pyload/plugins/hoster/MovReelCom.py
+++ b/pyload/plugins/hoster/MovReelCom.py
@@ -7,7 +7,7 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf
 class MovReelCom(XFileSharingPro):
     __name__ = "MovReelCom"
     __type__ = "hoster"
-    __pattern__ = r"http://movreel.com/.*"
+    __pattern__ = r"http://(?:www\.)?movreel.com/.*"
     __version__ = "1.20"
     __description__ = """MovReel.com hoster plugin"""
     __author_name__ = "JorisV83"
diff --git a/pyload/plugins/hoster/MultishareCz.py b/pyload/plugins/hoster/MultishareCz.py
index adcbef326..6bf1d96e3 100644
--- a/pyload/plugins/hoster/MultishareCz.py
+++ b/pyload/plugins/hoster/MultishareCz.py
@@ -25,7 +25,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class MultishareCz(SimpleHoster):
     __name__ = "MultishareCz"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)?multishare.cz/stahnout/(?P<ID>\d+).*"
+    __pattern__ = r"http://(?:www\.)?multishare.cz/stahnout/(?P<ID>\d+).*"
     __version__ = "0.34"
     __description__ = """MultiShare.cz hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/MyvideoDe.py b/pyload/plugins/hoster/MyvideoDe.py
index bdb4ca337..7e9431c5e 100644
--- a/pyload/plugins/hoster/MyvideoDe.py
+++ b/pyload/plugins/hoster/MyvideoDe.py
@@ -8,7 +8,7 @@ from module.unescape import unescape
 class MyvideoDe(Hoster):
     __name__ = "MyvideoDe"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?myvideo.de/watch/"
+    __pattern__ = r"http://(?:www\.)?myvideo.de/watch/"
     __version__ = "0.9"
     __description__ = """Myvideo.de hoster plugin"""
     __author_name__ = "spoob"
diff --git a/pyload/plugins/hoster/NarodRu.py b/pyload/plugins/hoster/NarodRu.py
index 6db8a8208..a46df30c2 100644
--- a/pyload/plugins/hoster/NarodRu.py
+++ b/pyload/plugins/hoster/NarodRu.py
@@ -25,7 +25,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class NarodRu(SimpleHoster):
     __name__ = "NarodRu"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?narod(\.yandex)?\.ru/(disk|start/[0-9]+\.\w+-narod\.yandex\.ru)/(?P<ID>\d+)/.+"
+    __pattern__ = r"http://(?:www\.)?narod(\.yandex)?\.ru/(disk|start/[0-9]+\.\w+-narod\.yandex\.ru)/(?P<ID>\d+)/.+"
     __version__ = "0.1"
     __description__ = """Narod.ru hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/NetloadIn.py b/pyload/plugins/hoster/NetloadIn.py
index b13fa4f2d..2f75e5ac0 100644
--- a/pyload/plugins/hoster/NetloadIn.py
+++ b/pyload/plugins/hoster/NetloadIn.py
@@ -51,7 +51,7 @@ def getInfo(urls):
 class NetloadIn(Hoster):
     __name__ = "NetloadIn"
     __type__ = "hoster"
-    __pattern__ = r"https?://.*netload\.in/(?:datei(.*?)(?:\.htm|/)|index.php?id=10&file_id=)"
+    __pattern__ = r"https?://(?:[^/]*\.)?netload\.in/(?:datei(.*?)(?:\.htm|/)|index.php?id=10&file_id=)"
     __version__ = "0.45"
     __description__ = """Netload.in hoster plugin"""
     __author_name__ = ("spoob", "RaNaN", "Gregy")
diff --git a/pyload/plugins/hoster/NovafileCom.py b/pyload/plugins/hoster/NovafileCom.py
index d4e37025e..f914722aa 100644
--- a/pyload/plugins/hoster/NovafileCom.py
+++ b/pyload/plugins/hoster/NovafileCom.py
@@ -10,7 +10,7 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf
 class NovafileCom(XFileSharingPro):
     __name__ = "NovafileCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*novafile\.com/\w{12}"
+    __pattern__ = r"http://(?:www\.)?novafile\.com/\w{12}"
     __version__ = "0.02"
     __description__ = """Novafile.com hoster plugin"""
     __author_name__ = ("zoidberg", "stickell")
diff --git a/pyload/plugins/hoster/PornhostCom.py b/pyload/plugins/hoster/PornhostCom.py
index b4c4b13c2..61b382c81 100644
--- a/pyload/plugins/hoster/PornhostCom.py
+++ b/pyload/plugins/hoster/PornhostCom.py
@@ -7,7 +7,7 @@ from module.plugins.Hoster import Hoster
 class PornhostCom(Hoster):
     __name__ = "PornhostCom"
     __type__ = "hoster"
-    __pattern__ = r'http://[\w\.]*?pornhost\.com/([0-9]+/[0-9]+\.html|[0-9]+)'
+    __pattern__ = r'http://(?:www\.)?pornhost\.com/([0-9]+/[0-9]+\.html|[0-9]+)'
     __version__ = "0.2"
     __description__ = """Pornhost.com hoster plugin"""
     __author_name__ = "jeix"
diff --git a/pyload/plugins/hoster/PornhubCom.py b/pyload/plugins/hoster/PornhubCom.py
index 9df171aa9..29205b381 100644
--- a/pyload/plugins/hoster/PornhubCom.py
+++ b/pyload/plugins/hoster/PornhubCom.py
@@ -7,7 +7,7 @@ from module.plugins.Hoster import Hoster
 class PornhubCom(Hoster):
     __name__ = "PornhubCom"
     __type__ = "hoster"
-    __pattern__ = r'http://[\w\.]*?pornhub\.com/view_video\.php\?viewkey=[\w\d]+'
+    __pattern__ = r'http://(?:www\.)?pornhub\.com/view_video\.php\?viewkey=[\w\d]+'
     __version__ = "0.5"
     __description__ = """Pornhub.com hoster plugin"""
     __author_name__ = "jeix"
diff --git a/pyload/plugins/hoster/Premium4Me.py b/pyload/plugins/hoster/Premium4Me.py
index 3501c2096..e127a9ac3 100644
--- a/pyload/plugins/hoster/Premium4Me.py
+++ b/pyload/plugins/hoster/Premium4Me.py
@@ -13,7 +13,7 @@ class Premium4Me(Hoster):
     __version__ = "0.08"
     __type__ = "hoster"
 
-    __pattern__ = r"http://premium.to/.*"
+    __pattern__ = r"http://(?:www\.)?premium.to/.*"
     __description__ = """Premium.to hoster plugin"""
     __author_name__ = ("RaNaN", "zoidberg", "stickell")
     __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")
diff --git a/pyload/plugins/hoster/QuickshareCz.py b/pyload/plugins/hoster/QuickshareCz.py
index 81764ef02..b6f4e1bfb 100644
--- a/pyload/plugins/hoster/QuickshareCz.py
+++ b/pyload/plugins/hoster/QuickshareCz.py
@@ -26,7 +26,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class QuickshareCz(SimpleHoster):
     __name__ = "QuickshareCz"
     __type__ = "hoster"
-    __pattern__ = r"http://.*quickshare.cz/stahnout-soubor/.*"
+    __pattern__ = r"http://(?:[^/]*\.)?quickshare.cz/stahnout-soubor/.*"
     __version__ = "0.54"
     __description__ = """Quickshare.cz hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/RapidshareCom.py b/pyload/plugins/hoster/RapidshareCom.py
index 59e2b0e91..8ecea6886 100644
--- a/pyload/plugins/hoster/RapidshareCom.py
+++ b/pyload/plugins/hoster/RapidshareCom.py
@@ -51,7 +51,7 @@ def getInfo(urls):
 class RapidshareCom(Hoster):
     __name__ = "RapidshareCom"
     __type__ = "hoster"
-    __pattern__ = r"https?://[\w\.]*?rapidshare.com/(?:files/(?P<id>\d*?)/(?P<name>[^?]+)|#!download\|(?:\w+)\|(?P<id_new>\d+)\|(?P<name_new>[^|]+))"
+    __pattern__ = r"https?://(?:www\.)?rapidshare.com/(?:files/(?P<id>\d*?)/(?P<name>[^?]+)|#!download\|(?:\w+)\|(?P<id_new>\d+)\|(?P<name_new>[^|]+))"
     __version__ = "1.39"
     __description__ = """Rapidshare.com hoster plugin"""
     __config__ = [("server",
diff --git a/pyload/plugins/hoster/RarefileNet.py b/pyload/plugins/hoster/RarefileNet.py
index 3c887e66c..cd88514d9 100644
--- a/pyload/plugins/hoster/RarefileNet.py
+++ b/pyload/plugins/hoster/RarefileNet.py
@@ -9,7 +9,7 @@ from module.utils import html_unescape
 class RarefileNet(XFileSharingPro):
     __name__ = "RarefileNet"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*rarefile.net/\w{12}"
+    __pattern__ = r"http://(?:www\.)?rarefile.net/\w{12}"
     __version__ = "0.03"
     __description__ = """Rarefile.net hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/RealdebridCom.py b/pyload/plugins/hoster/RealdebridCom.py
index 58e64c006..fc863863e 100644
--- a/pyload/plugins/hoster/RealdebridCom.py
+++ b/pyload/plugins/hoster/RealdebridCom.py
@@ -15,7 +15,7 @@ class RealdebridCom(Hoster):
     __version__ = "0.53"
     __type__ = "hoster"
 
-    __pattern__ = r"https?://.*real-debrid\..*"
+    __pattern__ = r"https?://(?:[^/]*\.)?real-debrid\..*"
     __description__ = """Real-Debrid.com hoster plugin"""
     __author_name__ = "Devirex Hazzard"
     __author_mail__ = "naibaf_11@yahoo.de"
diff --git a/pyload/plugins/hoster/RedtubeCom.py b/pyload/plugins/hoster/RedtubeCom.py
index ebea2b2dc..a2bbf3883 100644
--- a/pyload/plugins/hoster/RedtubeCom.py
+++ b/pyload/plugins/hoster/RedtubeCom.py
@@ -8,7 +8,7 @@ from module.unescape import unescape
 class RedtubeCom(Hoster):
     __name__ = "RedtubeCom"
     __type__ = "hoster"
-    __pattern__ = r'http://[\w\.]*?redtube\.com/\d+'
+    __pattern__ = r'http://(?:www\.)?redtube\.com/\d+'
     __version__ = "0.2"
     __description__ = """Redtube.com hoster plugin"""
     __author_name__ = "jeix"
diff --git a/pyload/plugins/hoster/SecureUploadEu.py b/pyload/plugins/hoster/SecureUploadEu.py
index 29cc43ea0..ffb1aedab 100644
--- a/pyload/plugins/hoster/SecureUploadEu.py
+++ b/pyload/plugins/hoster/SecureUploadEu.py
@@ -6,7 +6,7 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf
 class SecureUploadEu(XFileSharingPro):
     __name__ = "SecureUploadEu"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?secureupload\.eu/(\w){12}(/\w+)"
+    __pattern__ = r"http://(?:www\.)?secureupload\.eu/(\w){12}(/\w+)"
     __version__ = "0.01"
     __description__ = """SecureUpload.eu hoster plugin"""
     __author_name__ = "z00nx"
diff --git a/pyload/plugins/hoster/SendmywayCom.py b/pyload/plugins/hoster/SendmywayCom.py
index af1f8b184..606a5f61f 100644
--- a/pyload/plugins/hoster/SendmywayCom.py
+++ b/pyload/plugins/hoster/SendmywayCom.py
@@ -6,7 +6,7 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf
 class SendmywayCom(XFileSharingPro):
     __name__ = "SendmywayCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*?sendmyway.com/\w{12}"
+    __pattern__ = r"http://(?:www\.)?sendmyway.com/\w{12}"
     __version__ = "0.01"
     __description__ = """SendMyWay hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/SendspaceCom.py b/pyload/plugins/hoster/SendspaceCom.py
index 325a0aca3..a3959e6be 100644
--- a/pyload/plugins/hoster/SendspaceCom.py
+++ b/pyload/plugins/hoster/SendspaceCom.py
@@ -24,7 +24,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class SendspaceCom(SimpleHoster):
     __name__ = "SendspaceCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?sendspace.com/file/.*"
+    __pattern__ = r"http://(?:www\.)?sendspace.com/file/.*"
     __version__ = "0.13"
     __description__ = """Sendspace.com hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/Share4webCom.py b/pyload/plugins/hoster/Share4webCom.py
index 5e96866e8..7d52534cf 100644
--- a/pyload/plugins/hoster/Share4webCom.py
+++ b/pyload/plugins/hoster/Share4webCom.py
@@ -7,7 +7,7 @@ from module.plugins.internal.SimpleHoster import create_getInfo
 class Share4webCom(UnibytesCom):
     __name__ = "Share4webCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?share4web\.com/get/\w+"
+    __pattern__ = r"http://(?:www\.)?share4web\.com/get/\w+"
     __version__ = "0.1"
     __description__ = """Share4web.com hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/Share76Com.py b/pyload/plugins/hoster/Share76Com.py
index f65cd0609..1f666adbf 100644
--- a/pyload/plugins/hoster/Share76Com.py
+++ b/pyload/plugins/hoster/Share76Com.py
@@ -6,7 +6,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 class Share76Com(DeadHoster):
     __name__ = "Share76Com"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*?share76.com/\w{12}"
+    __pattern__ = r"http://(?:www\.)?share76.com/\w{12}"
     __version__ = "0.04"
     __description__ = """Share76.com hoster plugin"""
     __author_name__ = "me"
diff --git a/pyload/plugins/hoster/SharebeesCom.py b/pyload/plugins/hoster/SharebeesCom.py
index 9530328d4..f371d20a2 100644
--- a/pyload/plugins/hoster/SharebeesCom.py
+++ b/pyload/plugins/hoster/SharebeesCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 class SharebeesCom(DeadHoster):
     __name__ = "SharebeesCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*?sharebees.com/\w{12}"
+    __pattern__ = r"http://(?:www\.)?sharebees.com/\w{12}"
     __version__ = "0.02"
     __description__ = """ShareBees hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/ShareplaceCom.py b/pyload/plugins/hoster/ShareplaceCom.py
index 192dd092f..5174a7ec2 100644
--- a/pyload/plugins/hoster/ShareplaceCom.py
+++ b/pyload/plugins/hoster/ShareplaceCom.py
@@ -8,7 +8,7 @@ from module.plugins.Hoster import Hoster
 class ShareplaceCom(Hoster):
     __name__ = "ShareplaceCom"
     __type__ = "hoster"
-    __pattern__ = r"(http://)?(www\.)?shareplace\.(com|org)/\?[a-zA-Z0-9]+"
+    __pattern__ = r"(http://)?(?:www\.)?shareplace\.(com|org)/\?[a-zA-Z0-9]+"
     __version__ = "0.11"
     __description__ = """Shareplace.com hoster plugin"""
     __author_name__ = "ACCakut"
diff --git a/pyload/plugins/hoster/ShragleCom.py b/pyload/plugins/hoster/ShragleCom.py
index 8787100d0..9b53d4f54 100644
--- a/pyload/plugins/hoster/ShragleCom.py
+++ b/pyload/plugins/hoster/ShragleCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 class ShragleCom(DeadHoster):
     __name__ = "ShragleCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:www.)?(cloudnator|shragle).com/files/(?P<ID>.*?)/"
+    __pattern__ = r"http://(?:www\.)?(cloudnator|shragle).com/files/(?P<ID>.*?)/"
     __version__ = "0.22"
     __description__ = """Cloudnator.com (Shragle.com) hoster plugin"""
     __author_name__ = ("RaNaN", "zoidberg")
diff --git a/pyload/plugins/hoster/SimplydebridCom.py b/pyload/plugins/hoster/SimplydebridCom.py
index af1cde8a1..97078f75c 100644
--- a/pyload/plugins/hoster/SimplydebridCom.py
+++ b/pyload/plugins/hoster/SimplydebridCom.py
@@ -10,7 +10,7 @@ class SimplydebridCom(Hoster):
     __name__ = "SimplydebridCom"
     __version__ = "0.1"
     __type__ = "hoster"
-    __pattern__ = r"http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/sd.php/*"
+    __pattern__ = r"http://(?:www\.)?\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/sd.php/*"
     __description__ = """Simply-debrid.com hoster plugin"""
     __author_name__ = "Kagenoshin"
     __author_mail__ = "kagenoshin@gmx.ch"
diff --git a/pyload/plugins/hoster/SpeedLoadOrg.py b/pyload/plugins/hoster/SpeedLoadOrg.py
index c0459db45..e3d300d40 100644
--- a/pyload/plugins/hoster/SpeedLoadOrg.py
+++ b/pyload/plugins/hoster/SpeedLoadOrg.py
@@ -6,7 +6,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 class SpeedLoadOrg(DeadHoster):
     __name__ = "SpeedLoadOrg"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?speedload\.org/(?P<ID>\w+)"
+    __pattern__ = r"http://(?:www\.)?speedload\.org/(?P<ID>\w+)"
     __version__ = "1.02"
     __description__ = """Speedload.org hoster plugin"""
     __author_name__ = "stickell"
diff --git a/pyload/plugins/hoster/SpeedfileCz.py b/pyload/plugins/hoster/SpeedfileCz.py
index 2405250ab..76625c3c4 100644
--- a/pyload/plugins/hoster/SpeedfileCz.py
+++ b/pyload/plugins/hoster/SpeedfileCz.py
@@ -23,7 +23,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 class SpeedfileCz(DeadHoster):
     __name__ = "SpeedFileCz"
     __type__ = "hoster"
-    __pattern__ = r"http://speedfile.cz/.*"
+    __pattern__ = r"http://(?:www\.)?speedfile.cz/.*"
     __version__ = "0.32"
     __description__ = """Speedfile.cz hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/StreamCz.py b/pyload/plugins/hoster/StreamCz.py
index fbf2b8b25..9b51a4abd 100644
--- a/pyload/plugins/hoster/StreamCz.py
+++ b/pyload/plugins/hoster/StreamCz.py
@@ -39,7 +39,7 @@ def getInfo(urls):
 class StreamCz(Hoster):
     __name__ = "StreamCz"
     __type__ = "hoster"
-    __pattern__ = r"http://www.stream.cz/[^/]+/\d+.*"
+    __pattern__ = r"http://(?:www\.)?stream.cz/[^/]+/\d+.*"
     __version__ = "0.1"
     __description__ = """Stream.cz hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/StreamcloudEu.py b/pyload/plugins/hoster/StreamcloudEu.py
index 128a6fe67..087ad36f4 100644
--- a/pyload/plugins/hoster/StreamcloudEu.py
+++ b/pyload/plugins/hoster/StreamcloudEu.py
@@ -10,7 +10,7 @@ from module.network.HTTPRequest import HTTPRequest
 class StreamcloudEu(XFileSharingPro):
     __name__ = "StreamcloudEu"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?streamcloud\.eu/\S+"
+    __pattern__ = r"http://(?:www\.)?streamcloud\.eu/\S+"
     __version__ = "0.03"
     __description__ = """Streamcloud.eu hoster plugin"""
     __author_name__ = "seoester"
diff --git a/pyload/plugins/hoster/TurbobitNet.py b/pyload/plugins/hoster/TurbobitNet.py
index 28812d6c9..510fadf00 100644
--- a/pyload/plugins/hoster/TurbobitNet.py
+++ b/pyload/plugins/hoster/TurbobitNet.py
@@ -36,7 +36,7 @@ from module.plugins.internal.CaptchaService import ReCaptcha
 class TurbobitNet(SimpleHoster):
     __name__ = "TurbobitNet"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)?(turbobit.net|unextfiles.com)/(?!download/folder/)(?:download/free/)?(?P<ID>\w+).*"
+    __pattern__ = r"http://(?:www\.)?(turbobit.net|unextfiles.com)/(?!download/folder/)(?:download/free/)?(?P<ID>\w+).*"
     __version__ = "0.11"
     __description__ = """Turbobit.net plugin"""
     __author_name__ = "zoidberg"
@@ -46,7 +46,7 @@ class TurbobitNet(SimpleHoster):
     FILE_INFO_PATTERN = r"<span class='file-icon1[^>]*>(?P<N>[^<]+)</span>\s*\((?P<S>[^\)]+)\)\s*</h1>"
     FILE_NAME_PATTERN = r'<meta name="keywords" content="\s+(?P<N>[^,]+)'  # full name but missing on page2
     FILE_OFFLINE_PATTERN = r'<h2>File Not Found</h2>|html\(\'File (?:was )?not found'
-    FILE_URL_REPLACEMENTS = [(r"http://(?:\w*\.)?(turbobit.net|unextfiles.com)/(?:download/free/)?(?P<ID>\w+).*",
+    FILE_URL_REPLACEMENTS = [(r"http://(?:www\.)?(turbobit.net|unextfiles.com)/(?:download/free/)?(?P<ID>\w+).*",
                               "http://turbobit.net/\g<ID>.html")]
     SH_COOKIES = [("turbobit.net", "user_lang", "en")]
 
diff --git a/pyload/plugins/hoster/TurbouploadCom.py b/pyload/plugins/hoster/TurbouploadCom.py
index 570101b77..87ce6a9ac 100644
--- a/pyload/plugins/hoster/TurbouploadCom.py
+++ b/pyload/plugins/hoster/TurbouploadCom.py
@@ -23,7 +23,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 class TurbouploadCom(DeadHoster):
     __name__ = "TurbouploadCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)?turboupload.com/(\w+).*"
+    __pattern__ = r"http://(?:www\.)?turboupload.com/(\w+).*"
     __version__ = "0.03"
     __description__ = """Turboupload.com hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/TwoSharedCom.py b/pyload/plugins/hoster/TwoSharedCom.py
index 6de89bdbd..0568d01b6 100644
--- a/pyload/plugins/hoster/TwoSharedCom.py
+++ b/pyload/plugins/hoster/TwoSharedCom.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class TwoSharedCom(SimpleHoster):
     __name__ = "TwoSharedCom"
     __type__ = "hoster"
-    __pattern__ = r"http://[\w\.]*?2shared.com/(account/)?(download|get|file|document|photo|video|audio)/.*"
+    __pattern__ = r"http://(?:www\.)?2shared.com/(account/)?(download|get|file|document|photo|video|audio)/.*"
     __version__ = "0.11"
     __description__ = """2Shared.com hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/UlozTo.py b/pyload/plugins/hoster/UlozTo.py
index 67f332062..1151805f4 100644
--- a/pyload/plugins/hoster/UlozTo.py
+++ b/pyload/plugins/hoster/UlozTo.py
@@ -29,7 +29,7 @@ def convertDecimalPrefix(m):
 class UlozTo(SimpleHoster):
     __name__ = "UlozTo"
     __type__ = "hoster"
-    __pattern__ = r"http://(\w*\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj.cz|zachowajto.pl)/(?:live/)?(?P<id>\w+/[^/?]*)"
+    __pattern__ = r"http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj.cz|zachowajto.pl)/(?:live/)?(?P<id>\w+/[^/?]*)"
     __version__ = "0.96"
     __description__ = """Uloz.to hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/UloziskoSk.py b/pyload/plugins/hoster/UloziskoSk.py
index c70308205..ed55335d2 100644
--- a/pyload/plugins/hoster/UloziskoSk.py
+++ b/pyload/plugins/hoster/UloziskoSk.py
@@ -24,7 +24,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, P
 class UloziskoSk(SimpleHoster):
     __name__ = "UloziskoSk"
     __type__ = "hoster"
-    __pattern__ = r"http://(\w*\.)?ulozisko.sk/.*"
+    __pattern__ = r"http://(?:www\.)?ulozisko.sk/.*"
     __version__ = "0.23"
     __description__ = """Ulozisko.sk hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/UnibytesCom.py b/pyload/plugins/hoster/UnibytesCom.py
index 88f6decb0..df3cfd92e 100644
--- a/pyload/plugins/hoster/UnibytesCom.py
+++ b/pyload/plugins/hoster/UnibytesCom.py
@@ -25,7 +25,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class UnibytesCom(SimpleHoster):
     __name__ = "UnibytesCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?unibytes\.com/[a-zA-Z0-9-._ ]{11}B"
+    __pattern__ = r"http://(?:www\.)?unibytes\.com/[a-zA-Z0-9-._ ]{11}B"
     __version__ = "0.1"
     __description__ = """UniBytes.com hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/UnrestrictLi.py b/pyload/plugins/hoster/UnrestrictLi.py
index f745f1bf6..501fab1da 100644
--- a/pyload/plugins/hoster/UnrestrictLi.py
+++ b/pyload/plugins/hoster/UnrestrictLi.py
@@ -36,7 +36,7 @@ class UnrestrictLi(Hoster):
     __name__ = "UnrestrictLi"
     __version__ = "0.11"
     __type__ = "hoster"
-    __pattern__ = r"https?://.*(unrestrict|unr)\.li"
+    __pattern__ = r"https?://(?:[^/]*\.)?(unrestrict|unr)\.li"
     __description__ = """Unrestrict.li hoster plugin"""
     __author_name__ = "stickell"
     __author_mail__ = "l.stickell@yahoo.it"
diff --git a/pyload/plugins/hoster/UploadedTo.py b/pyload/plugins/hoster/UploadedTo.py
index c376954fa..6e6f0aeaf 100644
--- a/pyload/plugins/hoster/UploadedTo.py
+++ b/pyload/plugins/hoster/UploadedTo.py
@@ -88,7 +88,7 @@ def getInfo(urls):
 class UploadedTo(Hoster):
     __name__ = "UploadedTo"
     __type__ = "hoster"
-    __pattern__ = r"https?://[\w\.-]*?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)"
+    __pattern__ = r"https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)"
     __version__ = "0.72"
     __description__ = """Uploaded.net hoster plugin"""
     __author_name__ = ("spoob", "mkaay", "zoidberg", "netpok", "stickell")
diff --git a/pyload/plugins/hoster/WarserverCz.py b/pyload/plugins/hoster/WarserverCz.py
index 853f86b3f..48c41e9e4 100644
--- a/pyload/plugins/hoster/WarserverCz.py
+++ b/pyload/plugins/hoster/WarserverCz.py
@@ -28,7 +28,7 @@ from module.utils import html_unescape
 class WarserverCz(SimpleHoster):
     __name__ = "WarserverCz"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)?warserver.cz/stahnout/(?P<ID>\d+)/.+"
+    __pattern__ = r"http://(?:www\.)?warserver.cz/stahnout/(?P<ID>\d+)/.+"
     __version__ = "0.12"
     __description__ = """Warserver.cz hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/WrzucTo.py b/pyload/plugins/hoster/WrzucTo.py
index c53c3c247..d06b70946 100644
--- a/pyload/plugins/hoster/WrzucTo.py
+++ b/pyload/plugins/hoster/WrzucTo.py
@@ -26,7 +26,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class WrzucTo(SimpleHoster):
     __name__ = "WrzucTo"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w+\.)*?wrzuc\.to/([a-zA-Z0-9]+(\.wt|\.html)|(\w+/?linki/[a-zA-Z0-9]+))"
+    __pattern__ = r"http://(?:www\.)?wrzuc\.to/([a-zA-Z0-9]+(\.wt|\.html)|(\w+/?linki/[a-zA-Z0-9]+))"
     __version__ = "0.01"
     __description__ = """Wrzuc.to hoster plugin"""
     __author_name__ = "zoidberg"
diff --git a/pyload/plugins/hoster/WuploadCom.py b/pyload/plugins/hoster/WuploadCom.py
index b5d664aa6..41e32fa73 100644
--- a/pyload/plugins/hoster/WuploadCom.py
+++ b/pyload/plugins/hoster/WuploadCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 class WuploadCom(DeadHoster):
     __name__ = "WuploadCom"
     __type__ = "hoster"
-    __pattern__ = r"http://[\w\.]*?wupload\..*?/file/(([a-z][0-9]+/)?[0-9]+)(/.*)?"
+    __pattern__ = r"http://(?:www\.)?wupload\..*?/file/(([a-z][0-9]+/)?[0-9]+)(/.*)?"
     __version__ = "0.23"
     __description__ = """Wupload.com hoster plugin"""
     __author_name__ = ("jeix", "Paul King")
diff --git a/pyload/plugins/hoster/X7To.py b/pyload/plugins/hoster/X7To.py
index cd9b8aa76..19bd2f1ed 100644
--- a/pyload/plugins/hoster/X7To.py
+++ b/pyload/plugins/hoster/X7To.py
@@ -6,7 +6,7 @@ from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 class X7To(DeadHoster):
     __name__ = "X7To"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:www.)?x7.to/"
+    __pattern__ = r"http://(?:www\.)?x7.to/"
     __version__ = "0.41"
     __description__ = """X7.to hoster plugin"""
     __author_name__ = "ernieb"
diff --git a/pyload/plugins/hoster/XHamsterCom.py b/pyload/plugins/hoster/XHamsterCom.py
index b1fe8fe6f..7d33909f7 100644
--- a/pyload/plugins/hoster/XHamsterCom.py
+++ b/pyload/plugins/hoster/XHamsterCom.py
@@ -18,7 +18,7 @@ def clean_json(json_expr):
 class XHamsterCom(Hoster):
     __name__ = "XHamsterCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?xhamster\.com/movies/.+"
+    __pattern__ = r"http://(?:www\.)?xhamster\.com/movies/.+"
     __version__ = "0.12"
     __config__ = [("type", ".mp4;.flv", "Preferred type", ".mp4")]
     __description__ = """XHamster.com hoster plugin"""
diff --git a/pyload/plugins/hoster/XVideosCom.py b/pyload/plugins/hoster/XVideosCom.py
index 51b3e59bf..ffe6c4c33 100644
--- a/pyload/plugins/hoster/XVideosCom.py
+++ b/pyload/plugins/hoster/XVideosCom.py
@@ -9,7 +9,7 @@ from module.plugins.Hoster import Hoster
 class XVideosCom(Hoster):
     __name__ = "XVideos.com"
     __version__ = "0.1"
-    __pattern__ = r"http://www\.xvideos\.com/video([0-9]+)/.*"
+    __pattern__ = r"http://(?:www\.)?xvideos\.com/video([0-9]+)/.*"
     __description__ = """XVideos.com hoster plugin"""
     __author_name__ = ""
     __author_mail__ = ""
diff --git a/pyload/plugins/hoster/Xdcc.py b/pyload/plugins/hoster/Xdcc.py
index 8e34977bb..d358c63b5 100644
--- a/pyload/plugins/hoster/Xdcc.py
+++ b/pyload/plugins/hoster/Xdcc.py
@@ -34,7 +34,7 @@ from module.plugins.Hoster import Hoster
 class Xdcc(Hoster):
     __name__ = "Xdcc"
     __version__ = "0.32"
-    __pattern__ = r'xdcc://.*?(/#?.*?)?/.*?/#?\d+/?'  # xdcc://irc.Abjects.net/#channel/[XDCC]|Shit/#0004/
+    __pattern__ = r'xdcc://([^/]*?)(/#?.*?)?/.*?/#?\d+/?'  # xdcc://irc.Abjects.net/#channel/[XDCC]|Shit/#0004/
     __type__ = "hoster"
     __config__ = [("nick", "str", "Nickname", "pyload"),
                   ("ident", "str", "Ident", "pyloadident"),
diff --git a/pyload/plugins/hoster/YoupornCom.py b/pyload/plugins/hoster/YoupornCom.py
index 7dd537950..65968ba13 100644
--- a/pyload/plugins/hoster/YoupornCom.py
+++ b/pyload/plugins/hoster/YoupornCom.py
@@ -7,7 +7,7 @@ from module.plugins.Hoster import Hoster
 class YoupornCom(Hoster):
     __name__ = "YoupornCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?youporn\.com/watch/.+"
+    __pattern__ = r"http://(?:www\.)?youporn\.com/watch/.+"
     __version__ = "0.2"
     __description__ = """Youporn.com hoster plugin"""
     __author_name__ = "willnix"
diff --git a/pyload/plugins/hoster/YourfilesTo.py b/pyload/plugins/hoster/YourfilesTo.py
index 66e0890e7..a32af4932 100644
--- a/pyload/plugins/hoster/YourfilesTo.py
+++ b/pyload/plugins/hoster/YourfilesTo.py
@@ -8,7 +8,7 @@ from module.plugins.Hoster import Hoster
 class YourfilesTo(Hoster):
     __name__ = "YourfilesTo"
     __type__ = "hoster"
-    __pattern__ = r"(http://)?(www\.)?yourfiles\.(to|biz)/\?d=[a-zA-Z0-9]+"
+    __pattern__ = r"(http://)?(?:www\.)?yourfiles\.(to|biz)/\?d=[a-zA-Z0-9]+"
     __version__ = "0.21"
     __description__ = """Youfiles.to hoster plugin"""
     __author_name__ = ("jeix", "skydancer")
diff --git a/pyload/plugins/hoster/YoutubeCom.py b/pyload/plugins/hoster/YoutubeCom.py
index 90e4dd632..06eba4d09 100644
--- a/pyload/plugins/hoster/YoutubeCom.py
+++ b/pyload/plugins/hoster/YoutubeCom.py
@@ -34,7 +34,7 @@ def which(program):
 class YoutubeCom(Hoster):
     __name__ = "YoutubeCom"
     __type__ = "hoster"
-    __pattern__ = r"https?://(?:[^/]*?)youtube\.com/watch.*?[?&]v=.*"
+    __pattern__ = r"https?://(?:[^/]*\.)?youtube\.com/watch.*?[?&]v=.*"
     __version__ = "0.39"
     __config__ = [("quality", "sd;hd;fullhd;240p;360p;480p;720p;1080p;3072p", "Quality Setting", "hd"),
                   ("fmt", "int", "FMT/ITAG Number (5-102, 0 for auto)", 0),
diff --git a/pyload/plugins/hoster/ZDF.py b/pyload/plugins/hoster/ZDF.py
index b920f11f5..3407b2e6d 100644
--- a/pyload/plugins/hoster/ZDF.py
+++ b/pyload/plugins/hoster/ZDF.py
@@ -13,7 +13,7 @@ class ZDF(Hoster):
     # http://github.com/enkore/zdfm/
     __name__ = "ZDF Mediathek"
     __version__ = "0.8"
-    __pattern__ = r"http://www\.zdf\.de/ZDFmediathek/[^0-9]*([0-9]+)[^0-9]*"
+    __pattern__ = r"http://(?:www\.)?zdf\.de/ZDFmediathek/[^0-9]*([0-9]+)[^0-9]*"
     __description__ = """ZDF.de hoster plugin"""
     __author_name__ = ""
     __author_mail__ = ""
diff --git a/pyload/plugins/hoster/ZeveraCom.py b/pyload/plugins/hoster/ZeveraCom.py
index 6d41d26e5..f910852c8 100644
--- a/pyload/plugins/hoster/ZeveraCom.py
+++ b/pyload/plugins/hoster/ZeveraCom.py
@@ -7,7 +7,7 @@ class ZeveraCom(Hoster):
     __name__ = "ZeveraCom"
     __version__ = "0.21"
     __type__ = "hoster"
-    __pattern__ = r"http://zevera.com/.*"
+    __pattern__ = r"http://(?:www\.)?zevera.com/.*"
     __description__ = """Zevera.com hoster plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
author	Walter Purcaro <vuolter@gmail.com>	2014-04-11 12:25:21 +0200
committer	Stefano <l.stickell@yahoo.it>	2014-04-21 17:22:13 +0200
commit	e6195a2609d0880b518eee8d94b5f34582341ffa (patch)
tree	faae78437c27291c00397ea343639f6a3a9a5a3e
parent	Fix header # -- coding: utf-8 -- (diff)
download	pyload-e6195a2609d0880b518eee8d94b5f34582341ffa.tar.xz