Merge branch 'stable' into 0.4.10

Conflicts:
	module/PluginThread.py
	module/plugins/hoster/XFileSharingPro.py
	module/plugins/internal/CaptchaService.py
	pyload/api/__init__.py
	pyload/manager/AccountManager.py
	pyload/manager/AddonManager.py
	pyload/manager/CaptchaManager.py
	pyload/manager/PluginManager.py
	pyload/network/HTTPRequest.py
	pyload/network/XDCCRequest.py
	pyload/plugins/Plugin.py
	pyload/plugins/account/EasybytezCom.py
	pyload/plugins/crypter/C1neonCom.py
	pyload/plugins/crypter/CryptItCom.py
	pyload/plugins/crypter/DuploadOrg.py
	pyload/plugins/crypter/FilebeerInfo.py
	pyload/plugins/crypter/FilesonicCom.py
	pyload/plugins/crypter/FiredriveCom.py
	pyload/plugins/crypter/HotfileCom.py
	pyload/plugins/crypter/ILoadTo.py
	pyload/plugins/crypter/LofCc.py
	pyload/plugins/crypter/MBLinkInfo.py
	pyload/plugins/crypter/MegauploadCom.py
	pyload/plugins/crypter/Movie2kTo.py
	pyload/plugins/crypter/MultiuploadCom.py
	pyload/plugins/crypter/OronCom.py
	pyload/plugins/crypter/RSLayerCom.py
	pyload/plugins/crypter/SecuredIn.py
	pyload/plugins/crypter/SharingmatrixCom.py
	pyload/plugins/crypter/SpeedLoadOrg.py
	pyload/plugins/crypter/StealthTo.py
	pyload/plugins/crypter/TrailerzoneInfo.py
	pyload/plugins/crypter/WiiReloadedOrg.py
	pyload/plugins/crypter/WuploadCom.py
	pyload/plugins/internal/Account.py
	pyload/plugins/internal/Addon.py
	pyload/plugins/internal/BasePlugin.py
	pyload/plugins/internal/Container.py
	pyload/plugins/internal/Crypter.py
	pyload/plugins/internal/DeadCrypter.py
	pyload/plugins/internal/DeadHoster.py
	pyload/plugins/internal/Hoster.py
	pyload/plugins/internal/SimpleCrypter.py
	pyload/utils/__init__.py

1 files changed, 5 insertions, 5 deletions

diff --git a/pyload/plugins/hook/XFileSharingPro.py b/pyload/plugins/hook/XFileSharingPro.py
index 520e30964..268e91909 100644
--- a/pyload/plugins/hook/XFileSharingPro.py
+++ b/pyload/plugins/hook/XFileSharingPro.py
@@ -8,11 +8,11 @@ from pyload.plugins.internal.Addon import Hook
 class XFileSharingPro(Hook):
     __name__    = "XFileSharingPro"
     __type__    = "hook"
-    __version__ = "0.22"
+    __version__ = "0.24"
 
     __config__ = [("activated", "bool", "Activated", True),
-                  ("use_hoster_list", "bool", "Load listed hosters only", False),
-                  ("use_crypter_list", "bool", "Load listed crypters only", False),
+                  ("use_hoster_list", "bool", "Load listed hosters only", True),
+                  ("use_crypter_list", "bool", "Load listed crypters only", True),
                   ("use_builtin_list", "bool", "Load built-in plugin list", True),
                   ("hoster_list", "str", "Hoster list (comma separated)", ""),
                   ("crypter_list", "str", "Crypter list (comma separated)", "")]
@@ -23,8 +23,8 @@ class XFileSharingPro(Hook):
 
 
     # event_list = ["pluginConfigChanged"]
-    regexp = {'hoster' : (r'https?://(?:www\.)?([\w^_]+(?:\.[a-zA-Z]{2,})+(?:\:\d+)?)/(?:embed-)?\w{12}',
-                          r'https?://(?:[^/]+\.)?(%s)/(?:embed-)?\w{12}\W?'),
+    regexp = {'hoster' : (r'https?://(?:www\.)?([\w^_]+(?:\.[a-zA-Z]{2,})+(?:\:\d+)?)/(?:embed-)?\w{12}(?:\W|$)',
+                          r'https?://(?:[^/]+\.)?(%s)/(?:embed-)?\w+'),
               'crypter': (r'https?://(?:www\.)?([\w^_]+(?:\.[a-zA-Z]{2,})+(?:\:\d+)?)/(?:user|folder)s?/\w+',
                           r'https?://(?:[^/]+\.)?(%s)/(?:user|folder)s?/\w+')}