Qual: Prepare move of function dol_delete_file into file.lib.php

2011-03-09 15:34:57 +00:00
parent e9981e14b2
commit e9f4879245
28 changed files with 67 additions and 33 deletions
--- 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);
--- 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");
--- 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";

--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1197,6 +1197,8 @@ class Categorie
 	 */
 	function delete_photo($file)
 	{
+        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
--- 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;

--- 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;

--- 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);
--- 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;

--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -108,6 +108,7 @@ if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 // Delete
 if ($action=='delete')
 {
+    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
    $facture = new Facture($db);

 	$facid=$_GET["id"];
--- 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");
--- 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");
--- 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";
--- 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;

--- 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;

@@ -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)
 	{
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -523,6 +523,7 @@ if ($action == 'builddoc')	// En get ou en	post
 // Delete file in doc form
 if ($action=='remove_file')
 {
+    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
    $commande = new CommandeFournisseur($db);

 	if ($commande->fetch($id))
--- 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))
--- 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)
 	{
--- 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);
--- 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)
 	{
--- 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);
--- 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);
--- a/htdocs/includes/modules/propale/modules_propale.php
+++ b/htdocs/includes/modules/propale/modules_propale.php
@@ -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)
 	{
--- 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);
--- 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);
--- 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;
--- 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");

@@ -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";
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2682,6 +2682,8 @@ class Product extends CommonObject
 	 */
 	function delete_photo($file)
 	{
+        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
--- 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;