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

Logo shown even in login page.

Browse Source
This commit is contained in:
Hugo Loza
2011-01-11 21:22:14 +00:00
parent 107091159b
commit 6513be60da
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/setup/showLogoFile.php
View File

@@ -22,7 +22,7 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
if (($RBAC_Response = $RBAC->userCanAccess("PM_CASES"))!=1) return $RBAC_Response;
// if (($RBAC_Response = $RBAC->userCanAccess("PM_CASES"))!=1) return $RBAC_Response;
$ainfoSite = explode("/",$_SERVER["REQUEST_URI"]);
$dir=PATH_DATA."sites".PATH_SEP.str_replace("sys","",$ainfoSite[1]).PATH_SEP."files/logos";

8
workflow/engine/skins/green.php
View File

@@ -91,9 +91,9 @@ $oServerConf->setProperty("extSkin",$extSkin);
$pmLicenseManagerO =& pmLicenseManager::getSingleton();
$expireIn=$pmLicenseManagerO->getExpireIn();
$expireInLabel=$pmLicenseManagerO->getExpireInLabel();
if($expireIn<=30){
//if($expireIn<=30){
$smarty->assign('msgVer', '<br><label class="textBlack">'.$expireInLabel.'</label>&nbsp;&nbsp;');
}
//}
}
if (defined('SYS_SYS'))
@@ -108,7 +108,7 @@ $oServerConf->setProperty("extSkin",$extSkin);
$smarty->assign('tpl_submenu', PATH_TEMPLATE . 'submenu.html');
G::LoadClass( 'replacementLogo' );
$oLogoR = new replacementLogo();
if(isset($_SESSION['USER_LOGGED'])){
if(defined("SYS_SYS")){
$aFotoSelect = $oLogoR->getNameLogo((isset($_SESSION['USER_LOGGED']))?$_SESSION['USER_LOGGED']:'');
if ( is_array ( $aFotoSelect ) ) {
$sFotoSelect = trim($aFotoSelect['DEFAULT_LOGO_NAME']);
@@ -120,7 +120,7 @@ $oServerConf->setProperty("extSkin",$extSkin);
$oPluginRegistry = &PMPluginRegistry::getSingleton();
if ( isset($sFotoSelect) && $sFotoSelect!='' && !(strcmp($sWspaceSelect,SYS_SYS)) ){
$sCompanyLogo = $oPluginRegistry->getCompanyLogo($sFotoSelect);
$sCompanyLogo= "../setup/showLogoFile.php?id=".G::encrypt($sCompanyLogo,"imagen");
$sCompanyLogo= "/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/setup/showLogoFile.php?id=".G::encrypt($sCompanyLogo,"imagen");
}
else {
$sCompanyLogo = $oPluginRegistry->getCompanyLogo('/images/processmaker.logo.jpg');

3
workflow/public_html/sysGeneric.php
View File

@@ -506,7 +506,8 @@ $startingTime = array_sum(explode(' ',microtime()));
and SYS_TARGET != 'updateTranslation'
and SYS_TARGET != 'autoinstallProcesses'
and SYS_TARGET != 'autoinstallPlugins'
and SYS_TARGET != 'heartbeatStatus'
and SYS_TARGET != 'heartbeatStatus'
and SYS_TARGET != 'showLogoFile'
and SYS_COLLECTION != 'services' and SYS_COLLECTION != 'tracker' and $collectionPlugin != 'services'
and $bWE != true and SYS_TARGET != 'defaultAjaxDynaform' and SYS_TARGET != 'dynaforms_checkDependentFields' and SYS_TARGET != 'cases_ShowDocument') {
$bRedirect = true;