fernando/luos
1
0
Fork 0
Code Releases Activity

PMC-541

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2019-03-08 09:56:08 -04:00
parent 099d056cd0
commit 2e79581a30
6 changed files with 89 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
workflow/engine/src/ProcessMaker/Core/System.php
View File

@@ -1597,11 +1597,25 @@ class System
* Get server main path (protocol + host + port + workspace + lang + skin).
*
* @return string
* @see ProcessMaker\BusinessModel\ProjectUser->projectWsUserCanStartTask()
* @see ProcessMaker\BusinessModel\ProjectUser->userLogin()
* @see ProcessMaker\BusinessModel\WebEntry->getWebEntryDataFromRecord()
* @see ProcessMaker\BusinessModel\WebEntryEvent->getGeneratedLink()
* @see ProcessMaker\Core\System\ActionsByEmailCoreClass->sendActionsByEmail()
* @see ProcessMaker\Core\System\webEntryProxy->checkCredentials()
* @see ProcessMaker\Core\System\webEntryProxy->save()
* @see workflow/engine/classes/ProcessMap.php ProcessMap->listNewWebEntry()
* @see workflow/engine/classes/ProcessMap.php ProcessMap->webEntry()
* @see workflow/engine/controllers/caseSchedulerProxy.php caseSchedulerProxy->checkCredentials()
* @see workflow/engine/methods/cases/cases_SchedulerValidateUser.php
* @see workflow/engine/methods/processes/processes_webEntryGenerate.php
* @see workflow/engine/methods/processes/processes_webEntryValidate.php
* @see workflow/engine/methods/processes/webEntry_Val_Assig.php
*/
public static function getServerMainPath()
{
$conf = new Configurations();
$skin = defined("SYS_SKIN") ? SYS_SKIN : $conf->getConfiguration('SKIN_CRON', '');
$config = self::getSystemConfiguration();
$skin = defined("SYS_SKIN") ? SYS_SKIN : $config['default_skin'];
return self::getServerProtocolHost() . '/sys' . config("system.workspace") . '/' . SYS_LANG . '/' . $skin;
}

26
workflow/engine/src/ProcessMaker/Util/FixReferencePath.php
View File

@@ -2,17 +2,18 @@
namespace ProcessMaker\Util;
use Configurations;
use Criteria;
use ResultSet;
use FieldsPeer;
use ReportTablePeer;
use CaseConsolidatedCorePeer;
use ConsolidatedCases;
use AdditionalTablesPeer;
use PmTable;
use ReportVarPeer;
use AdditionalTables;
use AdditionalTablesPeer;
use CaseConsolidatedCorePeer;
use Configurations;
use ConsolidatedCases;
use Criteria;
use FieldsPeer;
use PmTable;
use ProcessMaker\Core\System;
use ReportTablePeer;
use ReportVarPeer;
use ResultSet;
use stdClass;
/**
@@ -73,6 +74,7 @@ class FixReferencePath
* @param string $directory
* @param string $pathData
* @return void
* @see workflow/engine/classes/WorkspaceTools.php WorkspaceTools->fixReferencePathFiles()
*/
public function runProcess($directory, $pathData)
{
@@ -81,8 +83,8 @@ class FixReferencePath
//task, it is removed at the end of the method.
$_SERVER["REQUEST_URI"] = "";
if (!defined("SYS_SKIN")) {
$conf = new Configurations();
define("SYS_SKIN", $conf->getConfiguration('SKIN_CRON', ''));
$config = System::getSystemConfiguration();
define("SYS_SKIN", $config['default_skin']);
}
$criteria = new Criteria("workflow");