fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/PMC-1126 (pull request #7055)

Browse Source 
PMC-1126

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Andrea Adamczyk
2019-09-02 16:22:18 +00:00
committed by Julio Cesar Laura Avendaño
parent 79be4dfb76 6bd78ab4ed
commit 636509d546
4 changed files with 118 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/controllers/designer.php
View File

@@ -40,12 +40,12 @@ class Designer extends Controller
$clientToken = $this->getCredentials($httpData);
$debug = false; //System::isDebugMode();
$consolidated = 0;
$enterprise = 0;
$distribution = 0;
$usrUid = $RBAC->userObj->getUsrUid();
$usrUid = (isset($RBAC->userObj)) ? $RBAC->userObj->getUsrUid() : '';
$userProperties = UsersPropertiesPeer::retrieveByPk($usrUid);
/*----------------------------------********---------------------------------*/
@@ -72,7 +72,8 @@ class Designer extends Controller
$this->setVar("SYS_LANG", SYS_LANG);
$this->setVar("SYS_SKIN", SYS_SKIN);
$this->setVar('HTTP_SERVER_HOSTNAME', System::getHttpServerHostnameRequestsFrontEnd());
$this->setVar('PMDYNAFORM_FIRST_TIME', $userProperties->getPmdynaformFirstTime());
isset($userProperties) ? $this->setVar('PMDYNAFORM_FIRST_TIME',
$userProperties->getPmdynaformFirstTime()) : $this->setVar('PMDYNAFORM_FIRST_TIME', '0');
$inpuDocument = new InputDocument();
$this->setVar('maxFileSizeInformation', G::json_encode($inpuDocument->getMaxFileSize()));
@@ -99,7 +100,8 @@ class Designer extends Controller
$this->setVar('pmuiJsCacheFile', file(PATH_HTML . "lib-dev/pmUI/build.cache", FILE_IGNORE_NEW_LINES));
$this->setVar('pmuiCssCacheFile', file(PATH_HTML . "lib-dev/pmUI/css.cache", FILE_IGNORE_NEW_LINES));
$this->setVar('designerCacheFile', file(PATH_HTML . "lib-dev/mafe/applications.cache", FILE_IGNORE_NEW_LINES));
$this->setVar('designerCacheFile',
file(PATH_HTML . "lib-dev/mafe/applications.cache", FILE_IGNORE_NEW_LINES));
$this->setVar('mafeJsFiles', $mafeJsFiles);
$this->setVar('mafeCssFiles', $mafeCssFiles);
} else {
@@ -253,7 +255,6 @@ class Designer extends Controller
"Content-Type" => "multipart/form-data;",
"Authorization" => "Basic " . base64_encode($client['CLIENT_ID'] . ":" . $client['CLIENT_SECRET'])
);
$request = new Request(array(), $request, array(), array(), array(), $server, null, $headers);
$oauthServer = new Server();
$response = $oauthServer->postToken($request, true);