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

1 files changed, 10 insertions, 25 deletions

diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py
index 266935a9f..5be5e8d04 100644
--- a/module/plugins/accounts/FileserveCom.py
+++ b/module/plugins/accounts/FileserveCom.py
@@ -1,22 +1,5 @@
 # -*- coding: utf-8 -*-
 
-"""
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-    @author: mkaay
-"""
-
 from time import mktime, strptime
 
 from module.plugins.Account import Account
@@ -25,34 +8,36 @@ from module.common.json_layer import json_loads
 
 class FileserveCom(Account):
     __name__ = "FileserveCom"
-    __version__ = "0.2"
     __type__ = "account"
+    __version__ = "0.2"
+
     __description__ = """Fileserve.com account plugin"""
     __author_name__ = "mkaay"
     __author_mail__ = "mkaay@mkaay.de"
 
+
     def loadAccountInfo(self, user, req):
         data = self.getAccountData(user)
 
-        page = req.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data["password"],
+        page = req.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data['password'],
                                                                      "submit": "Submit+Query"})
         res = json_loads(page)
 
-        if res["type"] == "premium":
-            validuntil = mktime(strptime(res["expireTime"], "%Y-%m-%d %H:%M:%S"))
-            return {"trafficleft": res["traffic"], "validuntil": validuntil}
+        if res['type'] == "premium":
+            validuntil = mktime(strptime(res['expireTime'], "%Y-%m-%d %H:%M:%S"))
+            return {"trafficleft": res['traffic'], "validuntil": validuntil}
         else:
             return {"premium": False, "trafficleft": None, "validuntil": None}
 
     def login(self, user, data, req):
-        page = req.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data["password"],
+        page = req.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data['password'],
                                                                      "submit": "Submit+Query"})
         res = json_loads(page)
 
-        if not res["type"]:
+        if not res['type']:
             self.wrongPassword()
 
         #login at fileserv page
         req.load("http://www.fileserve.com/login.php",
-                 post={"loginUserName": user, "loginUserPassword": data["password"], "autoLogin": "checked",
+                 post={"loginUserName": user, "loginUserPassword": data['password'], "autoLogin": "checked",
                        "loginFormSubmit": "Login"})