Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/accounts/Keep2ShareCc.py
	module/plugins/captcha/OCR.py
	module/plugins/captcha/captcha.py
	module/plugins/crypter/DailymotionBatch.py
	module/plugins/crypter/DailymotionComFolder.py
	module/plugins/crypter/YoutubeBatch.py
	module/plugins/crypter/YoutubeComFolder.py
	module/plugins/internal/CaptchaService.py
	pyload/plugin/Extractor.py
	pyload/plugin/OCR.py
	pyload/plugin/account/DebridItaliaCom.py
	pyload/plugin/account/MegaRapidCz.py
	pyload/plugin/account/NoPremiumPl.py
	pyload/plugin/account/RapideoPl.py
	pyload/plugin/addon/AndroidPhoneNotify.py
	pyload/plugin/addon/Checksum.py
	pyload/plugin/addon/ClickAndLoad.py
	pyload/plugin/addon/DeleteFinished.py
	pyload/plugin/addon/DownloadScheduler.py
	pyload/plugin/addon/ExternalScripts.py
	pyload/plugin/addon/ExtractArchive.py
	pyload/plugin/addon/HotFolder.py
	pyload/plugin/addon/IRCInterface.py
	pyload/plugin/addon/JustPremium.py
	pyload/plugin/addon/MergeFiles.py
	pyload/plugin/addon/MultiHome.py
	pyload/plugin/addon/RestartFailed.py
	pyload/plugin/addon/RestartSlow.py
	pyload/plugin/addon/SkipRev.py
	pyload/plugin/addon/UnSkipOnFail.py
	pyload/plugin/addon/UpdateManager.py
	pyload/plugin/addon/WindowsPhoneNotify.py
	pyload/plugin/crypter/DDLMusicOrg.py
	pyload/plugin/crypter/DailymotionBatch.py
	pyload/plugin/crypter/DevhostSt.py
	pyload/plugin/crypter/EmbeduploadCom.py
	pyload/plugin/crypter/MultiloadCz.py
	pyload/plugin/crypter/YoutubeBatch.py
	pyload/plugin/extractor/SevenZip.py
	pyload/plugin/extractor/UnRar.py
	pyload/plugin/extractor/UnZip.py
	pyload/plugin/hook/BypassCaptcha.py
	pyload/plugin/hook/Captcha9Kw.py
	pyload/plugin/hook/CaptchaBrotherhood.py
	pyload/plugin/hook/DeathByCaptcha.py
	pyload/plugin/hook/ExpertDecoders.py
	pyload/plugin/hook/ImageTyperz.py
	pyload/plugin/hook/XFileSharingPro.py
	pyload/plugin/hoster/AlldebridCom.py
	pyload/plugin/hoster/CzshareCom.py
	pyload/plugin/hoster/EuroshareEu.py
	pyload/plugin/hoster/FastixRu.py
	pyload/plugin/hoster/FastshareCz.py
	pyload/plugin/hoster/GooIm.py
	pyload/plugin/hoster/MediafireCom.py
	pyload/plugin/hoster/MegaDebridEu.py
	pyload/plugin/hoster/NitroflareCom.py
	pyload/plugin/hoster/OverLoadMe.py
	pyload/plugin/hoster/PremiumTo.py
	pyload/plugin/hoster/PremiumizeMe.py
	pyload/plugin/hoster/RapidgatorNet.py
	pyload/plugin/hoster/RealdebridCom.py
	pyload/plugin/hoster/SimplyPremiumCom.py
	pyload/plugin/hoster/SimplydebridCom.py
	pyload/plugin/hoster/SmoozedCom.py
	pyload/plugin/hoster/SoundcloudCom.py
	pyload/plugin/hoster/UlozTo.py
	pyload/plugin/hoster/UploadableCh.py
	pyload/plugin/hoster/UploadedTo.py
	pyload/plugin/hoster/UploadheroCom.py
	pyload/plugin/hoster/VeehdCom.py
	pyload/plugin/hoster/VimeoCom.py
	pyload/plugin/hoster/ZeveraCom.py
	pyload/plugin/hoster/ZippyshareCom.py
	pyload/plugin/internal/BasePlugin.py
	pyload/plugin/internal/MultiHoster.py
	pyload/plugin/internal/SimpleDereferer.py
	pyload/plugin/internal/SimpleHoster.py
	pyload/plugin/internal/XFSHoster.py
	pyload/plugin/ocr/GigasizeCom.py
	pyload/plugin/ocr/LinksaveIn.py
	pyload/plugin/ocr/NetloadIn.py
	pyload/plugin/ocr/ShareonlineBiz.py

