diff options
| author | 2014-09-07 23:40:50 +0200 | |
|---|---|---|
| committer | 2014-09-14 10:58:42 +0200 | |
| commit | 887ad58e4c6c20b992311bbdf931bcd18e73d384 (patch) | |
| tree | f31beb241bacca0bfea4c1acc4e9ace813755cef /module/plugins/accounts/FilefactoryCom.py | |
| parent | [AccountManager] Fixed #733 (diff) | |
| parent | [File4safe] distributing LINK_PATTERN (diff) | |
| download | pyload-887ad58e4c6c20b992311bbdf931bcd18e73d384.tar.xz | |
Merge branch 'stable' into 0.4.10
Conflicts:
	module/plugins/Account.py
	module/plugins/AccountManager.py
	module/plugins/Hook.py
	module/plugins/OCR.py
	module/plugins/Plugin.py
	module/plugins/PluginManager.py
	module/plugins/ReCaptcha.py
	module/plugins/accounts/Ftp.py
	module/plugins/accounts/Http.py
	module/plugins/internal/MultiHoster.py
	module/plugins/ocr/GigasizeCom.py
	module/plugins/ocr/LinksaveIn.py
	module/plugins/ocr/NetloadIn.py
	module/plugins/ocr/ShareonlineBiz.py
Diffstat (limited to 'module/plugins/accounts/FilefactoryCom.py')
| -rw-r--r-- | module/plugins/accounts/FilefactoryCom.py | 20 | 
1 files changed, 4 insertions, 16 deletions
diff --git a/module/plugins/accounts/FilefactoryCom.py b/module/plugins/accounts/FilefactoryCom.py index 0eded0edf..84d80cab7 100644 --- a/module/plugins/accounts/FilefactoryCom.py +++ b/module/plugins/accounts/FilefactoryCom.py @@ -1,18 +1,4 @@  # -*- coding: utf-8 -*- -############################################################################ -# This program is free software: you can redistribute it and/or modify     # -# it under the terms of the GNU Affero General Public License as           # -# published by the Free Software Foundation, either version 3 of the       # -# License, or (at your option) any later version.                          # -#                                                                          # -# This program is distributed in the hope that it will be useful,          # -# but WITHOUT ANY WARRANTY; without even the implied warranty of           # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            # -# GNU Affero General Public License for more details.                      # -#                                                                          # -# You should have received a copy of the GNU Affero General Public License # -# along with this program.  If not, see <http://www.gnu.org/licenses/>.    # -############################################################################  import re  from time import mktime, strptime @@ -24,14 +10,16 @@ from module.plugins.Account import Account  class FilefactoryCom(Account):      __name__ = "FilefactoryCom" -    __version__ = "0.14"      __type__ = "account" +    __version__ = "0.14" +      __description__ = """Filefactory.com account plugin"""      __author_name__ = ("zoidberg", "stickell")      __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")      VALID_UNTIL_PATTERN = r'Premium valid until: <strong>(?P<d>\d{1,2})\w{1,2} (?P<m>\w{3}), (?P<y>\d{4})</strong>' +      def loadAccountInfo(self, user, req):          html = req.load("http://www.filefactory.com/account/") @@ -51,7 +39,7 @@ class FilefactoryCom(Account):          html = req.load("http://www.filefactory.com/member/signin.php", post={              "loginEmail": user, -            "loginPassword": data["password"], +            "loginPassword": data['password'],              "Submit": "Sign In"})          if req.lastEffectiveURL != "http://www.filefactory.com/account/":  | 
