Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Logo non affich si logo socit upload puis effac

Browse Source
This commit is contained in:
Laurent Destailleur
2007-12-11 18:39:08 +00:00
parent 62b8688fee
commit 15ec93f468
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/lib/functions.inc.php
View File

@@ -1405,7 +1405,7 @@ function dol_loginfunction($notused,$pearstatus)
print '<table cellpadding="0" cellspacing="0" border="0" align="center" width="450">'; print '<table cellpadding="0" cellspacing="0" border="0" align="center" width="450">';
if (file_exists(DOL_DOCUMENT_ROOT.'/logo.png')) if (file_exists(DOL_DOCUMENT_ROOT.'/logo.png'))
{ {
// Cas qui ne devrait pas arriver (pour compatibilit<69>) // TODO A virer Cas qui ne devrait pas arriver (pour compatibilit<69>)
print '<tr><td colspan="3" style="text-align:center;">'; print '<tr><td colspan="3" style="text-align:center;">';
print '<img src="/logo.png"></td></tr>'; print '<img src="/logo.png"></td></tr>';
} }
@@ -1430,11 +1430,11 @@ function dol_loginfunction($notused,$pearstatus)
// Show logo (search in order: small company logo, large company logo, theme logo, common logo) // Show logo (search in order: small company logo, large company logo, theme logo, common logo)
$width=0; $width=0;
$urllogo=DOL_URL_ROOT.'/theme/login_logo.png'; $urllogo=DOL_URL_ROOT.'/theme/login_logo.png';
if (is_readable($conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_small)) if (! empty($mysoc->logo_small) && is_readable($conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_small))
{ {
$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small); $urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small);
} }
elseif (is_readable($conf->societe->dir_logos.'/'.$mysoc->logo)) elseif (! empty($mysoc->logo_small) && is_readable($conf->societe->dir_logos.'/'.$mysoc->logo))
{ {
$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode($mysoc->logo); $urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode($mysoc->logo);
$width=96; $width=96;