1 files changed, 81 insertions, 0 deletions

diff --git a/module/plugins/hooks/MegaRapidoNet.py b/module/plugins/hooks/MegaRapidoNet.py
new file mode 100644
index 000000000..fb5e77994
--- /dev/null
+++ b/module/plugins/hooks/MegaRapidoNet.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.plugins.internal.MultiHook import MultiHook
+
+
+class MegaRapidoNet(MultiHook):
+    __name__    = "MegaRapidoNet"
+    __type__    = "hook"
+    __version__ = "0.02"
+
+    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
+                  ("pluginlist"    , "str"                , "Plugin list (comma separated)", ""   ),
+                  ("reload"        , "bool"               , "Reload plugin list"           , True ),
+                  ("reloadinterval", "int"                , "Reload interval in hours"     , 12   )]
+
+    __description__ = """MegaRapido.net hook plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
+
+
+    def getHosters(self):
+        hosters = {'1fichier'    : [],#leave it there are so many possible addresses?
+                   '1st-files'   : ['1st-files.com'],
+                   '2shared'     : ['2shared.com'],
+                   '4shared'     : ['4shared.com', '4shared-china.com'],
+                   'asfile'      : ['http://asfile.com/'],
+                   'bitshare'    : ['bitshare.com'],
+                   'brupload'    : ['brupload.net'],
+                   'crocko'      : ['crocko.com','easy-share.com'],
+                   'dailymotion' : ['dailymotion.com'],
+                   'depfile'     : ['depfile.com'],
+                   'depositfiles': ['depositfiles.com', 'dfiles.eu'],
+                   'dizzcloud'   : ['dizzcloud.com'],
+                   'dl.dropbox'  : [],
+                   'extabit'     : ['extabit.com'],
+                   'extmatrix'   : ['extmatrix.com'],
+                   'facebook'    : [],
+                   'file4go'     : ['file4go.com'],
+                   'filecloud'   : ['filecloud.io','ifile.it','mihd.net'],
+                   'filefactory' : ['filefactory.com'],
+                   'fileom'      : ['fileom.com'],
+                   'fileparadox' : ['fileparadox.in'],
+                   'filepost'    : ['filepost.com', 'fp.io'],
+                   'filerio'     : ['filerio.in','filerio.com','filekeen.com'],
+                   'filesflash'  : ['filesflash.com'],
+                   'firedrive'   : ['firedrive.com', 'putlocker.com'],
+                   'flashx'      : [],
+                   'freakshare'  : ['freakshare.net', 'freakshare.com'],
+                   'gigasize'    : ['gigasize.com'],
+                   'hipfile'     : ['hipfile.com'],
+                   'junocloud'   : ['junocloud.me'],
+                   'letitbit'    : ['letitbit.net','shareflare.net'],
+                   'mediafire'   : ['mediafire.com'],
+                   'mega'        : ['mega.co.nz'],
+                   'megashares'  : ['megashares.com'],
+                   'metacafe'    : ['metacafe.com'],
+                   'netload'     : ['netload.in'],
+                   'oboom'       : ['oboom.com'],
+                   'rapidgator'  : ['rapidgator.net'],
+                   'rapidshare'  : ['rapidshare.com'],
+                   'rarefile'    : ['rarefile.net'],
+                   'ryushare'    : ['ryushare.com'],
+                   'sendspace'   : ['sendspace.com'],
+                   'turbobit'    : ['turbobit.net', 'unextfiles.com'],
+                   'uploadable'  : ['uploadable.ch'],
+                   'uploadbaz'   : ['uploadbaz.com'],
+                   'uploaded'    : ['uploaded.to', 'uploaded.net', 'ul.to'],
+                   'uploadhero'  : ['uploadhero.com'],
+                   'uploading'   : ['uploading.com'],
+                   'uptobox'     : ['uptobox.com'],
+                   'xvideos'     : ['xvideos.com'],
+                   'youtube'     : ['youtube.com']}
+
+        hoster_list = []
+
+        for item in hosters.itervalues():
+            hoster_list.extend(item)
+
+        return hoster_list