From cc4900418916cb77cfb8a00d19073be20804c498 Mon Sep 17 00:00:00 2001 From: Saafan Date: Tue, 15 Jan 2013 17:03:54 +0200 Subject: [PATCH] Fix IE java detection. --- core/main/client/browser.js | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/core/main/client/browser.js b/core/main/client/browser.js index 6e74ed44a..3a6cf1ab8 100644 --- a/core/main/client/browser.js +++ b/core/main/client/browser.js @@ -666,7 +666,42 @@ beef.browser = { return false; } } - else return true; + else + { + function testUsingActiveX(n) { + var p = "JavaWebStart.isInstalled." + n + ".0"; + if (typeof ActiveXObject == "undefined" || !ActiveXObject) { + g("[testUsingActiveX()] Browser claims to be IE, but no ActiveXObject object?"); + return false + } + try { + return (new ActiveXObject(p) != null) + } catch (o) { + return false + } + } + + if (testUsingActiveX("1.7.0")) { + return true; + } else { + if (testUsingActiveX("1.6.0")) { + return true; + } else { + if (testUsingActiveX("1.5.0")) { + return true; + } else { + if (testUsingActiveX("1.4.2")) { + return true; + } + else { + return false; + } + } + } + } + + + } },