diff options
Diffstat (limited to 'module')
| -rw-r--r-- | module/config/default.conf | 4 | ||||
| -rw-r--r-- | module/web/pyload/views.py | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/module/config/default.conf b/module/config/default.conf index 4d0d588df..b1c0c648e 100644 --- a/module/config/default.conf +++ b/module/config/default.conf @@ -16,10 +16,6 @@ webinterface - "Webinterface": ip host : "IP" = 0.0.0.0
int port : "Port" = 8001
str template : "Template" = default
-xdcc - "xdcc":
- str nick : "Nickname" = pyload
- str ident : "Ident" = pyloadident
- str realname : "Realname" = pyloadreal
log - "Log":
bool file_log : "File Log" = True
str log_folder : "Folder" = Logs
diff --git a/module/web/pyload/views.py b/module/web/pyload/views.py index b93ed603e..0c04962fa 100644 --- a/module/web/pyload/views.py +++ b/module/web/pyload/views.py @@ -8,6 +8,7 @@ from os.path import isdir from os.path import isfile from os.path import join from urllib import unquote +from itertools import chain from django.conf import settings from django.contrib.auth.decorators import login_required @@ -214,6 +215,7 @@ def collector(request): @check_server def config(request): conf = settings.PYLOAD.get_config() + plugin = settings.PYLOAD.get_plugin_config() if request.META.get('REQUEST_METHOD', "GET") == "POST": @@ -245,11 +247,11 @@ def config(request): return render_to_response(join(settings.TEMPLATE, 'settings.html'), RequestContext(request, {'conf': {}, 'errors': messages}, [status_proc])) - for section in conf.itervalues(): + for section in chain(conf.itervalues(), plugin.itervalues()): for key, option in section.iteritems(): if key == "desc": continue if ";" in option["type"]: option["list"] = option["type"].split(";") - return render_to_response(join(settings.TEMPLATE, 'settings.html'), RequestContext(request, {'conf': conf, 'messages': []}, [status_proc])) + return render_to_response(join(settings.TEMPLATE, 'settings.html'), RequestContext(request, {'conf': conf, 'plugin': plugin, 'messages': []}, [status_proc])) |