diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index 60bb98839..b88654655 100755 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -4385,7 +4385,7 @@ class G } // Next get the name of the useragent yes seperately and for good reason - if (preg_match( '/MSIE/i', $u_agent ) && ! preg_match( '/Opera/i', $u_agent )) { + if ((preg_match('~Trident/7.0; rv:11.0~',$_SERVER["HTTP_USER_AGENT"]) || preg_match( '/MSIE/i', $u_agent )) && ! preg_match( '/Opera/i', $u_agent )) { $bname = 'Internet Explorer'; $ub = "MSIE"; } elseif (preg_match( '/Firefox/i', $u_agent )) { @@ -4419,7 +4419,7 @@ class G if (strripos( $u_agent, "Version" ) < strripos( $u_agent, $ub )) { $version = $matches['version'][0]; } else { - $version = $matches['version'][1]; + $version = isset($matches['version'][1]) ? $matches['version'][1] : ''; } } else { $version = $matches['version'][0]; diff --git a/workflow/engine/skinEngine/simplified/templates/index.html b/workflow/engine/skinEngine/simplified/templates/index.html index 8d663b5fe..6c548b895 100644 --- a/workflow/engine/skinEngine/simplified/templates/index.html +++ b/workflow/engine/skinEngine/simplified/templates/index.html @@ -31,13 +31,12 @@ var h = $(window).height() - 42; $('iframe').height(h); //IE V10-V11 - if (navigator.appVersion.indexOf("MSIE 1") != -1) { + if ((navigator.appVersion.indexOf("MSIE 1") != -1) || (!!(navigator.userAgent.match(/Trident/) && !navigator.userAgent.match(/MSIE/)))) { h = $('iframe').attr('style'); $('iframe').attr('style', h+' padding-top : 40px;'); } - } - + function redirect(url) { var $iframe = $('#iframex'); diff --git a/workflow/engine/templates/home/index.html b/workflow/engine/templates/home/index.html index 749c9c045..ac16e3a99 100644 --- a/workflow/engine/templates/home/index.html +++ b/workflow/engine/templates/home/index.html @@ -33,11 +33,10 @@ var h = $(window).height() - 42; $('iframe').height(h); //IE V10-V11 - if (navigator.appVersion.indexOf("MSIE 1") != -1) { + if ((navigator.appVersion.indexOf("MSIE 1") != -1) || (!!(navigator.userAgent.match(/Trident/) && !navigator.userAgent.match(/MSIE/)))) { h = $('iframe').attr('style'); $('iframe').attr('style', h+' padding-top : 40px;'); } - } function redirect(url)