From 6513be60da066dd90ec14ddfe45228eeb93ca650 Mon Sep 17 00:00:00 2001 From: Hugo Loza Date: Tue, 11 Jan 2011 21:22:14 +0000 Subject: [PATCH] Logo shown even in login page. --- workflow/engine/methods/setup/showLogoFile.php | 2 +- workflow/engine/skins/green.php | 8 ++++---- workflow/public_html/sysGeneric.php | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/workflow/engine/methods/setup/showLogoFile.php b/workflow/engine/methods/setup/showLogoFile.php index fde217be0..d2af72211 100644 --- a/workflow/engine/methods/setup/showLogoFile.php +++ b/workflow/engine/methods/setup/showLogoFile.php @@ -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"; diff --git a/workflow/engine/skins/green.php b/workflow/engine/skins/green.php index f9f90a2d8..34ba7bc3e 100644 --- a/workflow/engine/skins/green.php +++ b/workflow/engine/skins/green.php @@ -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', '
  '); - } + //} } 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'); diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php index a73264ba0..9a7bb3460 100644 --- a/workflow/public_html/sysGeneric.php +++ b/workflow/public_html/sysGeneric.php @@ -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;