diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php index cd3f7f24a..9c221d226 100644 --- a/gulliver/system/class.bootstrap.php +++ b/gulliver/system/class.bootstrap.php @@ -2974,5 +2974,19 @@ class Bootstrap } + /** + * Set Language + */ + public static function isIE() + { + $isIE = false; + if (isset($_SERVER['HTTP_USER_AGENT'])) { + $ua = htmlentities($_SERVER['HTTP_USER_AGENT'], ENT_QUOTES, 'UTF-8'); + if (preg_match('~MSIE|Internet Explorer~i', $ua) || (strpos($ua, 'Trident/7.0; rv:11.0') !== false)) { + $isIE = true; + } + } + return $isIE; + } } diff --git a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php index 649ea85f2..13923a430 100644 --- a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php +++ b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php @@ -179,11 +179,7 @@ if (count($arrayTabItem) > 0) { $headPublisher->assign("urlProxy", $urlProxy); $headPublisher->assign('credentials', $clientToken ); - $ieVersion = null; - if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)){ - $ieVersion = intval($arrayMatch[1]); - } - $oHeadPublisher->assign( 'ieVersion', $ieVersion ); + $oHeadPublisher->assign('isIE', Bootstrap::isIE()); $headPublisher->addExtJsScript("app/main", true); $headPublisher->addExtJsScript("cases/casesListConsolidated", false); //Adding a JavaScript file .js diff --git a/workflow/engine/methods/cases/casesListExtJs.php b/workflow/engine/methods/cases/casesListExtJs.php index 8d00b5533..d97d41268 100755 --- a/workflow/engine/methods/cases/casesListExtJs.php +++ b/workflow/engine/methods/cases/casesListExtJs.php @@ -223,11 +223,7 @@ $oHeadPublisher->addExtJsScript( 'cases/casesList', false ); //adding a javascri $oHeadPublisher->addContent( 'cases/casesListExtJs' ); //adding a html file .html. $oHeadPublisher->assign( 'FORMATS', $c->getFormats() ); $oHeadPublisher->assign('extJsViewState', $oHeadPublisher->getExtJsViewState()); -$ieVersion = null; -if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)){ - $ieVersion = intval($arrayMatch[1]); -} -$oHeadPublisher->assign( 'ieVersion', $ieVersion ); +$oHeadPublisher->assign('isIE', Bootstrap::isIE()); G::RenderPage( 'publish', 'extJs' ); function getUserArray ($action, $userUid) diff --git a/workflow/engine/methods/cases/casesStartPage.php b/workflow/engine/methods/cases/casesStartPage.php index 93f5458c0..5cd558bb3 100755 --- a/workflow/engine/methods/cases/casesStartPage.php +++ b/workflow/engine/methods/cases/casesStartPage.php @@ -17,11 +17,7 @@ switch ($page) { G::LoadClass( 'configuration' ); $c = new Configurations(); $oHeadPublisher->assign( 'FORMATS', $c->getFormats() ); - $ieVersion = null; - if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)){ - $ieVersion = intval($arrayMatch[1]); - } - $oHeadPublisher->assign( 'ieVersion', $ieVersion ); + $oHeadPublisher->assign('isIE', Bootstrap::isIE()); break; case "documents": diff --git a/workflow/engine/methods/cases/cases_CatchSelfService.php b/workflow/engine/methods/cases/cases_CatchSelfService.php index a84bae9fe..3d419133c 100755 --- a/workflow/engine/methods/cases/cases_CatchSelfService.php +++ b/workflow/engine/methods/cases/cases_CatchSelfService.php @@ -100,11 +100,7 @@ $oHeadPublisher->addScriptCode( ' $oHeadPublisher = & headPublisher::getSingleton(); $oHeadPublisher->addScriptFile( '/jscore/cases/core/cases_Step.js' ); -$ieVersion = ''; -if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)){ - $ieVersion = intval($arrayMatch[1]); -} -$Fields['IE_VERSION'] = $ieVersion; +$Fields['isIE'] = Bootstrap::isIE(); $G_PUBLISH = new Publisher(); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_CatchSelfService.xml', '', $Fields, 'cases_CatchExecute' ); diff --git a/workflow/engine/methods/cases/cases_Derivate.php b/workflow/engine/methods/cases/cases_Derivate.php index 811e078c7..6ba245564 100755 --- a/workflow/engine/methods/cases/cases_Derivate.php +++ b/workflow/engine/methods/cases/cases_Derivate.php @@ -272,12 +272,9 @@ try { $loc = $aNextStep['PAGE']; } //Triggers After - $ieVersion = null; - if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)){ - $ieVersion = intval($arrayMatch[1]); - } + $isIE = Bootstrap::isIE(); - if (isset( $_SESSION['TRIGGER_DEBUG']['ISSET'] ) && $ieVersion != 11) { + if (isset( $_SESSION['TRIGGER_DEBUG']['ISSET'] ) && !$isIE) { if ($_SESSION['TRIGGER_DEBUG']['ISSET'] == 1) { $oTemplatePower = new TemplatePower( PATH_TPL . 'cases/cases_Step.html' ); $oTemplatePower->prepare(); @@ -296,7 +293,7 @@ try { //close tab only if IE11 - if($ieVersion == 11 && !isset($_SESSION['__OUTLOOK_CONNECTOR__'])) { + if($isIE && !isset($_SESSION['__OUTLOOK_CONNECTOR__'])) { $script = "