fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #654 from marcoAntonioNina/BUG-9797

Browse Source 
BUG 9797 PM 2.0.44 testing 1 No se puede subir logos... SOLVED
This commit is contained in:
julceslauhub
2012-10-04 07:38:11 -07:00
parent dfc10e9adc e111520ea0
commit 1a6ff3e624
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/controllers/main.php
View File

@@ -478,28 +478,26 @@ class Main extends Controller
if (($aFotoSelect = $this->memcache->get('aFotoSelect')) === false) { if (($aFotoSelect = $this->memcache->get('aFotoSelect')) === false) {
G::LoadClass('replacementLogo'); G::LoadClass('replacementLogo');
$oLogoR = new replacementLogo(); $oLogoR = new replacementLogo();
$aFotoSelect = $oLogoR->getNameLogo((isset($_SESSION['USER_LOGGED']))?$_SESSION['USER_LOGGED']:''); $aFotoSelect = $oLogoR->getNameLogo((isset($_SESSION['USER_LOGGED'])) ?
$_SESSION['USER_LOGGED'] : '');
$this->memcache->set('aFotoSelect', $aFotoSelect, 1*3600); $this->memcache->set('aFotoSelect', $aFotoSelect, 1*3600);
} }
if (is_array ($aFotoSelect)) { if (is_array ($aFotoSelect)) {
$sFotoSelect = trim($aFotoSelect['DEFAULT_LOGO_NAME']); $sFotoSelect = trim($aFotoSelect['DEFAULT_LOGO_NAME']);
$sWspaceSelect = trim($aFotoSelect['WORKSPACE_LOGO_NAME']); $sWspaceSelect = trim($aFotoSelect['WORKSPACE_LOGO_NAME']);
} }
} }
if (class_exists('PMPluginRegistry')) { if (class_exists('PMPluginRegistry')) {
$oPluginRegistry = &PMPluginRegistry::getSingleton(); $oPluginRegistry = &PMPluginRegistry::getSingleton();
$logoPlugin = $oPluginRegistry->getCompanyLogo($sCompanyLogo);
if (isset($sFotoSelect) && $sFotoSelect!='' && !(strcmp($sWspaceSelect,SYS_SYS))) { if ($logoPlugin != '/images/processmaker2.logo2.png') {
$sCompanyLogo = $logoPlugin;
} elseif (isset($sFotoSelect) && $sFotoSelect!='' && !(strcmp($sWspaceSelect,SYS_SYS))) {
$sCompanyLogo = $oPluginRegistry->getCompanyLogo($sFotoSelect); $sCompanyLogo = $oPluginRegistry->getCompanyLogo($sFotoSelect);
$sCompanyLogo = "/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/adminProxy/showLogoFile?id=". $sCompanyLogo = "/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/adminProxy/showLogoFile?id=".
base64_encode($sCompanyLogo); base64_encode($sCompanyLogo);
} else {
$sCompanyLogo = $oPluginRegistry->getCompanyLogo($sCompanyLogo);
} }
} }
return $sCompanyLogo; return $sCompanyLogo;
} }

2
workflow/engine/skinEngine/uxmodern/layout-pm-modern.html
View File

@@ -24,7 +24,7 @@
<table class="x-pm-headerbar"> <table class="x-pm-headerbar">
<tr> <tr>
<td width="50%" valign="middle"> <td width="50%" valign="middle">
<img src="{$logo_company}" width="250" height="40"/> <img src="{$logo_company}" height="40"/>
</td> </td>
<td align="right" valign="top"> <td align="right" valign="top">