From 265c1a0711e5e50b8507ba35253f2dc55e01f88e Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Fri, 29 Mar 2013 22:42:20 +0100
Subject: fix in update file info, moved recaptcha back

---
 module/plugins/ReCaptcha.py          | 22 ++++++++++++++++++++++
 module/plugins/internal/ReCaptcha.py | 21 ---------------------
 2 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 module/plugins/ReCaptcha.py
 delete mode 100644 module/plugins/internal/ReCaptcha.py

(limited to 'module/plugins')

diff --git a/module/plugins/ReCaptcha.py b/module/plugins/ReCaptcha.py
new file mode 100644
index 000000000..e47522b4a
--- /dev/null
+++ b/module/plugins/ReCaptcha.py
@@ -0,0 +1,22 @@
+import re
+
+class ReCaptcha():
+    def __init__(self, plugin):
+        self.plugin = plugin
+        self.plugin.logDebug("Deprecated usage of ReCaptcha: Use CaptchaService instead")
+    
+    def challenge(self, id):
+        js = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge", get={"k":id}, cookies=True)
+        
+        try:
+            challenge = re.search("challenge : '(.*?)',", js).group(1)
+            server = re.search("server : '(.*?)',", js).group(1)
+        except:
+            self.plugin.fail("recaptcha error")
+        result = self.result(server,challenge)
+        
+        return challenge, result
+
+    def result(self, server, challenge):
+        return self.plugin.decryptCaptcha("%simage"%server, get={"c":challenge}, cookies=True, imgtype="jpg")
+        
diff --git a/module/plugins/internal/ReCaptcha.py b/module/plugins/internal/ReCaptcha.py
deleted file mode 100644
index 6f7ebe22c..000000000
--- a/module/plugins/internal/ReCaptcha.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import re
-
-class ReCaptcha():
-    def __init__(self, plugin):
-        self.plugin = plugin
-    
-    def challenge(self, id):
-        js = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge", get={"k":id}, cookies=True)
-        
-        try:
-            challenge = re.search("challenge : '(.*?)',", js).group(1)
-            server = re.search("server : '(.*?)',", js).group(1)
-        except:
-            self.plugin.fail("recaptcha error")
-        result = self.result(server,challenge)
-        
-        return challenge, result
-
-    def result(self, server, challenge):
-        return self.plugin.decryptCaptcha("%simage"%server, get={"c":challenge}, cookies=True, imgtype="jpg")
-        
-- 
cgit v1.2.3