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

Fix: replace with simple directory

Browse Source
This commit is contained in:
Regis Houssin
2009-07-05 08:31:08 +00:00
parent 0a06027c9f
commit f96ea81ac5
13 changed files with 30 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/commande/stats/index.php
View File

@@ -65,7 +65,7 @@ if ($mode == 'customer')
if ($mode == 'supplier') if ($mode == 'supplier')
{ {
$title=$langs->trans("OrdersStatisticsSuppliers"); $title=$langs->trans("OrdersStatisticsSuppliers");
$dir=$conf->fournisseur->commande->dir_temp; $dir=$conf->fournisseur->dir_output.'/commande/temp';
} }
print_fiche_titre($title, $mesg); print_fiche_titre($title, $mesg);

2
htdocs/commande/stats/month.php
View File

@@ -60,7 +60,7 @@ if ($mode == 'customer')
if ($mode == 'supplier') if ($mode == 'supplier')
{ {
$title=$langs->trans("OrdersStatisticsSuppliers"); $title=$langs->trans("OrdersStatisticsSuppliers");
$dir=$conf->fournisseur->dir_temp; $dir=$conf->fournisseur->dir_output.'/commande/temp';
} }
$mesg = '<a href="month.php?year='.($year - 1).'&amp;mode='.$mode.'">'.img_previous().'</a> '; $mesg = '<a href="month.php?year='.($year - 1).'&amp;mode='.$mode.'">'.img_previous().'</a> ';

2
htdocs/compta/facture/stats/index.php
View File

@@ -59,7 +59,7 @@ if ($mode == 'customer')
if ($mode == 'supplier') if ($mode == 'supplier')
{ {
$title=$langs->trans("BillsStatisticsSuppliers"); $title=$langs->trans("BillsStatisticsSuppliers");
$dir=$conf->fournisseur->facture->dir_temp; $dir=$conf->fournisseur->dir_output.'/facture/temp';
} }
print_fiche_titre($title, $mesg); print_fiche_titre($title, $mesg);

2
htdocs/compta/facture/stats/month.php
View File

@@ -58,7 +58,7 @@ if ($mode == 'customer')
if ($mode == 'supplier') if ($mode == 'supplier')
{ {
$title=$langs->trans("BillsStatisticsSuppliers"); $title=$langs->trans("BillsStatisticsSuppliers");
$dir=$conf->fournisseur->facture->dir_temp; $dir=$conf->fournisseur->dir_output.'/facture/temp';
} }
$mesg = '<a href="month.php?year='.($year - 1).'&amp;mode='.$mode.'">'.img_previous().'</a> '; $mesg = '<a href="month.php?year='.($year - 1).'&amp;mode='.$mode.'">'.img_previous().'</a> ';

4
htdocs/document.php
View File

@@ -188,7 +188,7 @@ if ($modulepart)
{ {
$accessallowed=1; $accessallowed=1;
} }
$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file; $original_file=$conf->fournisseur->dir_output.'/commande/'.$original_file;
$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='$refname'"; $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='$refname'";
} }
@@ -200,7 +200,7 @@ if ($modulepart)
{ {
$accessallowed=1; $accessallowed=1;
} }
$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file; $original_file=$conf->fournisseur->dir_output.'/facture/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE facnumber='$refname'"; //$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE facnumber='$refname'";
} }

6
htdocs/fourn/commande/document.php
View File

