fernando/luos
1
0
Fork 0
Code Releases Activity

HOR-1240-A "Show expiration message to system..." SOLVED

Browse Source
This commit is contained in:
root
2016-06-13 11:21:44 -04:00
parent 25b77fce04
commit 6c57b12a62
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.pmLicenseManager.php
View File

@@ -318,7 +318,7 @@ class pmLicenseManager
$infoO = $this->getLicenseInfo();
$infoText = $infoO['infoText'];
$js = (EnterpriseUtils::skinIsUx() == 1)? "Ext.MessageBox.show({title: '', msg: '$infoText', buttons: Ext.MessageBox.OK, icon: Ext.MessageBox.INFO});" : "msgBox('$infoText');";
$linkText = $linkText . "<a href=\"javascript:;\" onclick=\"$js return (false);\"><span style=\"color: red;\">" . G::LoadTranslation('ID_EXPIRES_IN') ." " . $this->getExpireIn () . " " . G::LoadTranslation('ID_DAYS') ."</span></a>";
$linkText = $linkText . "<span style=\"color: red;\">" . G::LoadTranslation('ID_EXPIRES_IN') . " " . $this->getExpireIn () . " " . G::LoadTranslation('ID_DAYS') . "</span>";
} else {
if ($this->getExpireIn() != "NEVER" && (int)$this->getExpireIn() <= 0) {
$infoO = $this->getLicenseInfo();
@@ -446,7 +446,7 @@ class pmLicenseManager
G::LoadSystem('inputfilter');
$filter = new InputFilter();
$path = $filter->xssFilterHard($path, 'path');
$handle = fopen ( $path, "r" );
$contents = fread ( $handle, filesize ( $path ) );
fclose ( $handle );

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

@@ -634,6 +634,7 @@ class SkinEngine
global $G_SUB_MENU_SELECTED;
global $G_ID_MENU_SELECTED;
global $G_ID_SUB_MENU_SELECTED;
global $RBAC;
G::verifyPath(PATH_SMARTY_C, true);
G::verifyPath(PATH_SMARTY_CACHE, true);
@@ -762,8 +763,14 @@ class SkinEngine
$pmLicenseManagerO = &pmLicenseManager::getSingleton();
$expireIn = $pmLicenseManagerO->getExpireIn();
$expireInLabel = $pmLicenseManagerO->getExpireInLabel();
if($expireInLabel != ""){
$smarty->assign('msgVer', '<label class="textBlack">'.$expireInLabel.'</label>&nbsp;&nbsp;');
if (!is_null($RBAC) &&
isset($RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE']) &&
$RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE'] == 'PROCESSMAKER_ADMIN'
) {
if ($expireInLabel != '') {
$smarty->assign('msgVer', '<label class="textBlack">' . $expireInLabel . '</label>&nbsp;&nbsp;');
}
}
}