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

HOR-3851

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-10-10 12:33:25 -04:00
parent 216e2dca28
commit 8ac8e50691
152 changed files with 416 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
workflow/engine/skinEngine/skinEngine.php
View File

@@ -342,7 +342,7 @@ class SkinEngine
}
$smarty->assign('username',
(isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . config("sys_sys") . ')' : ''));
(isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . config("system.workspace") . ')' : ''));
$smarty->assign('header', $header);
$smarty->force_compile = $this->forceTemplateCompile;
@@ -378,7 +378,7 @@ class SkinEngine
$header = '';
if (isset($oHeadPublisher)) {
$oHeadPublisher->title = isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . config("sys_sys") . ')' : '';
$oHeadPublisher->title = isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . config("system.workspace") . ')' : '';
$header = $oHeadPublisher->printHeader();
$header .= $oHeadPublisher->getExtJsStylesheets($this->cssFileName);
}
@@ -436,7 +436,7 @@ class SkinEngine
$smarty->assign('rolename', isset($_SESSION['USR_ROLENAME']) ? $_SESSION['USR_ROLENAME'] . '' : '');
$smarty->assign('pipe', isset($_SESSION['USR_USERNAME']) ? ' | ' : '');
$smarty->assign('logout', G::LoadTranslation('ID_LOGOUT'));
$smarty->assign('workspace', defined('SYS_SYS') ? config("sys_sys") : '');
$smarty->assign('workspace', !empty(config("system.workspace")) ? config("system.workspace") : '');
$uws = (isset($_SESSION['USR_ROLENAME']) && $_SESSION['USR_ROLENAME'] != '') ? strtolower(G::LoadTranslation('ID_WORKSPACE_USING')) : G::LoadTranslation('ID_WORKSPACE_USING');
$smarty->assign('workspace_label', $uws);
@@ -448,8 +448,8 @@ class SkinEngine
$smarty->assign('user', $name);
}
if (defined('SYS_SYS')) {
$logout = '/sys' . config("sys_sys") . '/' . SYS_LANG . '/' . SYS_SKIN . '/login/login';
if (!empty(config("system.workspace"))) {
$logout = '/sys' . config("system.workspace") . '/' . SYS_LANG . '/' . SYS_SKIN . '/login/login';
} else {
$logout = '/sys/' . SYS_LANG . '/' . SYS_SKIN . '/login/login';
}
@@ -494,7 +494,7 @@ class SkinEngine
$header = '';
if (isset($oHeadPublisher)) {
$oHeadPublisher->title = isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . config("sys_sys") . ')' : '';
$oHeadPublisher->title = isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . config("system.workspace") . ')' : '';
$header = $oHeadPublisher->printHeader();
}
@@ -694,8 +694,8 @@ class SkinEngine
}
if (isset($oHeadPublisher)) {
if (defined('SYS_SYS')) {
$oHeadPublisher->title = isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . config("sys_sys") . ')' : '';
if (!empty(config("system.workspace"))) {
$oHeadPublisher->title = isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . config("system.workspace") . ')' : '';
}
$header = $enableJsScript ? $oHeadPublisher->printHeader() : '';
$header .= $oHeadPublisher->getExtJsStylesheets($this->cssFileName);
@@ -765,7 +765,7 @@ class SkinEngine
$smarty->assign('rolename', isset($_SESSION['USR_ROLENAME']) ? $_SESSION['USR_ROLENAME'] . '' : '');
$smarty->assign('pipe', isset($_SESSION['USR_USERNAME']) ? ' | ' : '');
$smarty->assign('logout', G::LoadTranslation('ID_LOGOUT'));
$smarty->assign('workspace', defined('SYS_SYS') ? config("sys_sys") : '');
$smarty->assign('workspace', !empty(config("system.workspace")) ? config("system.workspace") : '');
$uws = (isset($_SESSION['USR_ROLENAME']) && $_SESSION['USR_ROLENAME'] != '') ? strtolower(G::LoadTranslation('ID_WORKSPACE_USING')) : G::LoadTranslation('ID_WORKSPACE_USING');
$smarty->assign('workspace_label', $uws);
@@ -777,7 +777,7 @@ class SkinEngine
$smarty->assign('user', $name);
}
if (defined('SYS_SYS')) {
if (!empty(config("system.workspace"))) {
$pmLicenseManagerO = &PmLicenseManager::getSingleton();
$expireIn = $pmLicenseManagerO->getExpireIn();
$expireInLabel = $pmLicenseManagerO->getExpireInLabel();
@@ -793,8 +793,8 @@ class SkinEngine
}
}
if (defined('SYS_SYS')) {
$logout = "/sys" . config("sys_sys") . "/" . SYS_LANG . "/" . SYS_SKIN . ((SYS_COLLECTION != "tracker") ? "/login/login" : "/tracker/login");
if (!empty(config("system.workspace"))) {
$logout = "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . ((SYS_COLLECTION != "tracker") ? "/login/login" : "/tracker/login");
} else {
$logout = '/sys/' . SYS_LANG . '/' . SYS_SKIN . '/login/login';
}
@@ -806,7 +806,7 @@ class SkinEngine
$oLogoR = new ReplacementLogo();
if (defined("SYS_SYS")) {
if (!empty(config("system.workspace"))) {
$aFotoSelect = $oLogoR->getNameLogo((isset($_SESSION['USER_LOGGED'])) ? $_SESSION['USER_LOGGED'] : '');
if (is_array($aFotoSelect)) {
@@ -814,11 +814,11 @@ class SkinEngine
$sWspaceSelect = trim($aFotoSelect['WORKSPACE_LOGO_NAME']);
}
}
if (class_exists('ProcessMaker\Plugins\PluginRegistry') && defined("SYS_SYS")) {
if (class_exists('ProcessMaker\Plugins\PluginRegistry') && !empty(config("system.workspace"))) {
$oPluginRegistry = PluginRegistry::loadSingleton();
if (isset($sFotoSelect) && $sFotoSelect != '' && !(strcmp($sWspaceSelect, config("sys_sys")))) {
if (isset($sFotoSelect) && $sFotoSelect != '' && !(strcmp($sWspaceSelect, config("system.workspace")))) {
$sCompanyLogo = $oPluginRegistry->getCompanyLogo($sFotoSelect);
$sCompanyLogo = "/sys" . config("sys_sys") . "/" . SYS_LANG . "/" . SYS_SKIN . "/setup/showLogoFile.php?id=" . base64_encode($sCompanyLogo);
$sCompanyLogo = "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . "/setup/showLogoFile.php?id=" . base64_encode($sCompanyLogo);
} else {
$sCompanyLogo = $oPluginRegistry->getCompanyLogo('/images/processmaker.logo.jpg');
}