Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 09:02:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/includes/menus/barre_left/eldy_backoffice.php
View File

@@ -101,7 +101,7 @@ class MenuLeft {
if (! empty($conf->global->MAIN_SHOW_LOGO))
{
$mysoc->logo_small=$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
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);
print '<img title="'.$title.'" src="'.$urllogo.'">';

2
htdocs/includes/menus/barre_left/eldy_frontoffice.php
View File

@@ -99,7 +99,7 @@ class MenuLeft {
if (! empty($conf->global->MAIN_SHOW_LOGO))
{
$mysoc->logo_small=$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
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&amp;file='.urlencode('thumbs/'.$mysoc->logo_small);
print '<img title="'.$title.'" src="'.$urllogo.'">';

2
htdocs/includes/modules/commande/pdf_edison.modules.php
View File

@@ -377,7 +377,7 @@ class pdf_edison extends ModelePDFCommandes
$pdf->SetXY($this->marge_gauche,$posy);
// Logo
$logo=$conf->societe->dir_output.'/logos/'.$this->emetteur->logo;
$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
if ($this->emetteur->logo)
{
if (is_readable($logo))

2
htdocs/includes/modules/commande/pdf_einstein.modules.php
View File

@@ -733,7 +733,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->SetXY($this->marge_gauche,$posy);
// Logo
$logo=$conf->societe->dir_output.'/logos/'.$this->emetteur->logo;
$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
if ($this->emetteur->logo)
{
if (is_readable($logo))

2
htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
View File

@@ -351,7 +351,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
//*********************LOGO****************************
$pdf->SetXY(11,7);
$logo=$conf->societe->dir_output.'/logos/'.$this->emetteur->logo;
$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
if ($this->emetteur->logo)
{
if (is_readable($logo))

2
htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
View File

@@ -107,7 +107,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
$pdf->SetXY($this->marge_gauche,$posy);
// Logo
$logo=$conf->societe->dir_output.'/logos/'.$this->emetteur->logo;
$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
if ($this->emetteur->logo)
{
if (is_readable($logo))

2
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@@ -913,7 +913,7 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetXY($this->marge_gauche,$posy);
// Logo
$logo=$conf->societe->dir_output.'/logos/'.$this->emetteur->logo;
$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
if ($this->emetteur->logo)
{
if (is_readable($logo))

2
htdocs/includes/modules/facture/pdf_oursin.modules.php
View File

@@ -812,7 +812,7 @@ class pdf_oursin extends ModelePDFFactures
$pdf->SetXY($this->marges['g'],6);
// Logo
$logo=$conf->societe->dir_output.'/logos/'.$this->emetteur->logo;
$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
if ($this->emetteur->logo)
{
if (is_readable($logo))

2
htdocs/includes/modules/fichinter/pdf_soleil.modules.php
View File

@@ -174,7 +174,7 @@ class pdf_soleil extends ModelePDFFicheinter
$pdf->SetXY($this->marge_gauche,$posy);
// Logo
$logo=$conf->societe->dir_output.'/logos/'.$mysoc->logo;
$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
if ($mysoc->logo)
{
if (is_readable($logo))

2
htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
View File

@@ -455,7 +455,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->SetXY($this->marge_gauche,$posy);
// Logo
$logo=$conf->societe->dir_output.'/logos/'.$mysoc->logo;
$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
if ($mysoc->logo)
{
if (is_readable($logo))

2
htdocs/includes/modules/modSociete.class.php
View File

@@ -68,7 +68,7 @@ class modSociete extends DolibarrModules
$this->picto='company';
// Data directories to create when module is enabled
$this->dirs = array("/societe/temp","/societe/logos");
$this->dirs = array("/societe/temp");
// Dependances
$this->depends = array();

2
htdocs/includes/modules/propale/pdf_propale_azur.modules.php
View File

@@ -786,7 +786,7 @@ class pdf_propale_azur extends ModelePDFPropales
$pdf->SetXY($this->marge_gauche,$posy);
// Logo
$logo=$conf->societe->dir_output.'/logos/'.$this->emetteur->logo;
$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
if ($this->emetteur->logo)
{
if (is_readable($logo))

2
htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@@ -594,7 +594,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->SetXY($this->marge_gauche,$posy);
// Logo
$logo=$conf->societe->dir_output.'/logos/'.$mysoc->logo;
$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
if ($mysoc->logo)
{
if (is_readable($logo))