2
0
forked from Wavyzz/dolibarr

Fix: Files related to running company must not be saved into same directory dedicated to module third party.

This commit is contained in:
Laurent Destailleur
2009-07-02 00:16:50 +00:00
parent fbd3bd0a76
commit d4b0cfdfb7
21 changed files with 46 additions and 44 deletions

View File

@@ -160,11 +160,11 @@ function dol_loginfunction($langs,$conf,$mysoc)
$title='';
$width=0;
$urllogo=DOL_URL_ROOT.'/theme/login_logo.png';
if (! empty($mysoc->logo_small) && is_readable($conf->societe->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
{
$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&file='.urlencode('thumbs/'.$mysoc->logo_small);
}
elseif (! empty($mysoc->logo_small) && is_readable($conf->societe->dir_output.'/logos/'.$mysoc->logo))
elseif (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
{
$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&file='.urlencode($mysoc->logo);
$width=96;