From 852e8703f68b989f511c098b9f7f6605fddafbbd Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 8 May 2009 11:22:15 +0000 Subject: [PATCH] Fix: Replace with simple directories --- htdocs/admin/company.php | 30 +++++++++---------- htdocs/core/conf.class.php | 1 - .../menus/barre_left/eldy_backoffice.php | 2 +- .../menus/barre_left/eldy_frontoffice.php | 2 +- .../modules/commande/pdf_edison.modules.php | 2 +- .../modules/commande/pdf_einstein.modules.php | 2 +- .../pdf/pdf_expedition_merou.modules.php | 2 +- .../modules/facture/pdf_crabe.modules.php | 2 +- .../modules/facture/pdf_oursin.modules.php | 2 +- .../modules/fichinter/pdf_soleil.modules.php | 2 +- .../livraison/pdf/pdf_typhon.modules.php | 2 +- htdocs/includes/modules/modSociete.class.php | 18 ++--------- .../propale/pdf_propale_azur.modules.php | 2 +- .../pdf/pdf_muscadet.modules.php | 2 +- htdocs/lib/security.lib.php | 4 +-- htdocs/public/paybox/newpayment.php | 4 +-- htdocs/user/passwordforgotten.php | 4 +-- htdocs/viewimage.php | 2 +- 18 files changed, 35 insertions(+), 50 deletions(-) diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index d2d398ab00d..dc629a92257 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_logos.'/'.$original_file); - if (! is_dir($conf->societe->dir_logos)) + dol_syslog("Move file ".$_FILES["logo"]["tmp_name"]." to ".$conf->societe->dir_output.'/logos/'.$original_file); + if (! is_dir($conf->societe->dir_output.'/logos/')) { - create_exdir($conf->societe->dir_logos); + create_exdir($conf->societe->dir_output.'/logos/'); } - if (dol_move_uploaded_file($_FILES["logo"]["tmp_name"],$conf->societe->dir_logos.'/'.$original_file,1) > 0) + if (dol_move_uploaded_file($_FILES["logo"]["tmp_name"],$conf->societe->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_logos.'/'.$original_file, 200, 100, '_small', $quality); + $imgThumbSmall = vignette($conf->societe->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_logos.'/'.$original_file, 100, 30, '_mini', $quality); + $imgThumbMini = vignette($conf->societe->dir_output.'/logos/'.$original_file, 100, 30, '_mini', $quality); if (eregi('([^\\\/:]+)$',$imgThumbMini,$reg)) { $imgThumbMini = $reg[1]; @@ -128,7 +128,7 @@ if ( (isset($_POST["action"]) && $_POST["action"] == 'update') if ($_GET["action"] == 'addthumb') { - if (file_exists($conf->societe->dir_logos.'/'.$_GET["file"])) + if (file_exists($conf->societe->dir_output.'/logos/'.$_GET["file"])) { $isimage=image_format_supported($_GET["file"]); @@ -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_logos.'/'.$_GET["file"], 200, 100, '_small',80); + $imgThumbSmall = vignette($conf->societe->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_logos.'/'.$_GET["file"], 100, 30, '_mini',80); + $imgThumbMini = vignette($conf->societe->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_logos.'/'.$mysoc->logo; + $logofile=$conf->societe->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_logos.'/thumbs/'.$mysoc->logo_small; + $logosmallfile=$conf->societe->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_logos.'/thumbs/'.$mysoc->logo_mini; + $logominifile=$conf->societe->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=''; @@ -281,7 +281,7 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit') if ($mysoc->logo_mini) { print ''.img_delete($langs->trans("Delete")).''; - if (file_exists($conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_mini)) + if (file_exists($conf->societe->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) { print '   '; print ''; @@ -549,11 +549,11 @@ else print ''; // On propose la génération de la vignette si elle n'existe pas - if (!is_file($conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_mini) && eregi('(\.jpg|\.jpeg|\.png)$',$mysoc->logo)) + if (!is_file($conf->societe->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_logos.'/thumbs/'.$mysoc->logo_mini)) + else if ($mysoc->logo_mini && is_file($conf->societe->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) { print ''; } diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php index 1e6f8aec034..4a82b5a59d2 100644 --- a/htdocs/core/conf.class.php +++ b/htdocs/core/conf.class.php @@ -211,7 +211,6 @@ class Conf $this->livraison_bon->dir_temp =$rootfordata."/expedition/receipt/temp"; // Module societe - $this->societe->dir_logos =$rootfordata."/societe/logos"; if (defined('SOCIETE_OUTPUTDIR') && SOCIETE_OUTPUTDIR) { $this->societe->dir_output=SOCIETE_OUTPUTDIR; } # Pour passer outre le rep par defaut // Module don diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 0bf98520dac..0ab82d4c9e7 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_logos.'/thumbs/'.$mysoc->logo_small)) + if (! empty($mysoc->logo_small) && is_readable($conf->societe->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 10732ab0e19..9c9b9dee917 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_logos.'/thumbs/'.$mysoc->logo_small)) + if (! empty($mysoc->logo_small) && is_readable($conf->societe->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 b05f9e473e3..01e720721d6 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -381,7 +381,7 @@ class pdf_edison extends ModelePDFCommandes $pdf->SetXY($this->marge_gauche,$posy); // Logo - $logo=$conf->societe->dir_logos.'/'.$this->emetteur->logo; + $logo=$conf->societe->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 a04b3c26fcb..539eab4f53f 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -737,7 +737,7 @@ class pdf_einstein extends ModelePDFCommandes $pdf->SetXY($this->marge_gauche,$posy); // Logo - $logo=$conf->societe->dir_logos.'/'.$this->emetteur->logo; + $logo=$conf->societe->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 13d386b2893..0a53303dd66 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -340,7 +340,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition //*********************LOGO**************************** $pdf->SetXY(11,7); - $logo=$conf->societe->dir_logos.'/'.$this->emetteur->logo; + $logo=$conf->societe->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 f5afab964ce..79cad07330c 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -916,7 +916,7 @@ class pdf_crabe extends ModelePDFFactures $pdf->SetXY($this->marge_gauche,$posy); // Logo - $logo=$conf->societe->dir_logos.'/'.$this->emetteur->logo; + $logo=$conf->societe->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 5e57d3cd8cd..68b750dda98 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -817,7 +817,7 @@ class pdf_oursin extends ModelePDFFactures $pdf->SetXY($this->marges['g'],6); // Logo - $logo=$conf->societe->dir_logos.'/'.$this->emetteur->logo; + $logo=$conf->societe->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 a374202e657..937a56fba43 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -176,7 +176,7 @@ class pdf_soleil extends ModelePDFFicheinter $pdf->SetXY($this->marge_gauche,$posy); // Logo - $logo=$conf->societe->dir_logos.'/'.$mysoc->logo; + $logo=$conf->societe->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 a878b4fff8b..15deaed9e1c 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -442,7 +442,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetXY($this->marge_gauche,$posy); // Logo - $logo=$conf->societe->dir_logos.'/'.$mysoc->logo; + $logo=$conf->societe->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 96ff59fbad1..c07cc15416a 100644 --- a/htdocs/includes/modules/modSociete.class.php +++ b/htdocs/includes/modules/modSociete.class.php @@ -67,22 +67,8 @@ class modSociete extends DolibarrModules $this->picto='company'; // Data directories to create when module is enabled - // TODO Replace with simple directories - $this->dirs = array(); - $r=0; - - $this->dirs[$r][0] = "output"; - $this->dirs[$r][1] = "/societe"; - - $r++; - $this->dirs[$r][0] = "temp"; - $this->dirs[$r][1] = "/societe/temp"; - - $r++; - $this->dirs[$r][0] = "logos"; - $this->dirs[$r][1] = "/societe/logos"; - $this->dirs[$r][2] = 1; - + $this->dirs = array("/societe/temp","/societe/logos"); + // Dependances $this->depends = array(); $this->requiredby = array("modExpedition","modFacture","modFournisseur","modFicheinter","modPropale","modContrat","modCommande"); diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 75f9dca6774..ff793bf6ea6 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -772,7 +772,7 @@ class pdf_propale_azur extends ModelePDFPropales $pdf->SetXY($this->marge_gauche,$posy); // Logo - $logo=$conf->societe->dir_logos.'/'.$this->emetteur->logo; + $logo=$conf->societe->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 c800746ef61..f4ff209b88d 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -593,7 +593,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->SetXY($this->marge_gauche,$posy); // Logo - $logo=$conf->societe->dir_logos.'/'.$mysoc->logo; + $logo=$conf->societe->dir_output.'/logos/'.$mysoc->logo; if ($mysoc->logo) { if (is_readable($logo)) diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php index f5736bda400..05e73bf734c 100644 --- a/htdocs/lib/security.lib.php +++ b/htdocs/lib/security.lib.php @@ -121,11 +121,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_logos.'/thumbs/'.$mysoc->logo_small)) + if (! empty($mysoc->logo_small) && is_readable($conf->societe->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_logos.'/'.$mysoc->logo)) + elseif (! empty($mysoc->logo_small) && is_readable($conf->societe->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 2383ed051c3..e2a4203fea1 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -129,11 +129,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_logos.'/thumbs/'.$logosmall)) +if (! empty($logosmall) && is_readable($conf->societe->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_logos.'/'.$logo)) +elseif (! empty($logo) && is_readable($conf->societe->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 bae58518966..759c811c2df 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -232,11 +232,11 @@ if ($conf->file->main_authentication) $title.=", ".$langs->trans("Authentication // 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 (is_readable($conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_small)) +if (is_readable($conf->societe->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) { $urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&file='.urlencode('/thumbs/'.$mysoc->logo_small); } -elseif (is_readable($conf->societe->dir_logos.'/'.$mysoc->logo)) +elseif (is_readable($conf->societe->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 7c6428ef57f..f2c8d8dc0fc 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_logos.'/'.$original_file; + $original_file=$conf->societe->dir_output.'/logos/'.$original_file; } // Wrapping pour les photos utilisateurs