diff --git a/workflow/engine/controllers/designer.php b/workflow/engine/controllers/designer.php index 745d5c771..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(); @@ -128,6 +133,11 @@ class Designer extends Controller \ProcessMaker\Services\OAuth2\Server::setPmClientId($client['CLIENT_ID']); $oauthServer = new \ProcessMaker\Services\OAuth2\Server(); + + if (isset($client["tracker_designer"]) && $client["tracker_designer"] == 1) { + $_SESSION["USER_LOGGED"] = "00000000000000000000000000000001"; + } + $userId = $_SESSION['USER_LOGGED']; $authorize = true; $_GET = array_merge($_GET, array( @@ -139,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; } @@ -151,4 +165,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 @@ - -Not supported yet. \ No newline at end of file + + + 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