@@ -76,7 +76,7 @@ if ($commande->fetch($_GET['id'],$_GET['ref']) < 0)
// Envoi fichier // Envoi fichier
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {
$upload_dir = $conf->fournisseur->commande->dir_output . "/" . dol_sanitizeFileName($commande->ref); $upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($commande->ref);
if (! is_dir($upload_dir)) create_exdir($upload_dir); if (! is_dir($upload_dir)) create_exdir($upload_dir);
if (is_dir($upload_dir)) if (is_dir($upload_dir))
@@ -98,7 +98,7 @@ if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
// Delete // Delete
if ($action=='delete') if ($action=='delete')
{ {
$upload_dir = $conf->fournisseur->commande->dir_output . "/" . dol_sanitizeFileName($commande->ref); $upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($commande->ref);
$file = $upload_dir . '/' . urldecode($_GET['urlfile']); $file = $upload_dir . '/' . urldecode($_GET['urlfile']);
dol_delete_file($file); dol_delete_file($file);
$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>'; $mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
@@ -117,7 +117,7 @@ if ($id > 0 || ! empty($ref))
{ {
llxHeader(); llxHeader();
$upload_dir = $conf->fournisseur->commande->dir_output.'/'.dol_sanitizeFileName($commande->ref); $upload_dir = $conf->fournisseur->dir_output.'/commande/'.dol_sanitizeFileName($commande->ref);
$soc = new Societe($db); $soc = new Societe($db);
$soc->fetch($commande->socid); $soc->fetch($commande->socid);

4
htdocs/fourn/commande/fiche.php
View File

@@ -1006,9 +1006,9 @@ if ($id > 0 || ! empty($ref))
* Documents generes * Documents generes
*/ */
$comfournref = dol_sanitizeFileName($commande->ref); $comfournref = dol_sanitizeFileName($commande->ref);
$file = $conf->fournisseur->commande->dir_output . '/' . $comfournref . '/' . $comfournref . '.pdf'; $file = $conf->fournisseur->dir_output . '/commande/' . $comfournref . '/' . $comfournref . '.pdf';
$relativepath = $comfournref.'/'.$comfournref.'.pdf'; $relativepath = $comfournref.'/'.$comfournref.'.pdf';
$filedir = $conf->fournisseur->commande->dir_output . '/' . $comfournref; $filedir = $conf->fournisseur->dir_output . '/commande/' . $comfournref;
$urlsource=$_SERVER["PHP_SELF"]."?id=".$commande->id; $urlsource=$_SERVER["PHP_SELF"]."?id=".$commande->id;
$genallowed=$user->rights->fournisseur->commande->creer; $genallowed=$user->rights->fournisseur->commande->creer;
$delallowed=$user->rights->fournisseur->commande->supprimer; $delallowed=$user->rights->fournisseur->commande->supprimer;

12
htdocs/fourn/facture/document.php
View File

@@ -22,7 +22,7 @@
/** /**
\file htdocs/fourn/facture/document.php \file htdocs/fourn/facture/document.php
\ingroup facture, fournisseur \ingroup facture, fournisseur
\brief Page de gestion des documents attach<EFBFBD>es <EFBFBD> une facture fournisseur \brief Page de gestion des documents attachees a une facture fournisseur
\version $Id$ \version $Id$
*/ */
@@ -69,7 +69,7 @@ if ($_POST['sendit'] && ! empty($conf->global->MAIN_UPLOAD_DOC))
$facture = new FactureFournisseur($db); $facture = new FactureFournisseur($db);
if ($facture->fetch($facid)) if ($facture->fetch($facid))
{ {
$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$facture->id; $upload_dir = $conf->fournisseur->dir_output.'/facture/'.get_exdir($facture->id,2).$facture->id;
if (! is_dir($upload_dir)) create_exdir($upload_dir); if (! is_dir($upload_dir)) create_exdir($upload_dir);
@@ -82,7 +82,7 @@ if ($_POST['sendit'] && ! empty($conf->global->MAIN_UPLOAD_DOC))
} }
else else
{ {
// Echec transfert (fichier d<EFBFBD>passant la limite ?) // Echec transfert (fichier depassant la limite ?)
$mesg = '<div class="error">'.$langs->trans('ErrorFileNotUploaded').'</div>'; $mesg = '<div class="error">'.$langs->trans('ErrorFileNotUploaded').'</div>';
// print_r($_FILES); // print_r($_FILES);
} }
@@ -98,7 +98,7 @@ if ($action=='delete')
$facture = new FactureFournisseur($db); $facture = new FactureFournisseur($db);
if ($facture->fetch($facid)) if ($facture->fetch($facid))
{ {
$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$facture->id; $upload_dir = $conf->fournisseur->dir_output.'/facture/'.get_exdir($facture->id,2).$facture->id;
$file = $upload_dir . '/' . urldecode($_GET['urlfile']); $file = $upload_dir . '/' . urldecode($_GET['urlfile']);
dol_delete_file($file); dol_delete_file($file);
@@ -120,7 +120,7 @@ if ($facid > 0)
{ {
$facture->fetch_fournisseur(); $facture->fetch_fournisseur();
$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$facture->id; $upload_dir = $conf->fournisseur->dir_output.'/facture/'.get_exdir($facture->id,2).$facture->id;
$head = facturefourn_prepare_head($facture); $head = facturefourn_prepare_head($facture);
dol_fiche_head($head, 'documents', $langs->trans('SupplierInvoice')); dol_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'));
@@ -145,7 +145,7 @@ if ($facid > 0)
print '<tr><td nowrap="nowrap">'.$langs->trans("RefSupplier").'</td><td colspan="3">'.$facture->ref_supplier.'</td>'; print '<tr><td nowrap="nowrap">'.$langs->trans("RefSupplier").'</td><td colspan="3">'.$facture->ref_supplier.'</td>';
print "</tr>\n"; print "</tr>\n";
// Soci<EFBFBD>t<EFBFBD> // Societe
print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">'.$facture->fournisseur->getNomUrl(1).'</td></tr>'; print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">'.$facture->fournisseur->getNomUrl(1).'</td></tr>';
print '<tr><td>'.$langs->trans('NbOfAttachedFiles').'</td><td colspan="3">'.sizeof($filearray).'</td></tr>'; print '<tr><td>'.$langs->trans('NbOfAttachedFiles').'</td><td colspan="3">'.sizeof($filearray).'</td></tr>';

41
htdocs/includes/modules/modFournisseur.class.php
View File

@@ -61,41 +61,12 @@ class modFournisseur extends DolibarrModules
$this->picto='company'; $this->picto='company';
// Data directories to create when module is enabled // Data directories to create when module is enabled
// TODO Replace with simple directories $this->dirs = array("/fournisseur/temp",
$this->dirs = array(); "/fournisseur/commande",
$r=0; "/fournisseur/commande/temp",
"/fournisseur/facture",
$this->dirs[$r][0] = "output"; "/fournisseur/facture/temp"
$this->dirs[$r][1] = "/fournisseur"; );
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/fournisseur/temp";
$r++;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/fournisseur/commande";
$this->dirs[$r][2] = 1;
$this->dirs[$r][3] = "commande";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/fournisseur/commande/temp";
$this->dirs[$r][2] = 1;
$this->dirs[$r][3] = "commande";
$r++;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/fournisseur/facture";
$this->dirs[$r][2] = 1;
$this->dirs[$r][3] = "facture";
$r++;
$this->dirs[$r][0] = "temp";
$this->dirs[$r][1] = "/fournisseur/facture/temp";
$this->dirs[$r][2] = 1;
$this->dirs[$r][3] = "facture";
// Dependances // Dependances
$this->depends = array("modSociete"); $this->depends = array("modSociete");

2
htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
View File

@@ -230,7 +230,7 @@ function supplier_order_delete_preview($db, $propalid)
$client = new Societe($db); $client = new Societe($db);
$client->fetch($comfourn->socid); $client->fetch($comfourn->socid);
if ($conf->fournisseur->commande->dir_output) if ($conf->fournisseur->dir_output.'/commande')
{ {
$comfournref = dol_sanitizeFileName($comfourn->ref); $comfournref = dol_sanitizeFileName($comfourn->ref);
$dir = $conf->commande->dir_output . "/" . $comfournref ; $dir = $conf->commande->dir_output . "/" . $comfournref ;

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

@@ -121,7 +121,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$outputlangs->load("products"); $outputlangs->load("products");
$outputlangs->load("orders"); $outputlangs->load("orders");
if ($conf->fournisseur->commande->dir_output) if ($conf->fournisseur->dir_output.'/commande')
{ {
// Definition de l'objet $com (pour compatibilite ascendante) // Definition de l'objet $com (pour compatibilite ascendante)
if (! is_object($com)) if (! is_object($com))
@@ -135,13 +135,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// Definition de $dir et $file // Definition de $dir et $file
if ($com->specimen) if ($com->specimen)
{ {
$dir = $conf->fournisseur->commande->dir_output; $dir = $conf->fournisseur->dir_output.'/commande';
$file = $dir . "/SPECIMEN.pdf"; $file = $dir . "/SPECIMEN.pdf";
} }
else else
{ {
$comref = dol_sanitizeFileName($com->ref); $comref = dol_sanitizeFileName($com->ref);
$dir = $conf->fournisseur->commande->dir_output . "/" . $comref; $dir = $conf->fournisseur->dir_output . "/commande/" . $comref;
$file = $dir . "/" . $comref . ".pdf"; $file = $dir . "/" . $comref . ".pdf";
} }

2
htdocs/includes/triggers/interface_modNotification_Notification.class.php
View File

@@ -132,7 +132,7 @@ class InterfaceNotification
$action_notify = 'NOTIFY_VAL_ORDER_SUPPLIER'; $action_notify = 'NOTIFY_VAL_ORDER_SUPPLIER';
$ref = dol_sanitizeFileName($object->ref); $ref = dol_sanitizeFileName($object->ref);
$filepdf = $conf->fournisseur->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf'; $filepdf = $conf->fournisseur->dir_output . '/commande/' . $ref . '/' . $ref . '.pdf';
$mesg = 'La commande fournisseur '.$object->ref." a été validée.\n"; $mesg = 'La commande fournisseur '.$object->ref." a été validée.\n";
$notify = new Notify($this->db); $notify = new Notify($this->db);

4
htdocs/viewimage.php
View File

@@ -163,7 +163,7 @@ if ($modulepart)
{ {
$accessallowed=1; $accessallowed=1;
} }
$original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file; $original_file=$conf->fournisseur->dir_output.'/commande/temp/'.$original_file;
} }
// Wrapping pour les images des stats factures // Wrapping pour les images des stats factures
@@ -183,7 +183,7 @@ if ($modulepart)
{ {
$accessallowed=1; $accessallowed=1;
} }
$original_file=$conf->fournisseur->facture->dir_temp.'/'.$original_file; $original_file=$conf->fournisseur->dir_output.'/facture/temp/'.$original_file;
} }
// Wrapping pour les images des stats expeditions // Wrapping pour les images des stats expeditions