From 0c523ed29622b530c282863d895d6f11aac8ff51 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Wed, 6 May 2015 16:28:05 -0400
Subject: [PATCH 1/2] PM-2288 "DesignerBPMN>CaseTracker: No se puede..." SOLVED
 > Code Isuue:   DesignerBPMN>CaseTracker: No se puede visualizar el estado
 que tiene el caso creado > Solution:   Se completa a la opcion "Where is My
 Case?" del case tracker para el seguimiento del caso.

---
 workflow/engine/controllers/designer.php      |  6 ++-
 workflow/engine/templates/tracker/viewMap.php | 50 +++++++++++++++++--
 workflow/public_html/sysGeneric.php           |  2 +-
 3 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/workflow/engine/controllers/designer.php b/workflow/engine/controllers/designer.php
index 745d5c771..6c6d2cced 100644
--- a/workflow/engine/controllers/designer.php
+++ b/workflow/engine/controllers/designer.php
@@ -128,6 +128,11 @@ class Designer extends Controller
         \ProcessMaker\Services\OAuth2\Server::setPmClientId($client['CLIENT_ID']);
 
         $oauthServer = new \ProcessMaker\Services\OAuth2\Server();
+
+        if (!isset($_SESSION["USER_LOGGED"])) {
+            $_SESSION["USER_LOGGED"] = "00000000000000000000000000000001";
+        }
+
         $userId = $_SESSION['USER_LOGGED'];
         $authorize = true;
         $_GET = array_merge($_GET, array(
@@ -151,4 +156,3 @@ class Designer extends Controller
         return array('dsn' => $dsn, 'username' => DB_USER, 'password' => DB_PASS);
     }
 }
-
diff --git a/workflow/engine/templates/tracker/viewMap.php b/workflow/engine/templates/tracker/viewMap.php
index e9a5ea343..845e4c5d3 100644
--- a/workflow/engine/templates/tracker/viewMap.php
+++ b/workflow/engine/templates/tracker/viewMap.php
@@ -1,5 +1,45 @@
-<!--<iframe name="casesFrame" id="casesFrame" src ="../designer?prj_uid=<?php echo $_SESSION['PROCESS']; ?>&prj_readonly=true&app_uid=<?php echo $_SESSION['APP_UID']; ?>" width="99%" height="768" frameborder="0">
-<p>Your browser does not support iframes.</p>
-</iframe>
--->
-Not supported yet.
\ No newline at end of file
+<?php
+$url = "../designer?prj_uid=" . $_SESSION["PROCESS"] . "&prj_readonly=true&app_uid=" . $_SESSION["APP_UID"] . "&tracker_designer=1";
+?>
+
+<script type="text/javascript">
+    var winTracker;
+
+    if ((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1)) {
+        var li1 = document.getElementById("MAP");
+        var a1 = li1.getElementsByTagName("a");
+        a1[0].href = "javascript:;";
+        a1[0].onclick = function () { winTracker = window.open("<?php echo $url; ?>", "winTracker"); return false; };
+
+        var li2 = document.getElementById("DYNADOC");
+        var a2= li2.getElementsByTagName("a");
+        a2[0].onclick = function ()
+        {
+            if (winTracker) {
+                winTracker.close();
+            }
+        };
+
+        var li3 = document.getElementById("HISTORY");
+        var a3 = li3.getElementsByTagName("a");
+        a3[0].onclick = function ()
+        {
+            if (winTracker) {
+                winTracker.close();
+            }
+        };
+
+        var li4 = document.getElementById("MESSAGES");
+        var a4 = li4.getElementsByTagName("a");
+        a4[0].onclick = function ()
+        {
+            if (winTracker) {
+                winTracker.close();
+            }
+        };
+    } else {
+        document.write("<iframe name=\"casesFrame\" id=\"casesFrame\" src=\"<?php echo $url; ?>\" width=\"99%\" height=\"768\" frameborder=\"0\">");
+        document.write("<p>Your browser does not support iframes.</p>");
+        document.write("</iframe>");
+    }
+</script>
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index d6714eec3..d958f6f79 100755
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -961,7 +961,7 @@ if (! defined( 'EXECUTE_BY_CRON' )) {
                 }
             }
 
-            if ($bRedirect) {
+            if ($bRedirect && !isset($_GET["tracker_designer"])) {
                 if (substr( SYS_SKIN, 0, 2 ) == 'ux' && SYS_SKIN != 'uxs') { // verify if the current skin is a 'ux' variant
                     $loginUrl = 'main/login';
                 } else if (strpos( $_SERVER['REQUEST_URI'], '/home' ) !== false) { //verify is it is using the uxs skin for simplified interface

From 3e35bb1cae3d8301c0f556b12d44bbb42c52076f Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Fri, 8 May 2015 11:24:26 -0400
Subject: [PATCH 2/2]  PM-2288 "DesignerBPMN>CaseTracker: No se puede..."
 SOLVED

---
 workflow/engine/controllers/designer.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/controllers/designer.php b/workflow/engine/controllers/designer.php
index 6c6d2cced..67624beb1 100644
--- a/workflow/engine/controllers/designer.php
+++ b/workflow/engine/controllers/designer.php
@@ -27,6 +27,11 @@ class Designer extends Controller
         $appUid = isset($httpData->app_uid) ? $httpData->app_uid : '';
         $proReadOnly = isset($httpData->prj_readonly) ? $httpData->prj_readonly : 'false';
         $client = $this->getClientCredentials();
+
+        if (isset($httpData->tracker_designer) && $httpData->tracker_designer == 1) {
+            $client["tracker_designer"] = 1;
+        }
+
         $authCode = $this->getAuthorizationCode($client);
         $debug = false; //System::isDebugMode();
 
@@ -129,7 +134,7 @@ class Designer extends Controller
 
         $oauthServer = new \ProcessMaker\Services\OAuth2\Server();
 
-        if (!isset($_SESSION["USER_LOGGED"])) {
+        if (isset($client["tracker_designer"]) && $client["tracker_designer"] == 1) {
             $_SESSION["USER_LOGGED"] = "00000000000000000000000000000001";
         }
 
@@ -144,6 +149,10 @@ class Designer extends Controller
         $response = $oauthServer->postAuthorize($authorize, $userId, true);
         $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=')+5, 40);
 
+        if (isset($client["tracker_designer"]) && $client["tracker_designer"] == 1) {
+            unset($_SESSION["USER_LOGGED"]);
+        }
+
         return $code;
     }