Conflicts

2017-10-20 18:51:24 -04:00
parent b26beb72c4 294707cb42
commit 9952cdb8ff
178 changed files with 2452 additions and 1973 deletions
--- a/workflow/engine/methods/cases/caseConsolidated.php
+++ b/workflow/engine/methods/cases/caseConsolidated.php
@@ -263,7 +263,7 @@ if ($sStatus == '1') {

    $oAdditionalTables->createPropelClasses($tableName, $sClassName, $aFieldsClases, $sTasUid);
 } else {
-    $sPath = PATH_DB . SYS_SYS . PATH_SEP . 'classes' . PATH_SEP;
+    $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
    @unlink($sPath . $sClassName . '.php');
    @unlink($sPath . $sClassName . 'Peer.php');
    @unlink($sPath . PATH_SEP . 'map' . PATH_SEP . $sClassName . 'MapBuilder.php');
--- a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
+++ b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
@@ -71,7 +71,7 @@ while ($rsSql->next()) {
 }

 if (count($arrayTabItem) > 0) {
-    $urlProxy = System::getHttpServerHostnameRequestsFrontEnd() . '/api/1.0/' . SYS_SYS . '/consolidated/';
+    $urlProxy = System::getHttpServerHostnameRequestsFrontEnd() . '/api/1.0/' . config("system.workspace") . '/consolidated/';
    $clientId = 'x-pm-local-client';
    $client = getClientCredentials($clientId);
    $authCode = getAuthorizationCode($client);
--- a/workflow/engine/methods/cases/casesListExtJs.php
+++ b/workflow/engine/methods/cases/casesListExtJs.php
@@ -176,9 +176,9 @@ if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjB
    if (isset($_COOKIE['dashboardListInbox'])) {
        $oHeadPublisher->assign('valueFilterStatus', $_COOKIE['dashboardListInbox']);
        if (PHP_VERSION < 5.2) {
-            setcookie("dashboardListInbox", '', time() + (24 * 60 * 60), "/sys" . SYS_SYS, "; HttpOnly");
+            setcookie("dashboardListInbox", '', time() + (24 * 60 * 60), "/sys" . config("system.workspace"), "; HttpOnly");
        } else {
-            setcookie("dashboardListInbox", '', time() + (24 * 60 * 60), "/sys" . SYS_SYS, null, false, true);
+            setcookie("dashboardListInbox", '', time() + (24 * 60 * 60), "/sys" . config("system.workspace"), null, false, true);
        }
    }
 }
--- a/workflow/engine/methods/cases/cases_SaveDataSupervisor.php
+++ b/workflow/engine/methods/cases/cases_SaveDataSupervisor.php
@@ -142,8 +142,8 @@ if (isset( $_FILES["form"]["name"] ) && count( $_FILES["form"]["name"] ) > 0) {
 					if($res->status == 0){
 						$message = $res->message;
 						G::SendMessageText( $message, "ERROR" );
-						$backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] );
-						G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] );
+						$backUrlObj = explode( "sys" . config("system.workspace"), $_SERVER['HTTP_REFERER'] );
+						G::header( "location: " . "/sys" . config("system.workspace") . $backUrlObj[1] );
 						die();
 					}

@@ -156,8 +156,8 @@ if (isset( $_FILES["form"]["name"] ) && count( $_FILES["form"]["name"] ) > 0) {
 					if ($inpDocMaxFilesize > 0 && $fileSizeByField > 0) {
 						if ($fileSizeByField > $inpDocMaxFilesize) {
 							G::SendMessageText(G::LoadTranslation("ID_SIZE_VERY_LARGE_PERMITTED"), "ERROR");
-							$arrayAux1 = explode("sys" . SYS_SYS, $_SERVER["HTTP_REFERER"]);
-							G::header("location: /sys" . SYS_SYS . $arrayAux1[1]);
+							$arrayAux1 = explode("sys" . config("system.workspace"), $_SERVER["HTTP_REFERER"]);
+							G::header("location: /sys" . config("system.workspace") . $arrayAux1[1]);
 							exit(0);
 						}
 					}
--- a/workflow/engine/methods/cases/cases_SaveDocument.php
+++ b/workflow/engine/methods/cases/cases_SaveDocument.php
@@ -54,8 +54,8 @@ if ((isset( $_FILES['form'] )) && ($_FILES['form']['error']['APP_DOC_FILENAME']
            break;
    }
    G::SendMessageText( $message, "ERROR" );
-    $backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] );
-    G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] );
+    $backUrlObj = explode( "sys" . config("system.workspace"), $_SERVER['HTTP_REFERER'] );
+    G::header( "location: " . "/sys" . config("system.workspace") . $backUrlObj[1] );
    die();
 }

@@ -106,8 +106,8 @@ if(isset($_FILES["form"]["name"]["APP_DOC_FILENAME"]) && isset($_FILES["form"]["
 if($res->status == 0){
 	$message = $res->message;
 	G::SendMessageText( $message, "ERROR" );
-	$backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] );
-	G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] );
+	$backUrlObj = explode( "sys" . config("system.workspace"), $_SERVER['HTTP_REFERER'] );
+	G::header( "location: " . "/sys" . config("system.workspace") . $backUrlObj[1] );
 	die();
 }

@@ -134,8 +134,8 @@ if (isset($_FILES) && isset($_FILES["form"]) && count($_FILES["form"]) > 0) {
    } catch (Exception $e) {
        G::SendMessageText($e->getMessage(), "ERROR");

-        $arrayAux = explode("sys" . SYS_SYS, $_SERVER["HTTP_REFERER"]);
-        G::header("location: /sys" . SYS_SYS . $arrayAux[1]);
+        $arrayAux = explode("sys" . config("system.workspace"), $_SERVER["HTTP_REFERER"]);
+        G::header("location: /sys" . config("system.workspace") . $arrayAux[1]);
        exit(0);
    }
 }
--- a/workflow/engine/methods/cases/cases_SchedulerValidateUser.php
+++ b/workflow/engine/methods/cases/cases_SchedulerValidateUser.php
@@ -40,7 +40,7 @@ if (G::is_https()) {
    $http = 'http://';
 }

-$endpoint = $http . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/services/wsdl2';
+$endpoint = $http . $_SERVER['HTTP_HOST'] . '/sys' . config("system.workspace") . '/' . SYS_LANG . '/' . SYS_SKIN . '/services/wsdl2';
 $client = new SoapClient($endpoint, $streamContext);

 $user = $sWS_USER;
