From a4cc34ce34903e12a12a205440b49525feae7b0d Mon Sep 17 00:00:00 2001 From: arno Date: Thu, 20 Aug 2009 14:54:01 +0200 Subject: [PATCH] detects when server sends a bad formed html page --- js/admin.js | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/js/admin.js b/js/admin.js index e1dfe5f..85a28dd 100644 --- a/js/admin.js +++ b/js/admin.js @@ -473,6 +473,11 @@ var FeatureMgr = { } var xml = new OpenLayers.Format.XML().read(data); + if (!xml.documentElement) { + this.commError(SypStrings.UnconsistentError); + $("title").focus(); + return; + } switch (xml.documentElement.nodeName.toLowerCase()) { case "error": @@ -723,7 +728,15 @@ var pwdMgr = { }, 0); return; } + var xml = new OpenLayers.Format.XML().read(data); + if (!xml.documentElement) { + this.commError(SypStrings.UnconsistentError); + $("#login_error").show(); + window.setTimeout(function() { + $("#user").focus().select(); + }, 0); + } switch (xml.documentElement.nodeName.toLowerCase()) { case "error": @@ -1024,10 +1037,20 @@ var userMgr = { return; } + var xml = new OpenLayers.Format.XML().read(data); + if (!xml.documentElement) { + // here, we need a timeout because onsend timeout sometimes has not been triggered yet + var self = this; + window.setTimeout(function() { + self.enableForms(); + }, 0); + this.commError(SypStrings.UnconsistentError); + return; + } + var needFormEnabling = true; var focusEl = null; - var xml = new OpenLayers.Format.XML().read(data); switch (xml.documentElement.nodeName.toLowerCase()) { case "error": switch (xml.documentElement.getAttribute("reason")) { -- 2.39.2