diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2012-03-20 14:57:45 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2012-03-20 14:57:45 +0100 |
| commit | 50d4df8b4d48b855bd18e9922355b7f3f2b4da4e (patch) | |
| tree | 6301b05677a90cf86f131d5a7ae3f879b38e84d2 /module/web | |
| parent | renamed hooks to addons, new filemanager and database, many new api methods (diff) | |
| download | pyload-50d4df8b4d48b855bd18e9922355b7f3f2b4da4e.tar.xz | |
captcha decrypting for all plugin types, new interaction manager
Diffstat (limited to 'module/web')
| -rw-r--r-- | module/web/json_app.py | 5 | ||||
| -rw-r--r-- | module/web/pyload_app.py | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/module/web/json_app.py b/module/web/json_app.py index fcaa906e1..ed4f6bcfb 100644 --- a/module/web/json_app.py +++ b/module/web/json_app.py @@ -11,6 +11,7 @@ from webinterface import PYLOAD from utils import login_required, render_to_response, toDict +from module.Api import Output from module.utils import decode, format_size def get_sort_key(item): @@ -23,7 +24,7 @@ def get_sort_key(item): def status(): try: status = toDict(PYLOAD.statusServer()) - status['captcha'] = PYLOAD.isCaptchaWaiting() + status['captcha'] = PYLOAD.isInteractionWaiting(Output.Captcha) return status except: return HTTPError() @@ -34,7 +35,7 @@ def status(): @login_required('LIST') def links(): try: - links = [toDict(x) for x in PYLOAD.statusDownloads()] + links = [toDict(x) for x in PYLOAD.getProgressInfo()] ids = [] for link in links: ids.append(link['fid']) diff --git a/module/web/pyload_app.py b/module/web/pyload_app.py index 4edc6e0a5..4c448d2cd 100644 --- a/module/web/pyload_app.py +++ b/module/web/pyload_app.py @@ -36,6 +36,7 @@ from utils import render_to_response, parse_permissions, parse_userdata, \ from filters import relpath, unquotepath +from module.Api import Output from module.utils import format_size from module.utils.fs import save_join, fs_encode, fs_decode, listdir @@ -52,7 +53,7 @@ def pre_processor(): if user["is_authenticated"]: status = PYLOAD.statusServer() info = PYLOAD.getInfoByPlugin("UpdateManager") - captcha = PYLOAD.isCaptchaWaiting() + captcha = PYLOAD.isInteractionWaiting(Output.Captcha) # check if update check is available if info: |