--- a/workflow/engine/methods/cases/cases_ShowDocument.php
+++ b/workflow/engine/methods/cases/cases_ShowDocument.php
@@ -109,8 +109,8 @@ if (! $sw_file_exists) {
        print G::json_encode( $res );
    } else {
        G::SendMessageText( $error_message, "ERROR" );
-        $backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] );
-        G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] );
+        $backUrlObj = explode( "sys" . config("system.workspace"), $_SERVER['HTTP_REFERER'] );
+        G::header( "location: " . "/sys" . config("system.workspace") . $backUrlObj[1] );
        die();
    }

--- a/workflow/engine/methods/cases/cases_ShowOutputDocument.php
+++ b/workflow/engine/methods/cases/cases_ShowOutputDocument.php
@@ -122,8 +122,8 @@ if (!$sw_file_exists) {
            print G::json_encode( $res );
    } else {
        G::SendMessageText( $error_message, "ERROR" );
-        $backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] );
-        G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] );
+        $backUrlObj = explode( "sys" . config("system.workspace"), $_SERVER['HTTP_REFERER'] );
+        G::header( "location: " . "/sys" . config("system.workspace") . $backUrlObj[1] );
        die();
    }

@@ -159,7 +159,7 @@ if (!$sw_file_exists) {
        }
        /*----------------------------------********---------------------------------*/
        if (!$downloadStatus) {
-            G::streamFile( $realPath, $download, $nameFile); //download
+            G::streamFile( $realPath, $download, G::inflect($nameFile)); //download
        }
    }
 }
--- a/workflow/engine/methods/cases/main_init.php
+++ b/workflow/engine/methods/cases/main_init.php
@@ -29,7 +29,7 @@ $oHeadPublisher->addExtJsScript( "cases/main", false ); //Adding a javascript fi
 $oHeadPublisher->addContent( "cases/main" ); //Adding a html file  .html.

 $keyMem = "USER_PREFERENCES" . $_SESSION["USER_LOGGED"];
-$memcache = &PMmemcached::getSingleton( SYS_SYS );
+$memcache = &PMmemcached::getSingleton( config("system.workspace") );

 if (($arrayConfig = $memcache->get( $keyMem )) === false) {
    $conf->loadConfig( $x, "USER_PREFERENCES", "", "", $_SESSION["USER_LOGGED"], "" );
--- a/workflow/engine/methods/enterprise/addonsStore.php
+++ b/workflow/engine/methods/enterprise/addonsStore.php
@@ -9,7 +9,7 @@ $oHeadPublisher = &headPublisher::getSingleton();

 if (isset($licenseManager->date) && is_array($licenseManager->date)) {
    $conf = new Configurations();
-    if ( defined('SYS_SYS') && $conf->exists("ENVIRONMENT_SETTINGS")) {
+    if (!empty(config("system.workspace")) && $conf->exists("ENVIRONMENT_SETTINGS")) {
        $licenseManager->date['START']  = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['START']));
        $licenseManager->date['END']    = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['END']));
        $licenseManager->date['START']  = $conf->getSystemDate($licenseManager->date['START']);
