OM-543 BE and FE

remove coment format files add files FE up observations
2016-04-13 15:46:29 -04:00
parent c674bbc64d
commit cdab4ed89b
13 changed files with 40 additions and 74 deletions
--- 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;
+    }
 }

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

--- 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' );
--- 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 = "<script type='text/javascript'>
                       try {
                           if(top.opener) {
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/workflow/engine/methods/cases/cases_Step.php
@@ -210,10 +210,7 @@ if (isset( $_GET['breakpoint'] )) {
 /**
 * Here we throw the debug view
 */
-$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($_GET['breakpoint'])) {

@@ -1166,7 +1163,7 @@ if (!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) {

 G::RenderPage( 'publish', 'blank' );

-if ($_SESSION['TRIGGER_DEBUG']['ISSET'] && $ieVersion != 11) {
+if ($_SESSION['TRIGGER_DEBUG']['ISSET'] && !$isIE) {
    G::evalJScript( '
    if (typeof showdebug != \'undefined\') {
      showdebug();
--- a/workflow/engine/skinEngine/skinEngine.php
+++ b/workflow/engine/skinEngine/skinEngine.php
@@ -275,8 +275,8 @@ class SkinEngine
    	//Get the IE version
    	if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)){
    		$ie = intval($arrayMatch[1]);
-    		$ieVersion = $ie;
    	}
+        $isIE = Bootstrap::isIE();

        $swTrident = (preg_match("/^.*Trident.*$/", $_SERVER["HTTP_USER_AGENT"]))? 1 : 0; //Trident only in IE8+

@@ -296,7 +296,7 @@ class SkinEngine
            $meta    = "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=$ie\" />";

            if (SYS_COLLECTION == 'cases') {
-                if($ieVersion == 11) {
+                if($isIE) {
                    $meta = "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\" />";
                }
            }
--- a/workflow/engine/templates/cases/casesList.js
+++ b/workflow/engine/templates/cases/casesList.js
@@ -86,14 +86,6 @@ function openCase(){
        var appUid   = rowModel.data.APP_UID;
        var delIndex = rowModel.data.DEL_INDEX;
        var caseTitle = (rowModel.data.APP_TITLE) ? rowModel.data.APP_TITLE : rowModel.data.APP_UID;
-        if(ieVersion != 11) {
-            Ext.Msg.show({
-                msg: _('ID_OPEN_CASE') + ' ' + caseTitle,
-                width:300,
-                wait:true,
-                waitConfig: {interval:200}
-            });
-        }
        params = '';
        switch(action){
            case 'to_revise':
@@ -131,7 +123,7 @@ function openCase(){
            // Nothing to do
        }
        params += '&action=' + action;
-        if(ieVersion == 11) {
+        if(isIE) {
            if(casesNewTab) {
                casesNewTab.close();
            }
@@ -846,10 +838,10 @@ Ext.onReady ( function() {
    //Layout Resizing
    /*----------------------------------********---------------------------------*/
    if (typeof valueFilterStatus != 'undefined') {
-         if (valueFilterStatus != '') {
-         storeCases.setBaseParam('filterStatus', valueFilterStatus);
-         }
-     }
+        if (valueFilterStatus != '') {
+            storeCases.setBaseParam('filterStatus', valueFilterStatus);
+        }
+    }
    /*----------------------------------********---------------------------------*/
    storeCases.on('load',function(){var viewport = Ext.getCmp("viewportcases");viewport.doLayout();})

@@ -2577,7 +2569,7 @@ function msgBox(title, msg, type){
 }

 Ext.EventManager.on(window, 'beforeunload', function () {
-  if(casesNewTab) {
-    casesNewTab.close();
-  }
+    if(casesNewTab) {
+        casesNewTab.close();
+    }
 });
--- a/workflow/engine/templates/cases/casesListConsolidated.js
+++ b/workflow/engine/templates/cases/casesListConsolidated.js
@@ -237,16 +237,6 @@ function openCase(){
    var appUid    = rowModel.data.APP_UID;
    var delIndex  = rowModel.data.DEL_INDEX;
    var caseTitle = (rowModel.data.APP_TITLE) ? rowModel.data.APP_TITLE : rowModel.data.APP_UID;
-    if(ieVersion != 11) {
-      Ext.Msg.show({
-        msg: _("ID_OPEN_CASE") + " " + caseTitle,
-        width:300,
-        wait:true,
-        waitConfig: {
-          interval:200
-        }
-      });
-    }
    params = '';
    switch(action){
      case 'consolidated':
@@ -258,7 +248,7 @@ function openCase(){
    }
    params += '&action=' + 'todo';
    
-    if(ieVersion == 11) {
+    if(isIE) {
      if(newCaseNewTab) {
        newCaseNewTab.close();
      }
@@ -274,7 +264,7 @@ function openCase(){
 }

 function jumpToCase(appNumber){
-  if(ieVersion != 11) {  
+  if(isIE) {  
    Ext.MessageBox.show({ msg: _('ID_PROCESSING'), wait:true,waitConfig: {interval:200} });
  }
  Ext.Ajax.request({
@@ -286,7 +276,7 @@ function jumpToCase(appNumber){
        params = 'APP_NUMBER=' + appNumber;
        params += '&action=jump';
        requestFile = '../cases/open';
-        if(ieVersion == 11) {
+        if(isIE) {
          if(newCaseNewTab) {
            newCaseNewTab.close();
          }
--- a/workflow/engine/templates/cases/casesStartCase.js
+++ b/workflow/engine/templates/cases/casesStartCase.js
@@ -445,14 +445,6 @@ Ext.onReady(function() {

 function openCaseA(n){
  if (n.attributes.optionType == "startProcess") {
-    if(ieVersion != 11) {
-      Ext.Msg.show({
-        title : '',
-        msg : TRANSLATIONS.ID_STARTING_NEW_CASE  + '<br><br><b>' + n.attributes.text + '</b>',
-        wait:true,
-        waitConfig: {interval:500}
-      });
-    }
    Ext.Ajax.request({
      url : 'casesStartPage_Ajax.php',
      params : {
@@ -465,7 +457,7 @@ function openCaseA(n){
        try {
          var res = Ext.util.JSON.decode(response.responseText);
          if (res.openCase) {
-            if(ieVersion == 11) {
+            if(isIE) {
              if(newCaseNewTab) {
                newCaseNewTab.close();
              }
--- a/workflow/engine/xmlform/cases/cases_CatchSelfService.html
+++ b/workflow/engine/xmlform/cases/cases_CatchSelfService.html
@@ -9,7 +9,7 @@
          <input type="hidden" name="__DynaformName__" id="__DynaformName__" value="{$form_name}" />
          <table cellspacing="0" cellpadding="0" border="0" width="100%">
                                    <tr style="display: none">
-              <td colspan="2">{$form.IE_VERSION}</td>
+              <td colspan="2">{$form.isIE}</td>
            </tr>
                                                <tr>
              <td class='FormTitle' colspan="2" align="">{$form.TITLE1}</td>
--- a/workflow/engine/xmlform/cases/cases_CatchSelfService.xml
+++ b/workflow/engine/xmlform/cases/cases_CatchSelfService.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dynaForm enabletemplate="1" name="cases_Resume" type="xmlform" width="500px" labelWidth="100px">
-  <IE_VERSION type="hidden" />  
+  <isIE type="hidden" />
  <TITLE1 type="title">
    <en><![CDATA[Claim Case]]></en>
  </TITLE1>
@@ -42,7 +42,7 @@
  </BTN_CANCEL>
  <JS type="javascript"> <![CDATA[
    var dynaformOnload = function() {
-        if(getField("IE_VERSION").value == 11) {
+        if(getField("isIE").value == "true") {
            getField("BTN_CANCEL").setAttribute("onclick","");
            getField("BTN_CANCEL").onclick = function(){;
                try {