From: arno <arenevier@fdn.fr>
Date: Thu, 20 Aug 2009 12:54:01 +0000 (+0200)
Subject: detects when server sends a bad formed html page
X-Git-Tag: v0.3b_thomas~3
X-Git-Url: https://dev.renevier.net/gitweb.cgi?p=syp.git;a=commitdiff_plain;h=a4cc34ce34903e12a12a205440b49525feae7b0d;hp=f2d7e9e98dc651a2c84c9385838c67d5737d04f0

detects when server sends a bad formed html page
---

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")) {