diff --git a/src/Config.py b/src/Config.py index 78995212..2434fa84 100644 --- a/src/Config.py +++ b/src/Config.py @@ -8,7 +8,7 @@ class Config(object): def __init__(self, argv): self.version = "0.3.2" - self.rev = 393 + self.rev = 394 self.argv = argv self.action = None self.createParser() diff --git a/src/Ui/UiRequest.py b/src/Ui/UiRequest.py index a7aa844d..e100e357 100644 --- a/src/Ui/UiRequest.py +++ b/src/Ui/UiRequest.py @@ -291,7 +291,7 @@ class UiRequest(object): if "htm" in content_type: # Valid nonce must present to render html files wrapper_nonce = self.get["wrapper_nonce"] if wrapper_nonce not in self.server.wrapper_nonces: - return self.error403("Wrapper nonce error.") + return self.error403("Wrapper nonce error. Please reload the page.") self.server.wrapper_nonces.remove(self.get["wrapper_nonce"]) referer = self.env.get("HTTP_REFERER") @@ -459,18 +459,27 @@ class UiRequest(object): return self.formatError("Server error", cgi.escape(message)) def formatError(self, title, message): - details = {key: val for key, val in self.env.items() if hasattr(val, "endswith") and "COOKIE" not in key } + import sys + import gevent + + details = {key: val for key, val in self.env.items() if hasattr(val, "endswith") and "COOKIE" not in key} + details["version_zeronet"] = "%s r%s" % (config.version, config.rev) + details["version_python"] = sys.version + details["version_gevent"] = gevent.__version__ + details["plugins"] = PluginManager.plugin_manager.plugin_names + arguments = {key: val for key, val in vars(config.arguments).items() if "password" not in key} + details["arguments"] = arguments return """
%s- """ % (title, message, json.dumps(details, indent=4)) + """ % (title, message, json.dumps(details, indent=4, sort_keys=True)) # - Reload for eaiser developing - diff --git a/src/Ui/template/wrapper.html b/src/Ui/template/wrapper.html index 049fdc2b..20cca539 100644 --- a/src/Ui/template/wrapper.html +++ b/src/Ui/template/wrapper.html @@ -56,7 +56,6 @@ if (window.opener && window.stop) window.stop()