From 786af7d7dfdf4e8e5a3880b23ec288085dd9f736 Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Sat, 19 Dec 2020 01:52:57 +0000 Subject: [PATCH] PMCORE-2602 --- workflow/engine/data/mysql/insert.sql | 2 +- workflow/engine/methods/cases/viena_init.php | 50 --------------- .../engine/templates/cases/cases_viena.php | 62 ------------------- 3 files changed, 1 insertion(+), 113 deletions(-) delete mode 100644 workflow/engine/templates/cases/cases_viena.php diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 072819d92..80ca1bd20 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -60463,7 +60463,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_PLEASE_SELECT_PLUGIN','en','Please select the plugin','2014-01-15') , ( 'LABEL','ID_PLEASE_SELECT_PO_FILE','en','Please select a .po file','2014-01-15') , ( 'LABEL','ID_PLEASE_SELECT_THE_STATUS_FOR_THE_SEARCH','en','Please select the status for the search:','2020-12-16') , -( 'LABEL','ID_PLEASE_SELECT_UPGRADE_FILE','en','Please select the upgrade file','2014-01-15') ,ยบ +( 'LABEL','ID_PLEASE_SELECT_UPGRADE_FILE','en','Please select the upgrade file','2014-01-15') , ( 'LABEL','ID_PLEASE_SET_A_RANGE_OF_CASES_START_DATE_TO_SEARCH','en','Please set a range of cases Start Date to search:','2020-12-16') , ( 'LABEL','ID_PLEASE_SET_A_RANGE_OF_CASES_FINISH_DATE_TO_SEARCH','en','Please set a range of cases Finish Date to search:','2020-12-16') , ( 'LABEL','ID_PLEASE_SET_A_RANGE_TO_CASES_TO_SEARCH','en','Please set a range of cases to search:','2020-12-16') , diff --git a/workflow/engine/methods/cases/viena_init.php b/workflow/engine/methods/cases/viena_init.php index 7daf38c8f..f5fcf6aba 100644 --- a/workflow/engine/methods/cases/viena_init.php +++ b/workflow/engine/methods/cases/viena_init.php @@ -118,10 +118,6 @@ if ($oServerConf->isRtl(SYS_LANG)) { } $urlProxy = 'casesMenuLoader?action=getAllCounters&r='; -/*----------------------------------********---------------------------------*/ -$urlProxy = 'casesMenuLoader?action=getAllCountersEnterprise&r='; -/*----------------------------------********---------------------------------*/ - $oHeadPublisher->assign('regionTreePanel', $regionTreePanel); $oHeadPublisher->assign('regionDebug', $regionDebug); $oHeadPublisher->assign('openCaseIE', $openCaseIE); @@ -130,14 +126,6 @@ $oHeadPublisher->assign('urlProxy', $urlProxy); //sending the urlProxy to make $oHeadPublisher->assign("_nodeId", isset($confDefaultOption) ? $confDefaultOption : "PM_USERS"); //User menu permissions $oHeadPublisher->assign("FORMATS", $conf->getFormats()); -/*----------------------------------********---------------------------------*/ -// If the feature for highlight the home folders is enabled, set some javascript variables -if (HIGHLIGHT_HOME_FOLDER_ENABLE) { - $oHeadPublisher->assign("highlightUrlProxy", "casesMenuHighlight?r="); - $oHeadPublisher->assign("highlightRefreshTime", HIGHLIGHT_HOME_FOLDER_REFRESH_TIME); -} -/*----------------------------------********- --------------------------------*/ - $userCanAccess = 1; global $translation; @@ -151,41 +139,3 @@ ScriptVariables::add('SYS_LANG', SYS_LANG); ScriptVariables::add('TRANSLATIONS', $translation); ScriptVariables::add('FORMATS', $conf->getFormats()); echo View::make('Views::home.home', compact("userCanAccess"))->render(); - -/*----------------------------------********---------------------------------*/ -function getClientCredentials($clientId) -{ - $oauthQuery = new ProcessMaker\Services\OAuth2\PmPdo(getDsn()); - return $oauthQuery->getClientDetails($clientId); -} - -function getDsn() -{ - list($host, $port) = strpos(DB_HOST, ':') !== false ? explode(':', DB_HOST) : array(DB_HOST, ''); - $port = empty($port) ? '' : ";port=$port"; - $dsn = DB_ADAPTER . ':host=' . $host . ';dbname=' . DB_NAME . $port; - - return array('dsn' => $dsn, 'username' => DB_USER, 'password' => DB_PASS); -} - - -function getAuthorizationCode($client) -{ - \ProcessMaker\Services\OAuth2\Server::setDatabaseSource(getDsn()); - \ProcessMaker\Services\OAuth2\Server::setPmClientId($client['CLIENT_ID']); - - $oauthServer = new \ProcessMaker\Services\OAuth2\Server(); - $userId = $_SESSION['USER_LOGGED']; - $authorize = true; - $_GET = array_merge($_GET, array( - 'response_type' => 'code', - 'client_id' => $client['CLIENT_ID'], - 'scope' => implode(' ', $oauthServer->getScope()) - )); - - $response = $oauthServer->postAuthorize($authorize, $userId, true); - $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=') + 5, 40); - - return $code; -} -/*----------------------------------********---------------------------------*/ \ No newline at end of file diff --git a/workflow/engine/templates/cases/cases_viena.php b/workflow/engine/templates/cases/cases_viena.php deleted file mode 100644 index 331418685..000000000 --- a/workflow/engine/templates/cases/cases_viena.php +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - \ No newline at end of file