Merge remote-tracking branch 'origin/stable'

Conflicts:
	module/plugins/accounts/FilesonicCom.py
	module/plugins/accounts/OronCom.py
	module/plugins/accounts/ShareonlineBiz.py
	module/plugins/addons/UpdateManager.py
	module/plugins/crypter/FilesonicComFolder.py
	module/plugins/hoster/BezvadataCz.py
	module/plugins/hoster/EuroshareEu.py
	module/plugins/hoster/FilesonicCom.py
	module/plugins/hoster/MegauploadCom.py
	module/plugins/hoster/Premium4Me.py
	module/plugins/hoster/YoutubeCom.py
	module/plugins/internal/MultiHoster.py
	module/utils.py

1 files changed, 52 insertions, 0 deletions

diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py
new file mode 100644
index 000000000..333ee3761
--- /dev/null
+++ b/module/plugins/accounts/FastshareCz.py
@@ -0,0 +1,52 @@
+# -*- 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: zoidberg
+"""
+
+import re
+from module.plugins.Account import Account
+from module.utils import parseFileSize
+
+class FastshareCz(Account):
+    __name__ = "FastshareCz"
+    __version__ = "0.01"
+    __type__ = "account"
+    __description__ = """fastshare.cz account plugin"""
+    __author_name__ = ("zoidberg")
+    __author_mail__ = ("zoidberg@mujmail.cz")
+    
+    def loadAccountInfo(self, user, req):
+        html = req.load("http://www.fastshare.cz/user", decode = True)
+                    
+        found = re.search(r'Kredit: </td><td>(.+?)&nbsp;', html)           
+        if found:
+            trafficleft = parseFileSize(found.group(1)) / 1024    
+            premium = True if trafficleft else False
+        else:
+            trafficleft = None
+            premium = False  
+
+        return {"validuntil": -1, "trafficleft": trafficleft, "premium": premium}
+    
+    def login(self, user, data, req):
+        html = req.load('http://www.fastshare.cz/sql.php', post = {
+            "heslo": data['password'],
+            "login": user
+            }, decode = True)
+        
+        if u'>Špatné uživatelské jméno nebo heslo.<' in html:
+            self.wrongPassword()
\ No newline at end of file