diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 6a848b36613..904cd9d2fdb 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -62,12 +62,12 @@ if ( (isset($_POST["action"]) && $_POST["action"] == 'update') $isimage=image_format_supported($original_file); if ($isimage >= 0) { - dol_syslog("Move file ".$_FILES["logo"]["tmp_name"]." to ".$conf->societe->dir_output.'/logos/'.$original_file); - if (! is_dir($conf->societe->dir_output.'/logos/')) // TODO ne fonctionne qu'avec le module Tiers d'activé + dol_syslog("Move file ".$_FILES["logo"]["tmp_name"]." to ".$conf->mycompany->dir_output.'/logos/'.$original_file); + if (! is_dir($conf->mycompany->dir_output.'/logos/')) { - create_exdir($conf->societe->dir_output.'/logos/'); + create_exdir($conf->mycompany->dir_output.'/logos/'); } - if (dol_move_uploaded_file($_FILES["logo"]["tmp_name"],$conf->societe->dir_output.'/logos/'.$original_file,1) > 0) + if (dol_move_uploaded_file($_FILES["logo"]["tmp_name"],$conf->mycompany->dir_output.'/logos/'.$original_file,1) > 0) { dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO",$original_file,'chaine',0,'',$conf->entity); @@ -76,7 +76,7 @@ if ( (isset($_POST["action"]) && $_POST["action"] == 'update') { $quality = 80; - $imgThumbSmall = vignette($conf->societe->dir_output.'/logos/'.$original_file, 200, 100, '_small', $quality); + $imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$original_file, 200, 100, '_small', $quality); if (eregi('([^\\\/:]+)$',$imgThumbSmall,$reg)) { $imgThumbSmall = $reg[1]; @@ -85,7 +85,7 @@ if ( (isset($_POST["action"]) && $_POST["action"] == 'update') else dol_syslog($imgThumbSmall); // Création de la vignette de la page "Société/Institution" - $imgThumbMini = vignette($conf->societe->dir_output.'/logos/'.$original_file, 100, 30, '_mini', $quality); + $imgThumbMini = vignette($conf->mycompany->dir_output.'/logos/'.$original_file, 100, 30, '_mini', $quality); if (eregi('([^\\\/:]+)$',$imgThumbMini,$reg)) { $imgThumbMini = $reg[1]; @@ -136,7 +136,7 @@ if ($_GET["action"] == 'addthumb') if ($isimage > 0) { // Création de la vignette de la page login - $imgThumbSmall = vignette($conf->societe->dir_output.'/logos/'.$_GET["file"], 200, 100, '_small',80); + $imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], 200, 100, '_small',80); if (image_format_supported($imgThumbSmall) >= 0 && eregi('([^\\\/:]+)$',$imgThumbSmall,$reg)) { $imgThumbSmall = $reg[1]; @@ -145,7 +145,7 @@ if ($_GET["action"] == 'addthumb') else dol_syslog($imgThumbSmall); // Création de la vignette de la page "Société/Institution" - $imgThumbMini = vignette($conf->societe->dir_output.'/logos/'.$_GET["file"], 100, 30, '_mini',80); + $imgThumbMini = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], 100, 30, '_mini',80); if (image_format_supported($imgThumbSmall) >= 0 && eregi('([^\\\/:]+)$',$imgThumbMini,$reg)) { $imgThumbMini = $reg[1]; @@ -171,17 +171,17 @@ if ($_GET["action"] == 'addthumb') if ($_GET["action"] == 'removelogo') { - $logofile=$conf->societe->dir_output.'/logos/'.$mysoc->logo; + $logofile=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo; dol_delete_file($logofile); dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO",$conf->entity); $mysoc->logo=''; - $logosmallfile=$conf->societe->dir_output.'/logos/thumbs/'.$mysoc->logo_small; + $logosmallfile=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small; dol_delete_file($logosmallfile); dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$conf->entity); $mysoc->logo_small=''; - $logominifile=$conf->societe->dir_output.'/logos/thumbs/'.$mysoc->logo_mini; + $logominifile=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini; dol_delete_file($logominifile); dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$conf->entity); $mysoc->logo_mini=''; @@ -282,7 +282,7 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit') if ($mysoc->logo_mini) { print ''.img_delete($langs->trans("Delete")).''; - if (file_exists($conf->societe->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) + if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) { print '   '; print ''; @@ -550,11 +550,11 @@ else print ''; // On propose la génération de la vignette si elle n'existe pas - if (!is_file($conf->societe->dir_output.'/logos/thumbs/'.$mysoc->logo_mini) && eregi('(\.jpg|\.jpeg|\.png)$',$mysoc->logo)) + if (!is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini) && eregi('(\.jpg|\.jpeg|\.png)$',$mysoc->logo)) { print 'logo).'">'.img_refresh($langs->trans('GenerateThumb')).'  '; } - else if ($mysoc->logo_mini && is_file($conf->societe->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) + else if ($mysoc->logo_mini && is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) { print ''; } diff --git a/htdocs/cashdesk/templates/ticket.tpl.php b/htdocs/cashdesk/templates/ticket.tpl.php index 092bc3280e7..db061c4deed 100644 --- a/htdocs/cashdesk/templates/ticket.tpl.php +++ b/htdocs/cashdesk/templates/ticket.tpl.php @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. } .logo { - background: url('/documents/societe/logos/logo.jpg') no-repeat top left; + background: url('logo_mini); ?>') no-repeat top left; height: 128px; width: 650px; } diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php index 3fbbac2d1e3..a562b87c4d0 100644 --- a/htdocs/core/conf.class.php +++ b/htdocs/core/conf.class.php @@ -194,13 +194,21 @@ class Conf //print 'this->'.$module.'->dir_temp='.$this->$module->dir_temp.'
'; } - // Exception: Some dir are not the name of module. So we keep exception here - // for backward compatibility. + // For mycompany setup + $this->mycompany->dir_output=$rootfordata."/mycompany"; + $this->mycompany->dir_temp=$rootfordata."/mycompany/temp"; + + // For admin features + $this->admin->dir_output=$rootfordata.'/admin'; + $this->admin->dir_temp=$rootfordata.'/admin/temp'; // Module user $this->user->dir_output=$rootforuser."/users"; $this->user->dir_temp=$rootforuser."/users/temp"; + // Exception: Some dir are not the name of module. So we keep exception here + // for backward compatibility. + // Module RSS $this->externalrss->dir_output=$rootfordata."/rss"; $this->externalrss->dir_temp=$rootfordata."/rss/temp"; @@ -214,9 +222,6 @@ class Conf $this->livraison_bon->dir_output=$rootfordata."/expedition/receipt"; $this->livraison_bon->dir_temp =$rootfordata."/expedition/receipt/temp"; - // Module societe - if (defined('SOCIETE_OUTPUTDIR') && SOCIETE_OUTPUTDIR) { $this->societe->dir_output=SOCIETE_OUTPUTDIR; } # Pour passer outre le rep par defaut - // Module don $this->don->dir_output=$rootfordata."/dons"; $this->don->dir_temp =$rootfordata."/dons/temp"; @@ -261,9 +266,6 @@ class Conf // Module oscommerce 1 $this->boutique->livre->enabled=defined("BOUTIQUE_LIVRE")?BOUTIQUE_LIVRE:0; $this->boutique->album->enabled=defined("BOUTIQUE_ALBUM")?BOUTIQUE_ALBUM:0; - // Other - $this->admin->dir_output=$rootfordata.'/admin'; - $this->admin->dir_temp=$rootfordata.'/admin/temp'; /* * Modification de quelques variable de conf en fonction des Constantes diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index d3238078e4d..41c437022d2 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -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 ''; diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index b6ce08882e9..da88bfdfb93 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -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&file='.urlencode('thumbs/'.$mysoc->logo_small); print ''; diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index 9056b58c0b0..6fe0a021266 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -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)) diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index 1af2a3ec7b7..96274622394 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -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)) diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php index b05e120d739..3cd870a6b56 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -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)) diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php index b8b126d8001..68c04be5033 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php @@ -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)) diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 72b179e471c..7b16c1974bc 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -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)) diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index 620363dd007..5bcfedbd224 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -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)) diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index 1183c283024..5119d90680b 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -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)) diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php index 3bec6055217..2ff908e6196 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -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)) diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/includes/modules/modSociete.class.php index cfcf55c7210..bffeca9076e 100644 --- a/htdocs/includes/modules/modSociete.class.php +++ b/htdocs/includes/modules/modSociete.class.php @@ -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(); diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index e3af89f965e..133d3797c3b 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -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)) diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php index 4ae61bdee23..a5d77d3f1e8 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -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)) diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index 4df353e8187..2182981e9fe 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -40,7 +40,7 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height) // Add a background image on document if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF)) { - $pdf->Image($conf->societe->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, 0, 0, 0, $page_height); + $pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, 0, 0, 0, $page_height); } } diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php index efbb7b05c08..b753173a4bc 100644 --- a/htdocs/lib/security.lib.php +++ b/htdocs/lib/security.lib.php @@ -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; diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index 6e285669582..7ca1663c10d 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -157,11 +157,11 @@ if (! empty($conf->global->$paramlogo)) $logosmall=$conf->global->$paramlogo; else if (! empty($conf->global->PAYBOX_LOGO)) $logosmall=$conf->global->PAYBOX_LOGO; // Define urllogo $urllogo=''; -if (! empty($logosmall) && is_readable($conf->societe->dir_output.'/logos/thumbs/'.$logosmall)) +if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall)) { $urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&file='.urlencode('thumbs/'.$logosmall); } -elseif (! empty($logo) && is_readable($conf->societe->dir_output.'/logos/'.$logo)) +elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) { $urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&file='.urlencode($logo); $width=96; diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index eafaa24ac30..3fb9c2a2a3a 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -231,11 +231,11 @@ $title=''; // Show logo (search in order: small company logo, large company logo, theme logo, common logo) $width=0; $urllogo=DOL_URL_ROOT.'/theme/login_logo.png'; -if (isset($mysoc->logo_small) && is_readable($conf->societe->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) +if (isset($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 (isset($mysoc->logo) && is_readable($conf->societe->dir_output.'/logos/'.$mysoc->logo)) +elseif (isset($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) { $urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&file='.urlencode($mysoc->logo); $width=96; diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index 0895dae77f3..8cd00368dbb 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -74,7 +74,7 @@ if ($modulepart) if ($modulepart == 'companylogo') { $accessallowed=1; - $original_file=$conf->societe->dir_output.'/logos/'.$original_file; + $original_file=$conf->mycompany->dir_output.'/logos/'.$original_file; } // Wrapping pour les photos utilisateurs