From e9f4879245dda40cfc71df9f8b6ddb7282f4527a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 9 Mar 2011 15:34:57 +0000
Subject: [PATCH] Qual: Prepare move of function dol_delete_file into
file.lib.php
---
htdocs/admin/company.php | 2 ++
htdocs/admin/mails.php | 1 +
htdocs/admin/tools/export.php | 1 +
htdocs/categories/class/categorie.class.php | 12 +++++++-----
htdocs/comm/propal/class/propal.class.php | 1 +
htdocs/commande/class/commande.class.php | 2 ++
htdocs/commande/fiche.php | 2 ++
htdocs/compta/facture/class/facture.class.php | 1 +
htdocs/compta/facture/document.php | 3 ++-
htdocs/contrat/document.php | 10 +++++-----
htdocs/ecm/docother.php | 11 ++++++-----
htdocs/expedition/class/expedition.class.php | 4 +++-
htdocs/fichinter/class/fichinter.class.php | 1 +
htdocs/fourn/class/fournisseur.commande.class.php | 15 ++++++++-------
htdocs/fourn/commande/fiche.php | 3 ++-
htdocs/fourn/facture/fiche.php | 1 +
.../modules/commande/modules_commande.php | 1 +
.../includes/modules/facture/modules_facture.php | 1 +
.../modules/fichinter/modules_fichinter.php | 1 +
.../modules/livraison/modules_livraison.php | 1 +
.../includes/modules/project/modules_project.php | 1 +
.../includes/modules/propale/modules_propale.php | 7 ++++---
.../modules_facturefournisseur.php | 1 +
.../modules_commandefournisseur.php | 1 +
htdocs/install/upgrade2.php | 1 +
htdocs/livraison/class/livraison.class.php | 7 ++++---
htdocs/product/class/product.class.php | 4 +++-
htdocs/projet/class/project.class.php | 4 +++-
28 files changed, 67 insertions(+), 33 deletions(-)
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index ca6a5e93dae..c25fc7d3194 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -198,6 +198,8 @@ if ($_GET["action"] == 'addthumb')
if ($_GET["action"] == 'removelogo')
{
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+
$logofile=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
dol_delete_file($logofile);
dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO",$conf->entity);
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index eb1b3d440c6..73a0de79f82 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -25,6 +25,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$langs->load("companies");
$langs->load("products");
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 588fb7557b0..82a531a1d9d 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -24,6 +24,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php";
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 18d5b7dfbfd..cb7691f2481 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -273,9 +273,9 @@ class Categorie
global $conf,$langs;
$error=0;
-
+
dol_syslog("Categorie::remove");
-
+
$this->db->begin();
if (! $error)
@@ -322,7 +322,7 @@ class Categorie
$error++;
}
}
-
+
// Link childs to parent
if (! $error)
{
@@ -358,7 +358,7 @@ class Categorie
// Fin appel triggers
}
}
-
+
if (! $error)
{
$this->db->commit();
@@ -1197,7 +1197,9 @@ class Categorie
*/
function delete_photo($file)
{
- $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+
+ $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette
$filename = preg_replace('/'.preg_quote($dir,'/').'/i','',$file); // Nom du fichier
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 8d19c3f3f15..52a78378558 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1592,6 +1592,7 @@ class Propal extends CommonObject
function delete($user, $notrigger=0)
{
global $conf,$langs;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$error=0;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 2bbc1b39588..f10924b2f09 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -170,6 +170,7 @@ class Commande extends CommonObject
function valid($user)
{
global $conf,$langs;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$error=0;
@@ -2034,6 +2035,7 @@ class Commande extends CommonObject
function delete($user)
{
global $conf, $langs;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$err = 0;
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index eeff76857db..6f2b905de0d 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -862,6 +862,8 @@ if ($_REQUEST['action'] == 'remove_file')
{
if ($object->fetch($id))
{
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+
$upload_dir = $conf->commande->dir_output . "/";
$file = $upload_dir . '/' . $_GET['file'];
dol_delete_file($file);
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 234b7527dd1..2d99b46403b 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1383,6 +1383,7 @@ class Facture extends CommonObject
function validate($user, $force_number='')
{
global $conf,$langs;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$error=0;
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 6c0ccede916..89a2e9e4227 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -108,7 +108,8 @@ if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
// Delete
if ($action=='delete')
{
- $facture = new Facture($db);
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ $facture = new Facture($db);
$facid=$_GET["id"];
if ($facture->fetch($facid))
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index d8af6d66261..8f70fa27876 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -21,11 +21,11 @@
*/
/**
- \file htdocs/contrat/document.php
- \ingroup contrat
- \brief Page des documents joints sur les contrats
- \version $Id$
-*/
+ * \file htdocs/contrat/document.php
+ * \ingroup contrat
+ * \brief Page des documents joints sur les contrats
+ * \version $Id$
+ */
require ("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/contract.lib.php");
diff --git a/htdocs/ecm/docother.php b/htdocs/ecm/docother.php
index cb5048ae7bf..1cc94cfbd2a 100644
--- a/htdocs/ecm/docother.php
+++ b/htdocs/ecm/docother.php
@@ -3,15 +3,16 @@
*/
/**
- \file htdocs/ecm/docother.php
- \ingroup ecm
- \brief Main ecm page
- \version $Id$
- \author Laurent Destailleur
+ * \file htdocs/ecm/docother.php
+ * \ingroup ecm
+ * \brief Main ecm page
+ * \version $Id$
+ * \author Laurent Destailleur
*/
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
// Load traductions files
$langs->load("ecm");
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index cc1f52dedaf..7e5a9091107 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -389,6 +389,7 @@ class Expedition extends CommonObject
function valid($user)
{
global $conf;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
dol_syslog("Expedition::valid");
@@ -727,10 +728,11 @@ class Expedition extends CommonObject
}
/**
- * \brief Delete shipping
+ * Delete shipping
*/
function delete()
{
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index e26ab4bc00a..259b4baa6c5 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -517,6 +517,7 @@ class Fichinter extends CommonObject
function delete($user)
{
global $conf;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$error=0;
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index f56091a872d..ace4a2e26a6 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -255,6 +255,7 @@ class CommandeFournisseur extends Commande
function valid($user)
{
global $langs,$conf;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$error=0;
@@ -828,7 +829,7 @@ class CommandeFournisseur extends Commande
if (empty($txtva)) $txtva=0;
if (empty($txlocaltax1)) $txlocaltax1=0;
if (empty($txlocaltax2)) $txlocaltax2=0;
-
+
$remise_percent=price2num($remise_percent);
$qty=price2num($qty);
$pu_ht=price2num($pu_ht);
@@ -845,7 +846,7 @@ class CommandeFournisseur extends Commande
$pu=$pu_ttc;
}
$desc=trim($desc);
-
+
// Check parameters
if ($qty < 1 && ! $fk_product)
@@ -1148,10 +1149,10 @@ class CommandeFournisseur extends Commande
}
/**
- * \bref Set a delivery in database for this supplier order
- * \param user User that input data
- * \param date Date of reception
- * \param type Type of receipt
+ * Set a delivery in database for this supplier order
+ * @param user User that input data
+ * @param date Date of reception
+ * @param type Type of receipt
*/
function Livraison($user, $date, $type, $comment)
{
@@ -1390,7 +1391,7 @@ class CommandeFournisseur extends Commande
if (empty($txlocaltax2)) $txlocaltax2=0;
if (empty($remise)) $remise=0;
if (empty($remise_percent)) $remise_percent=0;
-
+
$remise_percent=price2num($remise_percent);
$qty=price2num($qty);
if (! $qty) $qty=1;
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index ef31e077a9d..6d555bc2593 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -523,7 +523,8 @@ if ($action == 'builddoc') // En get ou en post
// Delete file in doc form
if ($action=='remove_file')
{
- $commande = new CommandeFournisseur($db);
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+ $commande = new CommandeFournisseur($db);
if ($commande->fetch($id))
{
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 69a92b7798c..86901f87d59 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -851,6 +851,7 @@ if ($_REQUEST['action'] == 'builddoc')
// Delete file in doc form
if ($action=='remove_file')
{
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$facture = new FactureFournisseur($db);
if ($facture->fetch($id))
diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php
index 3782766710f..a905fef4808 100644
--- a/htdocs/includes/modules/commande/modules_commande.php
+++ b/htdocs/includes/modules/commande/modules_commande.php
@@ -221,6 +221,7 @@ function commande_pdf_create($db, $object, $modele, $outputlangs)
function commande_delete_preview($db, $commandeid, $commanderef='')
{
global $langs,$conf;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
if (!$commanderef)
{
diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php
index b286d87efa5..c1c7a6966b5 100644
--- a/htdocs/includes/modules/facture/modules_facture.php
+++ b/htdocs/includes/modules/facture/modules_facture.php
@@ -293,6 +293,7 @@ function facture_meta_create($db, $facid, $message="")
function facture_delete_preview($db, $facid)
{
global $langs,$conf;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$fac = new Facture($db,"",$facid);
$fac->fetch($facid);
diff --git a/htdocs/includes/modules/fichinter/modules_fichinter.php b/htdocs/includes/modules/fichinter/modules_fichinter.php
index 362f3c59885..0b9f4c62e96 100644
--- a/htdocs/includes/modules/fichinter/modules_fichinter.php
+++ b/htdocs/includes/modules/fichinter/modules_fichinter.php
@@ -210,6 +210,7 @@ function fichinter_create($db, $object, $modele='', $outputlangs='')
function fichinter_delete_preview($db, $fichinterid, $fichinterref='')
{
global $langs,$conf;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
if (!$fichinterref)
{
diff --git a/htdocs/includes/modules/livraison/modules_livraison.php b/htdocs/includes/modules/livraison/modules_livraison.php
index 7d44cd756a0..9f6678423a2 100644
--- a/htdocs/includes/modules/livraison/modules_livraison.php
+++ b/htdocs/includes/modules/livraison/modules_livraison.php
@@ -198,6 +198,7 @@ function delivery_order_pdf_create($db, $object, $model='', $outputlangs='')
function delivery_order_delete_preview($db, $deliveryid)
{
global $langs,$conf;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$delivery = new Livraison($db,"",$deliveryid);
$delivery->fetch($deliveryid);
diff --git a/htdocs/includes/modules/project/modules_project.php b/htdocs/includes/modules/project/modules_project.php
index 6a10252bc57..868ddf3a3f9 100644
--- a/htdocs/includes/modules/project/modules_project.php
+++ b/htdocs/includes/modules/project/modules_project.php
@@ -208,6 +208,7 @@ function project_pdf_create($db, $object, $model,$outputlangs)
function project_delete_preview($db, $objectid)
{
global $langs,$conf;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$project = new Project($db);
$project->fetch($objectid);
diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php
index f3fea58c8b5..aa7f5e38dcb 100644
--- a/htdocs/includes/modules/propale/modules_propale.php
+++ b/htdocs/includes/modules/propale/modules_propale.php
@@ -22,7 +22,7 @@
/**
* \file htdocs/includes/modules/propale/modules_propale.php
* \ingroup propale
- * \brief Fichier contenant la classe mere de generation des propales en PDF
+ * \brief Fichier contenant la classe mere de generation des propales en PDF
* et la classe mere de numerotation des propales
* \version $Id$
*/
@@ -148,10 +148,10 @@ function propale_pdf_create($db, $object, $modele, $outputlangs)
// Positionne modele sur le nom du modele de propale a utiliser
$file = "pdf_propale_".$modele.".modules.php";
-
+
// On verifie l'emplacement du modele
$file = dol_buildpath($dir.$file);
-
+
if ($modele && file_exists($file)) $modelisok=1;
// Si model pas encore bon
@@ -226,6 +226,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs)
function propale_delete_preview($db, $propalid, $propalref='')
{
global $langs,$conf;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
if (!$propalref)
{
diff --git a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
index dd972c9a4c2..9c78596cee1 100755
--- a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
+++ b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
@@ -129,6 +129,7 @@ function supplier_invoice_pdf_create($db, $object, $model, $outputlangs)
function supplier_invoice_delete_preview($db, $objectid)
{
global $langs,$conf;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$comfourn = new FactureFournisseur($db,"",$objectid);
$comfourn->fetch($objectid);
diff --git a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
index e2bcd7a9326..8f32ca7c7a1 100644
--- a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
@@ -204,6 +204,7 @@ function supplier_order_pdf_create($db, $object, $model, $outputlangs)
function supplier_order_delete_preview($db, $objectid)
{
global $langs,$conf;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$comfourn = new CommandeFournisseur($db,"",$objectid);
$comfourn->fetch($objectid);
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index a92f71d099b..c763f7f15ab 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -39,6 +39,7 @@ require_once($dolibarr_main_document_root . '/commande/class/commande.class.php'
require_once($dolibarr_main_document_root . '/fourn/class/fournisseur.commande.class.php');
require_once($dolibarr_main_document_root . '/lib/price.lib.php');
require_once($dolibarr_main_document_root . '/core/class/menubase.class.php');
+require_once($dolibarr_main_document_root . '/lib/files.lib.php');
$grant_query='';
$etape = 2;
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 328590249b7..3c37d9212c8 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -316,6 +316,7 @@ class Livraison extends CommonObject
function valid($user)
{
global $conf;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
dol_syslog("livraison.class.php::valid begin");
@@ -501,7 +502,7 @@ class Livraison extends CommonObject
$line->qty = $expedition->lines[$i]->qty_shipped;
$line->fk_product = $expedition->lines[$i]->fk_product;
$line->ref = $expedition->lines[$i]->ref;
-
+
$this->lines[$i] = $line;
}
@@ -559,10 +560,10 @@ class Livraison extends CommonObject
/**
* Supprime la fiche
- *
*/
function delete()
{
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."livraisondet";
@@ -790,7 +791,7 @@ class Livraison extends CommonObject
$line->description = 'Description';
$line->price = 100;
$line->total_ht = 100;
-
+
$this->lines[$i] = $line;
}
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 090f22e67fb..c479381e83b 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2682,7 +2682,9 @@ class Product extends CommonObject
*/
function delete_photo($file)
{
- $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+
+ $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette
$filename = preg_replace('/'.preg_quote($dir,'/').'/i','',$file); // Nom du fichier
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 56a333911f3..06b6381b95b 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -376,10 +376,12 @@ class Project extends CommonObject
* Delete a project from database
* @param user User
* @param notrigger Disable triggers
+ * @return int <0 if KO, 0 if not possible, >0 if OK
*/
function delete($user, $notrigger=0)
{
- global $conf;
+ global $langs,$conf;
+ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$error=0;
--
GitLab