PMCORE-3835

This commit is contained in:
Mauricio Veliz
2022-05-13 17:09:51 -04:00
parent c07f468d20
commit 3c363b498d
11 changed files with 3086 additions and 2026 deletions

View File

@@ -472,6 +472,7 @@ class SkinEngine
if (!defined('NO_DISPLAY_USERNAME')) {
define('NO_DISPLAY_USERNAME', 0);
}
if (NO_DISPLAY_USERNAME == 0) {
$smarty->assign('userfullname', isset($_SESSION['USR_FULLNAME']) ? $_SESSION['USR_FULLNAME'] : '');
$smarty->assign('user', isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ')' : '');
@@ -708,6 +709,9 @@ class SkinEngine
$smarty->cache_dir = PATH_SMARTY_CACHE;
$smarty->config_dir = PATH_THIRDPARTY . 'smarty/configs';
// Initializing template variables
$smarty->assign('userfullname', null);
//To setup en extJS Theme for this Skin
$oServerConf = ServerConf::getSingleton();
@@ -847,6 +851,7 @@ class SkinEngine
$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);
$smarty->assign('msgVer', null);
$conf = new Configurations();
$conf->getFormats();

View File

@@ -860,7 +860,7 @@ if (substr(SYS_COLLECTION, 0, 8) === 'gulliver') {
//if the method name is empty set default to index method
$controllerAction = SYS_TARGET != '' ? SYS_TARGET : 'index';
//if the method exists
if (is_callable(array($controllerClass, $controllerAction))) {
if (is_callable(array(new $controllerClass, $controllerAction))) {
$isControllerCall = true;
}