fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #1513 from ralpheav/master

Browse Source 
Adding dateformat header acording Enviroment settings
This commit is contained in:
julceslauhub
2013-04-05 09:14:49 -07:00
parent c8d230f5bd 3a26f1c262
commit 0b2d67e85e
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/class.configuration.php
View File

@@ -88,6 +88,11 @@ class Configurations // extends Configuration
}
}
}
public function exists($cfgID)
{
return $this->Configuration->exists($cfgID,"",'','','');
}
/**
* configObject

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

@@ -390,8 +390,14 @@ class SkinEngine
$smarty->assign('workspace', defined('SYS_SYS')?SYS_SYS: '');
$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('udate', G::getformatedDate(date('Y-m-d'), 'M d, yyyy', SYS_LANG));
G::LoadClass( "configuration" );
$conf = new Configurations();
if (defined('SYS_SYS') && $conf->exists("ENVIRONMENT_SETTINGS")) {
$smarty->assign('udate', $conf->getSystemDate(date('Y-m-d')));
} else {
$smarty->assign('udate', G::getformatedDate(date('Y-m-d'), 'M d, yyyy', SYS_LANG));
}
}
if (defined('SYS_SYS')) {
@@ -642,8 +648,15 @@ class SkinEngine
$smarty->assign('workspace', defined('SYS_SYS')?SYS_SYS: '');
$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('udate', G::getformatedDate(date('Y-m-d'), 'M d, yyyy', SYS_LANG));
G::LoadClass( "configuration" );
$conf = new Configurations();
if ( defined('SYS_SYS') && $conf->exists("ENVIRONMENT_SETTINGS")) {
$smarty->assign('udate', $conf->getSystemDate(date('Y-m-d')));
} else {
$smarty->assign('udate', G::getformatedDate(date('Y-m-d'), 'M d, yyyy', SYS_LANG));
}
}
if(class_exists('pmLicenseManager')){
$pmLicenseManagerO = &pmLicenseManager::getSingleton();