From 66c72ce64e78181354a9ba4b3307a1cdda6bdc30 Mon Sep 17 00:00:00 2001
From: Fernando Ontiveros <fernando@colosa.com>
Date: Sat, 5 Feb 2011 08:05:49 +0000
Subject: [PATCH] fixing the ActivexObject error in firefox, please report any
 issue if some ajax is not working

---
 gulliver/js/common/core/common.js      | 38 ++++++++++++++------------
 gulliver/js/maborak/core/module.rpc.js |  8 ++++--
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/gulliver/js/common/core/common.js b/gulliver/js/common/core/common.js
index 9fd4d594c..5cbb90440 100755
--- a/gulliver/js/common/core/common.js
+++ b/gulliver/js/common/core/common.js
@@ -2,7 +2,7 @@
  */
   function get_xmlhttp() {
     try {
-      xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
+      xmlhttp = new ActiveXObject("Msxml2.XMLHTTP1");
     } catch (e) {
       try {
         xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
@@ -904,7 +904,7 @@ function refillDropdown( fldName, ajax_server, values , InitValue)
 
 function iframe_get_xmlhttp() {
   try {
-    xmlhttp = new ActiveXObject('Msxml2.XMLHTTP');
+    xmlhttp = new ActiveXObject('Msxml2.XMLHTTP2');
   } catch (e) {
     try {
       xmlhttp = new ActiveXObject('Microsoft.XMLHTTP');
@@ -919,23 +919,25 @@ function iframe_get_xmlhttp() {
 }
 
 function get_xmlhttp() {
-        try {
-                xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-        } catch (e) {
-                try {
-                        xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-                } catch (E) {
-                        xmlhttp = false;
-                }
-        }
-        if (!xmlhttp && typeof XMLHttpRequest!='undefined') {
-                xmlhttp = new XMLHttpRequest();
-        }
-        return xmlhttp;
+  try {
+  	xmlhttp = false;
+  	if ( window.ActiveXObject )
+      xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
+  } 
+  catch (e) {
+    try {
+      xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
+    } 
+    catch (E) {
+      xmlhttp = false;
+    }
+  }
+  if (!xmlhttp && typeof XMLHttpRequest!='undefined') {
+    xmlhttp = new XMLHttpRequest();
+  }
+  return xmlhttp;
 }
 
-
-
 function refillTextError( div_container, fldName, ajax_server, values )
 {
 	var objetus;
@@ -976,7 +978,7 @@ function refillTextError( div_container, fldName, ajax_server, values )
 
 function iframe_get_xmlhttp() {
   try {
-    xmlhttp = new ActiveXObject('Msxml2.XMLHTTP');
+    xmlhttp = new ActiveXObject('Msxml2.XMLHTTP5');
   } catch (e) {
     try {
       xmlhttp = new ActiveXObject('Microsoft.XMLHTTP');
diff --git a/gulliver/js/maborak/core/module.rpc.js b/gulliver/js/maborak/core/module.rpc.js
index 4b650a9bf..f104cea33 100644
--- a/gulliver/js/maborak/core/module.rpc.js
+++ b/gulliver/js/maborak/core/module.rpc.js
@@ -60,17 +60,19 @@ leimnud.Package.Public({
 			this.core = function()
 			{
 				try{
-					var xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
+  		  	xmlhttp = false;
+					if ( window.ActiveXObject ) 
+					xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
 				}
 				catch(e)
 				{
 					try
 					{
-						var xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
+						xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
 					}
 					catch(e)
 					{
-						var xmlhttp = false;
+						xmlhttp = false;
 					}
 				}
 				return (!xmlhttp && typeof XMLHttpRequest!='undefined')?