summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-07-18 20:23:24 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-07-18 20:23:24 +0200
commita0ba8a0488198711ce75ac4b3be5a46a784eb686 (patch)
tree7398b8f52fa1ded9d3148226ed1278d7328918dd
parentrepaired cnl (diff)
downloadpyload-a0ba8a0488198711ce75ac4b3be5a46a784eb686.tar.xz
fixed captcha on webif + configparser
-rw-r--r--module/Api.py2
-rw-r--r--module/ConfigParser.py2
-rw-r--r--module/web/json_app.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/module/Api.py b/module/Api.py
index d36ecab33..7d4c6c66c 100644
--- a/module/Api.py
+++ b/module/Api.py
@@ -648,7 +648,7 @@ class Api(Iface):
t = CaptchaTask(int(task.id), standard_b64encode(data), type, result)
return t
else:
- return CaptchaTask()
+ return CaptchaTask(-1)
def getCaptchaTaskStatus(self, tid):
"""Get information about captcha task
diff --git a/module/ConfigParser.py b/module/ConfigParser.py
index 1d24711ee..ddb15ecd5 100644
--- a/module/ConfigParser.py
+++ b/module/ConfigParser.py
@@ -335,7 +335,7 @@ class ConfigParser:
conf[item[0]] = {
"desc": item[2],
"type": item[1],
- "value": self.cast(config[1], config[3])
+ "value": self.cast(item[1], item[3])
}
def deleteOldPlugins(self):
diff --git a/module/web/json_app.py b/module/web/json_app.py
index 53caeb9f1..959b3d974 100644
--- a/module/web/json_app.py
+++ b/module/web/json_app.py
@@ -328,7 +328,7 @@ def set_captcha():
task = PYLOAD.getCaptchaTask()
- if id:
+ if task.tid >= 0:
src = "data:image/%s;base64,%s" % (task.type, task.data)
return {'captcha': True, 'id': task.tid, 'src': src, 'result_type' : task.resultType}