@@ -63,7 +63,7 @@ $oHeadPublisher->assign("supportStartDate", (isset($licenseManager->supportStart
 $oHeadPublisher->assign("supportEndDate", (isset($licenseManager->supportEndDate))? $licenseManager->supportEndDate : '');

 $oHeadPublisher->assign("PROCESSMAKER_VERSION", System::getVersion());
-$oHeadPublisher->assign("PROCESSMAKER_URL", "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN );
+$oHeadPublisher->assign("PROCESSMAKER_URL", "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN );
 $oHeadPublisher->assign("SYS_SKIN", SYS_SKIN);
 $oHeadPublisher->assign("URL_PART_LOGIN", ((substr(SYS_SKIN, 0, 2) == "ux" && SYS_SKIN != "uxs")? "main/login" : "login/login"));
 $oHeadPublisher->assign("URL_PART_SETUP", EnterpriseUtils::getUrlPartSetup());
--- a/workflow/engine/methods/enterprise/addonsStoreAction.php
+++ b/workflow/engine/methods/enterprise/addonsStoreAction.php
@@ -160,7 +160,7 @@ try {
                }

                ///////
-                $workspace = SYS_SYS;
+                $workspace = config("system.workspace");
                $dbAdapter = DB_ADAPTER;

                $addon->setAddonState("download-start");
--- a/workflow/engine/methods/enterprise/enterprise.php
+++ b/workflow/engine/methods/enterprise/enterprise.php
@@ -8,7 +8,7 @@ if (!defined("PATH_PM_ENTERPRISE")) {
 }

 if (!defined("PATH_DATA_SITE")) {
-    define("PATH_DATA_SITE", PATH_DATA . "sites/" . SYS_SYS . "/");
+    define("PATH_DATA_SITE", PATH_DATA . "sites/" . config("system.workspace") . "/");
 }

 set_include_path(PATH_PM_ENTERPRISE . PATH_SEPARATOR . get_include_path());
@@ -78,12 +78,10 @@ class enterprisePlugin extends PMPlugin
            unset($_SESSION["__EE_SW_PMLICENSEMANAGER__"]);

            ///////
-            $js = "window.open(\"/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/setup/main?s=PLUGINS\", \"_top\", \"\");";
+            $js = "window.open(\"/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . "/setup/main?s=PLUGINS\", \"_top\", \"\");";

            if (substr(SYS_SKIN, 0, 2) == "ux" && SYS_SKIN != "uxs") {
-                //$js = "parent.window.location.href = \"/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/setup/main_init?s=PLUGINS\";";
-                //$js = "window.location.href = \"/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/setup/pluginsImport\";";
-                $js = "window.open(\"/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/main\", \"_top\", \"\");";
+                $js = "window.open(\"/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . "/main\", \"_top\", \"\");";
            }

            ///////
--- a/workflow/engine/methods/enterprise/processMakerAjax.php
+++ b/workflow/engine/methods/enterprise/processMakerAjax.php
@@ -63,7 +63,7 @@ function install($file)
        $context = stream_context_create($option);

        ///////
-        $fileData = @fopen(EnterpriseUtils::getUrlServerName() . "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/enterprise/services/processMakerUpgrade", "rb", false, $context);
+        $fileData = @fopen(EnterpriseUtils::getUrlServerName() . "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . "/enterprise/services/processMakerUpgrade", "rb", false, $context);

        if ($fileData === false) {
            throw (new Exception("Could not open services url."));
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -146,7 +146,7 @@ try {
                        $errLabel = G::LoadTranslation('ID_ACCOUNT') . ' "' . $usr . '" ' . G::LoadTranslation('ID_ACCOUNT_DISABLED_CONTACT_ADMIN');
                    }
                    //Log failed authentications
-            	    $message  = "| Many failed authentication attempts for USER: " . $usr . " | IP: " . G::getIpAddress() . " |  WS: " . SYS_SYS;
+            	    $message  = "| Many failed authentication attempts for USER: " . $usr . " | IP: " . G::getIpAddress() . " |  WS: " . config("system.workspace");
            	    $message .= " | BROWSER: " . $_SERVER['HTTP_USER_AGENT'];

            	    G::log($message, PATH_DATA, 'loginFailed.log');
@@ -171,7 +171,7 @@ try {
        }

        if (!isset( $_SESSION['WORKSPACE'] ) ) {
-            $_SESSION['WORKSPACE'] = SYS_SYS;
+            $_SESSION['WORKSPACE'] = config("system.workspace");
        }

        //Execute the SSO Script from plugin
@@ -182,14 +182,12 @@ try {
            $oPluginRegistry->executeTriggers ( PM_LOGIN , $loginInfo );
        }
        EnterpriseClass::enterpriseSystemUpdate($loginInfo);
-        $_SESSION['USER_LOGGED']  = $uid;
-        $_SESSION['USR_USERNAME'] = $usr;
+        initUserSession($uid, $usr);
    } else {
        setcookie("singleSignOn", '1', time() + (24 * 60 * 60), '/');
        $uid = $RBAC->userObj->fields['USR_UID'];
        $usr = $RBAC->userObj->fields['USR_USERNAME'];
-        $_SESSION['USER_LOGGED']  = $uid;
-        $_SESSION['USR_USERNAME'] = $usr;
+        initUserSession($uid, $usr);
    }

    //Set default Languaje
@@ -248,7 +246,7 @@ try {
        $userTimeZone = $user->getUsrTimeZone();

        if (trim($userTimeZone) == '') {
-            $arraySystemConfiguration = System::getSystemConfiguration('', '', SYS_SYS);
+            $arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));

            $userTimeZone = $arraySystemConfiguration['time_zone'];
        }
@@ -409,7 +407,7 @@ try {
        die;
    }

-    $configS = System::getSystemConfiguration('', '', SYS_SYS);
+    $configS = System::getSystemConfiguration('', '', config("system.workspace"));
    $activeSession = isset($configS['session_block']) ? !(int)$configS['session_block']:true;
    if ($activeSession){
        setcookie("PM-TabPrimary", 101010010, time() + (24 * 60 * 60), '/');
--- a/workflow/engine/methods/login/authenticationSso.php
+++ b/workflow/engine/methods/login/authenticationSso.php
@@ -20,7 +20,7 @@ try {
            }

            header(
-                'Location: /sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN .
+                'Location: /sys' . config("system.workspace") . '/' . SYS_LANG . '/' . SYS_SKIN .
                '/login/login' . (($u != '')? '?u=' . $u : '')
            );

@@ -40,7 +40,7 @@ try {
    }
    /*----------------------------------********---------------------------------*/

-    $arraySystemConfiguration = System::getSystemConfiguration('', '', SYS_SYS);
+    $arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));

    //Set User Time Zone
    $user = UsersPeer::retrieveByPK($userUid);
@@ -129,9 +129,10 @@ try {

    setcookie('singleSignOn', '1', time() + (24 * 60 * 60), '/');

-    $_SESSION['USER_LOGGED']  = $_SESSION['__USER_LOGGED_SSO__'];
-    $_SESSION['USR_USERNAME'] = $_SESSION['__USR_USERNAME_SSO__'];
-
+    initUserSession(
+        $_SESSION['__USER_LOGGED_SSO__'],
+        $_SESSION['__USR_USERNAME_SSO__']
+    );
    unset($_SESSION['__USER_LOGGED_SSO__'], $_SESSION['__USR_USERNAME_SSO__']);

    G::header('Location: ' . $location);
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -188,9 +188,9 @@ session_start();
 session_regenerate_id();

 if (PHP_VERSION < 5.2) {
-    setcookie("workspaceSkin", SYS_SKIN, time() + (24 * 60 * 60), "/sys" . SYS_SYS, "; HttpOnly");
+    setcookie("workspaceSkin", SYS_SKIN, time() + (24 * 60 * 60), "/sys" . config("system.workspace"), "; HttpOnly");
 } else {
-    setcookie("workspaceSkin", SYS_SKIN, time() + (24 * 60 * 60), "/sys" . SYS_SYS, null, false, true);
+    setcookie("workspaceSkin", SYS_SKIN, time() + (24 * 60 * 60), "/sys" . config("system.workspace"), null, false, true);
 }

 if (strlen($msg) > 0) {
@@ -361,7 +361,7 @@ $flagForgotPassword = isset($oConf->aConfig['login_enableForgotPassword'])

 setcookie('PM-Warning', trim(G::LoadTranslation('ID_BLOCKER_MSG'), '*'), time() + (24 * 60 * 60), SYS_URI);

-$configS = System::getSystemConfiguration('', '', SYS_SYS);
+$configS = System::getSystemConfiguration('', '', config("system.workspace"));
 $activeSession = isset($configS['session_block']) ? !(int)$configS['session_block'] : true;
 if ($activeSession) {
    setcookie("PM-TabPrimary", 101010010, time() + (24 * 60 * 60), '/');
--- a/workflow/engine/methods/oauth2/grant.php
+++ b/workflow/engine/methods/oauth2/grant.php
@@ -9,7 +9,7 @@ if (! empty($_GET['error'])) {

 $http = G::is_https() ? 'https' : 'http';
 $host = $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : '');
-$endpoint = sprintf('%s://%s/%s/oauth2/token', $http, $host, SYS_SYS);
+$endpoint = sprintf('%s://%s/%s/oauth2/token', $http, $host, config("system.workspace"));
 $code = empty($_GET['code']) ? 'NN' : $_GET['code'];

 $clientId = 'x-pm-local-client';
--- a/workflow/engine/methods/processes/consolidated.php
+++ b/workflow/engine/methods/processes/consolidated.php
@@ -19,7 +19,7 @@ class AdditionalTablesConsolidated extends AdditionalTables
                $sClassName = $this->getPHPName($sTableName);
            }

-            $sPath = PATH_DB . SYS_SYS . PATH_SEP . 'classes' . PATH_SEP;
+            $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
            if (!file_exists($sPath)) {
                G::mk_dir($sPath);
                G::mk_dir($sPath . 'map');
@@ -626,7 +626,7 @@ class ajax_con extends WebResource

            $oAdditionalTables->createPropelClasses($tableName, $sClassName, $aFieldsClases, $sTasUid);
        } else {
-            $sPath = PATH_DB . SYS_SYS . PATH_SEP . 'classes' . PATH_SEP;
+            $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
            @unlink($sPath . $sClassName . '.php');
            @unlink($sPath . $sClassName . 'Peer.php');
            @unlink($sPath . PATH_SEP . 'map' . PATH_SEP . $sClassName . 'MapBuilder.php');
--- a/workflow/engine/methods/processes/mainInit.php
+++ b/workflow/engine/methods/processes/mainInit.php
@@ -92,7 +92,7 @@ $oHeadPublisher->assign("arrayContextMenuOptionPlugin", $arrayContextMenuOptionP
 $oHeadPublisher->assign('extJsViewState', $oHeadPublisher->getExtJsViewState());

 $designer = new Designer();
-$oHeadPublisher->assign('SYS_SYS', SYS_SYS);
+$oHeadPublisher->assign('SYS_SYS', config("system.workspace"));
 $oHeadPublisher->assign('SYS_LANG', SYS_LANG);
 $oHeadPublisher->assign('SYS_SKIN', SYS_SKIN);
 $oHeadPublisher->assign('HTTP_SERVER_HOSTNAME', System::getHttpServerHostnameRequestsFrontEnd());
--- a/workflow/engine/methods/processes/processesList.php
+++ b/workflow/engine/methods/processes/processesList.php
@@ -33,8 +33,6 @@ $oProcess = new Process();
 $oProcess->dir = $dir;
 $oProcess->sort = $sort;

-//$memcache = & PMmemcached::getSingleton( SYS_SYS );
-
 $memkey = 'no memcache';
 $memcacheUsed = 'not used';
 $totalCount = 0;
--- a/workflow/engine/methods/processes/processes_Ajax.php
+++ b/workflow/engine/methods/processes/processes_Ajax.php
@@ -189,13 +189,13 @@ try {

            $filter = new InputFilter();
            $form = $_REQUEST;
-            $filePath = PATH_DATA . "sites" . PATH_SEP . SYS_SYS . PATH_SEP . "public" . PATH_SEP . $form['PRO_UID'] . PATH_SEP . $form['FILENAME'];
+            $filePath = PATH_DATA . "sites" . PATH_SEP . config("system.workspace") . PATH_SEP . "public" . PATH_SEP . $form['PRO_UID'] . PATH_SEP . $form['FILENAME'];
            if (file_exists($filePath)) {
                unlink($filter->validateInput($filePath, 'path'));
                $webEntry = new \ProcessMaker\BusinessModel\WebEntry();
                $webEntry->deleteClassic($form['PRO_UID'], $filePath);
            }
-            $filePath = PATH_DATA . "sites" . PATH_SEP . SYS_SYS . PATH_SEP . "public" . PATH_SEP . $form['PRO_UID'] . PATH_SEP . str_replace(".php", "Post", $form['FILENAME']) . ".php";
+            $filePath = PATH_DATA . "sites" . PATH_SEP . config("system.workspace") . PATH_SEP . "public" . PATH_SEP . $form['PRO_UID'] . PATH_SEP . str_replace(".php", "Post", $form['FILENAME']) . ".php";
            if (file_exists($filePath)) {
                unlink($filter->validateInput($filePath, 'path'));
            }
@@ -900,8 +900,8 @@ try {
            $resultArray = array();
            $proUid = isset($_REQUEST['PRO_UID']) ? $_REQUEST['PRO_UID'] : '';
            $dynUid = isset($_REQUEST['DYN_UID']) ? $_REQUEST['DYN_UID'] : '';
-            if (is_file(PATH_DATA . '/sites/' . SYS_SYS . '/xmlForms/' . $proUid . '/' . $dynUid . '.xml') && filesize(PATH_DATA . '/sites/' . SYS_SYS . '/xmlForms/' . $proUid . '/' . $dynUid . '.xml') > 0) {
-                $dyn = new DynaformHandler(PATH_DATA . '/sites/' . SYS_SYS . '/xmlForms/' . $proUid . '/' . $dynUid . '.xml');
+            if (is_file(PATH_DATA . '/sites/' . config("system.workspace") . '/xmlForms/' . $proUid . '/' . $dynUid . '.xml') && filesize(PATH_DATA . '/sites/' . config("system.workspace") . '/xmlForms/' . $proUid . '/' . $dynUid . '.xml') > 0) {
+                $dyn = new DynaformHandler(PATH_DATA . '/sites/' . config("system.workspace") . '/xmlForms/' . $proUid . '/' . $dynUid . '.xml');
                $dynaformFields[] = $dyn->getFields();
            }
            foreach ($dynaformFields as $aDynFormFields) {
--- a/workflow/engine/methods/processes/processes_DownloadFile.php
+++ b/workflow/engine/methods/processes/processes_DownloadFile.php
@@ -6,7 +6,7 @@ if (!isset($_GET["file_hash"])) {
 }

 $httpStream = new \ProcessMaker\Util\IO\HttpStream();
-$outputDir = PATH_DATA . "sites" . PATH_SEP . SYS_SYS . PATH_SEP . "files" . PATH_SEP . "output" . PATH_SEP;
+$outputDir = PATH_DATA . "sites" . PATH_SEP . config("system.workspace") . PATH_SEP . "files" . PATH_SEP . "output" . PATH_SEP;
 $fileName = urldecode(base64_decode($_GET["file_hash"]));
 $processFile = $outputDir . $fileName;

--- a/workflow/engine/methods/processes/processes_Export.php
+++ b/workflow/engine/methods/processes/processes_Export.php
@@ -24,7 +24,7 @@
 use  ProcessMaker\Util\Common;

 $response = new StdClass();
-$outputDir = PATH_DATA . "sites" . PATH_SEP . SYS_SYS . PATH_SEP . "files" . PATH_SEP . "output" . PATH_SEP;
+$outputDir = PATH_DATA . "sites" . PATH_SEP . config("system.workspace") . PATH_SEP . "files" . PATH_SEP . "output" . PATH_SEP;

 try {
 	if(empty($_GET)){
--- a/workflow/engine/methods/processes/processes_GetFile.php
+++ b/workflow/engine/methods/processes/processes_GetFile.php
@@ -1,18 +1,32 @@
 <?php
-switch ($_GET['MAIN_DIRECTORY']) {
+global $RBAC;
+$RBAC->allows(basename(__FILE__), $_GET['MAIN_DIRECTORY']);
+
+$mainDirectory = !empty($_GET['MAIN_DIRECTORY']) ? $_GET['MAIN_DIRECTORY'] : '';
+$proUid = !empty($_GET['PRO_UID']) ? $_GET['PRO_UID'] : '';
+$currentDirectory = !empty($_GET['CURRENT_DIRECTORY']) ? realpath($_GET['CURRENT_DIRECTORY']) . PATH_SEP : '';
+$file = !empty($_GET['FILE']) ? realpath($_GET['FILE']) : '';
+$extension = (!empty($_GET['sFilextension']) && $_GET['sFilextension'] === 'javascript') ? '.js' : '';
+
+//validated process exists, return throw if not exists.
+$process = new Process();
+$process->load($proUid);
+
+switch ($mainDirectory) {
    case 'mailTemplates':
-        $sDirectory = PATH_DATA_MAILTEMPLATES . $_GET['PRO_UID'] . PATH_SEP . ($_GET['CURRENT_DIRECTORY'] != '' ? $_GET['CURRENT_DIRECTORY'] . PATH_SEP : '');
+        $directory = PATH_DATA_MAILTEMPLATES;
        break;
    case 'public':
-        $sDirectory = PATH_DATA_PUBLIC . $_GET['PRO_UID'] . PATH_SEP . ($_GET['CURRENT_DIRECTORY'] != '' ? $_GET['CURRENT_DIRECTORY'] . PATH_SEP : '');
+        $directory = PATH_DATA_PUBLIC;
        break;
    default:
        die();
        break;
 }
-//fixed: added a file extension when is a javascript file by krlos
-$_GET['FILE'] .= ($_GET['sFilextension'] != '' && $_GET['sFilextension'] == 'javascript') ? '.js' : '';

-if (file_exists( $sDirectory . $_GET['FILE'] )) {
-    G::streamFile( $sDirectory . $_GET['FILE'], true );
+$directory .= $proUid . PATH_SEP . $currentDirectory;
+$file .= $extension;
+
+if (file_exists($directory . $file)) {
+    G::streamFile($directory . $file, true);
 }
--- a/workflow/engine/methods/processes/processes_Import_Ajax.php
+++ b/workflow/engine/methods/processes/processes_Import_Ajax.php
@@ -70,7 +70,7 @@ if (PMLicensedFeatures::getSingleton()->verifyfeature("B0oWlBLY3hHdWY0YUNpZEtFQm

        if (!empty($arrayTrigger)) {

-            $cs = new CodeScanner(SYS_SYS);
+            $cs = new CodeScanner(config("system.workspace"));

            $strFoundDisabledCode = "";

--- a/workflow/engine/methods/processes/processes_Import_Bpmn.php
+++ b/workflow/engine/methods/processes/processes_Import_Bpmn.php
@@ -4,7 +4,6 @@ ini_set("max_execution_time", 0);

 $filter = new InputFilter();
 $_FILES = $filter->xssFilterHard($_FILES);
-$_SESSION['USER_LOGGED'] = $filter->xssFilterHard($_SESSION['USER_LOGGED']);

 if (isset($_FILES["PROCESS_FILENAME"]) &&
        pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION) == "bpmn"
--- a/workflow/engine/methods/processes/processes_webEntryGenerate.php
+++ b/workflow/engine/methods/processes/processes_webEntryGenerate.php
@@ -68,8 +68,8 @@ try {
        $pluginTpl = PATH_CORE . 'templates' . PATH_SEP . 'processes' . PATH_SEP . 'webentryPost.tpl';
        $template = new TemplatePower( $pluginTpl );
        $template->prepare();
-        $template->assign( 'wsdlUrl', $http . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/services/wsdl2' );
-        $template->assign( 'wsUploadUrl', $http . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/services/upload' );
+        $template->assign( 'wsdlUrl', $http . $_SERVER['HTTP_HOST'] . '/sys' . config("system.workspace") . '/' . SYS_LANG . '/' . SYS_SKIN . '/services/wsdl2' );
+        $template->assign( 'wsUploadUrl', $http . $_SERVER['HTTP_HOST'] . '/sys' . config("system.workspace") . '/' . SYS_LANG . '/' . SYS_SKIN . '/services/upload' );
        $template->assign( 'processUid', $sPRO_UID );
        $template->assign( 'dynaformUid', $sDYNAFORM );
        $template->assign( 'taskUid', $sTASKS );
@@ -88,7 +88,7 @@ try {

        $template->assign( 'dynaform', $dynTitle );
        $template->assign( 'timestamp', date( 'l jS \of F Y h:i:s A' ) );
-        $template->assign( 'ws', SYS_SYS );
+        $template->assign( 'ws', config("system.workspace") );
        $template->assign( 'version', System::getVersion() );

        $fileName = $pathProcess . $dynTitle . 'Post.php';
@@ -134,13 +134,13 @@ try {
        $aDataEvent['EVN_CONDITIONS'] = $sWS_USER;
        $output = $oEvent->update( $aDataEvent );
        //Show link
-        $link = $http . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/' . $sPRO_UID . '/' . $dynTitle . '.php';
+        $link = $http . $_SERVER['HTTP_HOST'] . '/sys' . config("system.workspace") . '/' . SYS_LANG . '/' . SYS_SKIN . '/' . $sPRO_UID . '/' . $dynTitle . '.php';
        print $link;
        //print "\n<a href='$link' target='_new' > $link </a>";

    } else {
        $G_FORM = new Form( $sPRO_UID . '/' . $sDYNAFORM, PATH_DYNAFORM, SYS_LANG, false );
-        $G_FORM->action = $http . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/services/cases_StartExternal.php';
+        $G_FORM->action = $http . $_SERVER['HTTP_HOST'] . '/sys' . config("system.workspace") . '/' . SYS_LANG . '/' . SYS_SKIN . '/services/cases_StartExternal.php';

        $scriptCode = '';
        $scriptCode = $G_FORM->render( PATH_CORE . 'templates/' . 'xmlform' . '.html', $scriptCode );
@@ -158,7 +158,7 @@ try {
        $template->assign("URL_MABORAK_JS", G::browserCacheFilesUrl("/js/maborak/core/maborak.js"));
        $template->assign("URL_TRANSLATION_ENV_JS", G::browserCacheFilesUrl("/jscore/labels/" . SYS_LANG . ".js"));
        $template->assign("siteUrl", $http . $_SERVER["HTTP_HOST"]);
-        $template->assign("sysSys", SYS_SYS);
+        $template->assign("sysSys", config("system.workspace"));
        $template->assign("sysLang", SYS_LANG);
        $template->assign("sysSkin", SYS_SKIN);
        $template->assign("processUid", $sPRO_UID);
--- a/workflow/engine/methods/processes/processes_webEntryValidate.php
+++ b/workflow/engine/methods/processes/processes_webEntryValidate.php
@@ -29,7 +29,7 @@ if (G::is_https()) {
    $http = 'http://';
 }

-$endpoint = $http . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/services/wsdl2';
+$endpoint = $http . $_SERVER['HTTP_HOST'] . '/sys' . config("system.workspace") . '/' . SYS_LANG . '/' . SYS_SKIN . '/services/wsdl2';
 $client = new SoapClient( $endpoint, $streamContext );

 $user = $sWS_USER;
--- a/workflow/engine/methods/processes/webEntry_Val_Assig.php
+++ b/workflow/engine/methods/processes/webEntry_Val_Assig.php
@@ -14,7 +14,7 @@ if (G::is_https())
 else
    $http = 'http://';

-$endpoint = $http . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/services/wsdl2';
+$endpoint = $http . $_SERVER['HTTP_HOST'] . '/sys' . config("system.workspace") . '/' . SYS_LANG . '/' . SYS_SKIN . '/services/wsdl2';
@$client = new SoapClient( $endpoint );

 $oTask = new Task();
--- a/workflow/engine/methods/services/webdav.php
+++ b/workflow/engine/methods/services/webdav.php
@@ -37,7 +37,7 @@ function AuthenticationBasicHTTP ($realm)
    return false;
 }

-$realm = 'ProcessMaker Filesystem for Workspace ' . SYS_SYS;
+$realm = 'ProcessMaker Filesystem for Workspace ' . config("system.workspace");

 # Choice an authentification type Digest or Basic
 //AuthenticationDigestHTTP($realm, $users, $phpcgi);
--- a/workflow/engine/methods/services/webentry/anonymousLogin.php
+++ b/workflow/engine/methods/services/webentry/anonymousLogin.php
@@ -24,8 +24,7 @@ try {
        throw new \Exception('WebEntry User not found');
    }

-    $_SESSION['USER_LOGGED'] = $userUid;
-    $_SESSION['USR_USERNAME'] = $userInfo['username'];
+    initUserSession($userUid, $userInfo['username']);

    $result = [
        'user_logged'  => $userUid,
--- a/workflow/engine/methods/services/wsdl2.php
+++ b/workflow/engine/methods/services/wsdl2.php
@@ -6,7 +6,7 @@ $content = file_get_contents($filewsdl);
 $http = G::is_https() ? 'https' : 'http';
 $port = $_SERVER['SERVER_PORT'] === '80' ? '' : ':' . $_SERVER['SERVER_PORT'];
 $lang = defined('SYS_LANG') ? SYS_LANG : 'en';
-$endpoint = $http . '://' . $_SERVER['SERVER_NAME'] . $port . '/sys' . SYS_SYS . '/' . $lang . '/neoclassic/services/soap2';
+$endpoint = $http . '://' . $_SERVER['SERVER_NAME'] . $port . '/sys' . config("system.workspace") . '/' . $lang . '/neoclassic/services/soap2';

 $content = str_replace("___SOAP_ADDRESS___", $endpoint, $content);

--- a/workflow/engine/methods/setup/auditLogAjax.php
+++ b/workflow/engine/methods/setup/auditLogAjax.php
@@ -110,7 +110,7 @@ $response = array ();
 switch ($option) {
    case "LST":
        $pageSize = $_REQUEST["pageSize"];
-        $workspace = SYS_SYS;
+        $workspace = config("system.workspace");
        $action = $_REQUEST["action"];
        $description = $_REQUEST["description"];
        $dateFrom = $_REQUEST["dateFrom"];
--- a/workflow/engine/methods/setup/cronAjax.php
+++ b/workflow/engine/methods/setup/cronAjax.php
@@ -116,7 +116,7 @@ $response = array ();
 switch ($option) {
    case "LST":
        $pageSize = $_REQUEST["pageSize"];
-        $workspace = SYS_SYS;
+        $workspace = config("system.workspace");
        $status = $_REQUEST["status"];
        $dateFrom = $_REQUEST["dateFrom"];
        $dateTo = $_REQUEST["dateTo"];
--- a/workflow/engine/methods/setup/languages_Import.php
+++ b/workflow/engine/methods/setup/languages_Import.php
@@ -78,7 +78,7 @@ try {
    $configuration = new Configurations();
    $importResults = $language->import( $languageFile );

-    $renegerateContent = new WorkspaceTools( SYS_SYS );
+    $renegerateContent = new WorkspaceTools( config("system.workspace") );
    $messs = $renegerateContent->upgradeContent();

    $result->msg = G::LoadTranslation( 'IMPORT_LANGUAGE_SUCCESS' ) . "\n";
--- a/workflow/engine/methods/setup/loginSettingsAjax.php
+++ b/workflow/engine/methods/setup/loginSettingsAjax.php
@@ -19,7 +19,7 @@ switch ($request) {
        print (G::json_encode( $result )) ;
        break;
    case 'saveSettings':
-        $memcache = & PMmemcached::getSingleton( defined( 'SYS_SYS' ) ? SYS_SYS : '' );
+        $memcache = & PMmemcached::getSingleton( !empty(config("system.workspace")) ? config("system.workspace") : '' );

        $conf = new Configurations();
        $conf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
--- a/workflow/engine/methods/setup/pluginsChange.php
+++ b/workflow/engine/methods/setup/pluginsChange.php
@@ -56,7 +56,7 @@ if ($handle = opendir(PATH_PLUGINS)) {
                    ) {
                        //Check disabled code

-                        $cs = new CodeScanner(SYS_SYS);
+                        $cs = new CodeScanner(config("system.workspace"));

                        $arrayFoundDisabledCode = array_merge(
                            $cs->checkDisabledCode("FILE", PATH_PLUGINS . $pluginName . ".php"),
--- a/workflow/engine/methods/setup/pluginsImportFile.php
+++ b/workflow/engine/methods/setup/pluginsImportFile.php
@@ -251,7 +251,7 @@ try {
        if (PMLicensedFeatures::getSingleton()->verifyfeature("B0oWlBLY3hHdWY0YUNpZEtFQm5CeTJhQlIwN3IxMEkwaG4=")) {
            //Check disabled code

-            $cs = new CodeScanner(SYS_SYS);
+            $cs = new CodeScanner(config("system.workspace"));

            $arrayFoundDisabledCode = array_merge($cs->checkDisabledCode("FILE", $path . $pluginFile), $cs->checkDisabledCode("PATH", $path . $sClassName));

--- a/workflow/engine/methods/setup/pluginsList.php
+++ b/workflow/engine/methods/setup/pluginsList.php
@@ -24,5 +24,5 @@
 */
 $RBAC->requirePermissions('PM_SETUP_ADVANCE');

-$items = \PMPlugin::getListPluginsManager(SYS_SYS);
+$items = \PMPlugin::getListPluginsManager(config("system.workspace"));
 echo G::json_encode($items);
--- a/workflow/engine/methods/setup/pluginsMain.php
+++ b/workflow/engine/methods/setup/pluginsMain.php
@@ -30,7 +30,7 @@ $RBAC->requirePermissions( 'PM_SETUP' );

 $headPublisher = & headPublisher::getSingleton();
 $headPublisher->addExtJsScript( 'setup/pluginsMain', false );
-$headPublisher->assign( "PROCESSMAKER_URL", "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN );
+$headPublisher->assign( "PROCESSMAKER_URL", "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN );
 $headPublisher->assign( "SYS_SKIN", SYS_SKIN );

 $oPluginRegistry = PluginRegistry::loadSingleton();
--- a/workflow/engine/methods/setup/replacementLogo.php
+++ b/workflow/engine/methods/setup/replacementLogo.php
@@ -63,7 +63,7 @@ try { //ini_set('display_errors','1');
            $snameLogo = changeNamelogo( $snameLogo );

            $oConf = new Configurations();
-            $aConf = Array ('WORKSPACE_LOGO_NAME' => SYS_SYS,'DEFAULT_LOGO_NAME' => $snameLogo
+            $aConf = Array ('WORKSPACE_LOGO_NAME' => config("system.workspace"),'DEFAULT_LOGO_NAME' => $snameLogo
            );

            $oConf->aConfig = $aConf;
--- a/workflow/engine/methods/setup/skin_Ajax.php
+++ b/workflow/engine/methods/setup/skin_Ajax.php
@@ -162,7 +162,7 @@ function newSkin ($baseSkin = 'classic')

        $xmlConfiguration = file_get_contents( $configFileOriginal );

-        $workspace = ($_REQUEST['workspace'] == 'global') ? '' : SYS_SYS;
+        $workspace = ($_REQUEST['workspace'] == 'global') ? '' : config("system.workspace");

        $xmlConfigurationObj = G::xmlParser($xmlConfiguration);
        $skinInformationArray = $xmlConfigurationObj->result["skinConfiguration"]["__CONTENT__"]["information"]["__CONTENT__"];
@@ -282,7 +282,7 @@ function importSkin ()
        $configFileFinal = PATH_CUSTOM_SKINS . $skinName . PATH_SEP . 'config.xml';
        $xmlConfiguration = file_get_contents( $configFileOriginal );

-        $workspace = ($_REQUEST['workspace'] == 'global') ? '' : SYS_SYS;
+        $workspace = ($_REQUEST['workspace'] == 'global') ? '' : config("system.workspace");

        $xmlConfigurationObj = G::xmlParser($xmlConfiguration);
        $skinInformationArray = $xmlConfigurationObj->result["skinConfiguration"]["__CONTENT__"]["information"]["__CONTENT__"];
--- a/workflow/engine/methods/setup/skinsList.php
+++ b/workflow/engine/methods/setup/skinsList.php
@@ -44,7 +44,7 @@ $oHeadPublisher->addExtJsScript( 'setup/skinList', false ); //adding a javascrip
 $oHeadPublisher->addContent( 'setup/skinList' ); //adding a html file  .html.
 $oHeadPublisher->assign( 'CONFIG', $Config );
 $oHeadPublisher->assign( 'SYS_SKIN', SYS_SKIN );
-$oHeadPublisher->assign( 'SYS_SYS', "sys".SYS_SYS );
+$oHeadPublisher->assign( 'SYS_SYS', "sys".config("system.workspace") );

 $oHeadPublisher->assign( 'FORMATS', $c->getFormats() );

--- a/workflow/engine/methods/setup/webServicesAjax.php
+++ b/workflow/engine/methods/setup/webServicesAjax.php
@@ -66,7 +66,7 @@ switch ($_POST['action']) {

        if (! isset( $_SESSION['END_POINT'] )) {
            $aFields['WS_HOST'] = $_SERVER['HTTP_HOST'];
-            $aFields['WS_WORKSPACE'] = SYS_SYS;
+            $aFields['WS_WORKSPACE'] = config("system.workspace");
        } else {
            if (strpos( $_SESSION['END_POINT'], 'https' ) !== false) {
                preg_match( '@^(?:https://)?([^/]+)@i', $_SESSION['END_POINT'], $coincidencias );
@@ -94,15 +94,14 @@ switch ($_POST['action']) {
        $_SESSION['_DBArray'] = $_DBArray;

        if (! isset( $_SESSION['END_POINT'] )) {
-            //$wsdl = 'http://'.$_SERVER['HTTP_HOST'].'/sys'.SYS_SYS. '/'. SYS_LANG .'/classic/services/wsdl';
            $wsdl = 'http://' . $_SERVER['HTTP_HOST'];
-            $workspace = SYS_SYS;
+            $workspace = config("system.workspace");
        } else {
            $wsdl = $_SESSION['END_POINT'];
            $workspace = $_SESSION['WS_WORKSPACE'];
        }

-        $defaultEndpoint = 'http://' . $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/classic/services/wsdl2';
+        $defaultEndpoint = 'http://' . $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'] . '/sys' . config("system.workspace") . '/' . SYS_LANG . '/classic/services/wsdl2';

        $wsdl = isset( $_SESSION['END_POINT'] ) ? $_SESSION['END_POINT'] : $defaultEndpoint;

@@ -144,7 +143,7 @@ try {
        if (isset( $_POST["epr"] )) {
            $_SESSION['END_POINT'] = $_POST["epr"];
        }
-        $defaultEndpoint = 'http://' . $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/classic/services/wsdl2';
+        $defaultEndpoint = 'http://' . $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'] . '/sys' . config("system.workspace") . '/' . SYS_LANG . '/classic/services/wsdl2';

        $endpoint = isset( $_SESSION['END_POINT'] ) ? $_SESSION['END_POINT'] : $defaultEndpoint;

@@ -616,7 +615,7 @@ try {
                $caseNumber = $oCases->getAppNumber();

                // generating the path for the template msj
-                $templateFile = PATH_DB . SYS_SYS . PATH_SEP . 'mailTemplates' . PATH_SEP . $proUid . PATH_SEP . 'tempTemplate.hml';
+                $templateFile = PATH_DB . config("system.workspace") . PATH_SEP . 'mailTemplates' . PATH_SEP . $proUid . PATH_SEP . 'tempTemplate.hml';
                // generating the file adding the msj variable
                $messageBody = "message for case: " . $caseNumber . "<br>" . $message;
                file_put_contents( $templateFile, $messageBody );
@@ -1461,7 +1460,7 @@ try {

                function sendFile ($FILENAME, $USR_UID, $APP_UID, $DEL_INDEX = 1, $DOC_UID = null, $title = null, $comment = null)
                {
-                    $defaultEndpoint = 'http://' . $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/classic/services/upload';
+                    $defaultEndpoint = 'http://' . $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'] . '/sys' . config("system.workspace") . '/' . SYS_LANG . '/classic/services/upload';
                    $upload = isset( $_SESSION['END_POINT'] ) ? $_SESSION['END_POINT'] : $defaultEndpoint;

                    $DOC_UID = ($DOC_UID != null) ? $DOC_UID : - 1;
--- a/workflow/engine/methods/setup/webServicesSetup.php
+++ b/workflow/engine/methods/setup/webServicesSetup.php
@@ -29,7 +29,7 @@ $ses = new DBSession( $dbc );

 if (! isset( $_SESSION['END_POINT'] )) {
    $aFields['WS_HOST'] = $_SERVER['HTTP_HOST'];
-    $aFields['WS_WORKSPACE'] = SYS_SYS;
+    $aFields['WS_WORKSPACE'] = config("system.workspace");
 } else {
    if (strpos( $_SESSION['END_POINT'], 'https' ) !== false) {
        preg_match( '@^(?:https://)?([^/]+)@i', $_SESSION['END_POINT'], $coincidencias );
--- a/workflow/engine/methods/tracker/tracker_ShowDocument.php
+++ b/workflow/engine/methods/tracker/tracker_ShowDocument.php
@@ -65,8 +65,8 @@ if (! $sw_file_exists) {
        print G::json_encode( $res );
    } else {
        G::SendMessageText( $error_message, "ERROR" );
-        $backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] );
-        G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] );
+        $backUrlObj = explode( "sys" . config("system.workspace"), $_SERVER['HTTP_REFERER'] );
+        G::header( "location: " . "/sys" . config("system.workspace") . $backUrlObj[1] );
        die();
    }

--- a/workflow/engine/methods/tracker/tracker_ShowOutputDocument.php
+++ b/workflow/engine/methods/tracker/tracker_ShowOutputDocument.php
@@ -68,8 +68,8 @@ if (! $sw_file_exists) {
        print G::json_encode( $res );
    } else {
        G::SendMessageText( $error_message, "ERROR" );
-        $backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] );
-        G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] );
+        $backUrlObj = explode( "sys" . config("system.workspace"), $_SERVER['HTTP_REFERER'] );
+        G::header( "location: " . "/sys" . config("system.workspace") . $backUrlObj[1] );
        die();
    }

--- a/workflow/engine/methods/triggers/triggers_Save.php
+++ b/workflow/engine/methods/triggers/triggers_Save.php
@@ -61,7 +61,7 @@ if (isset( $sfunction ) && $sfunction == 'lookforNameTrigger') {
        ) {
            //Check disabled code

-            $cs = new CodeScanner(SYS_SYS);
+            $cs = new CodeScanner(config("system.workspace"));

            $arrayFoundDisabledCode = $cs->checkDisabledCode("SOURCE", $value["TRI_WEBBOT"]);

--- a/workflow/engine/methods/users/usersAjax.php
+++ b/workflow/engine/methods/users/usersAjax.php
@@ -129,6 +129,7 @@ switch ($_POST['action']) {
    case 'saveUser':
    case 'savePersonalInfo':
        try {
+            verifyCsrfToken($_POST);
            $user = new \ProcessMaker\BusinessModel\User();
            $form = $_POST;
            $permissionsToSaveData = $user->getPermissionsForEdit();
--- a/workflow/engine/methods/users/usersEdit.php
+++ b/workflow/engine/methods/users/usersEdit.php
@@ -33,7 +33,7 @@ if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkd
 }
 /*----------------------------------********---------------------------------*/

-$arraySystemConfiguration = System::getSystemConfiguration('', '', SYS_SYS);
+$arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));

 $oHeadPublisher = & headPublisher::getSingleton();
 $oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js
--- a/workflow/engine/methods/users/usersInit.php
+++ b/workflow/engine/methods/users/usersInit.php
@@ -48,7 +48,7 @@ if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkd
 }
 /*----------------------------------********---------------------------------*/

-$arraySystemConfiguration = System::getSystemConfiguration('', '', SYS_SYS);
+$arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));

 $oHeadPublisher = & headPublisher::getSingleton();
 $oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js
--- a/workflow/engine/methods/users/usersNew.php
+++ b/workflow/engine/methods/users/usersNew.php
@@ -38,7 +38,7 @@ if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkd
 }
 /*----------------------------------********---------------------------------*/

-$arraySystemConfiguration = System::getSystemConfiguration('', '', SYS_SYS);
+$arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));

 $oHeadPublisher = & headPublisher::getSingleton();
 $oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js