lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2011-03-09 15:34:57 +00:00
parent e9981e14b2
commit e9f4879245
28 changed files with 67 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/company.php
View File

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

1
htdocs/admin/mails.php
View File

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

1
htdocs/admin/tools/export.php
View File

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

12
htdocs/categories/class/categorie.class.php
View File

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

1
htdocs/comm/propal/class/propal.class.php
View File

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

2
htdocs/commande/class/commande.class.php
View File

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

2
htdocs/commande/fiche.php
View File

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

1
htdocs/compta/facture/class/facture.class.php
View File

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

3
htdocs/compta/facture/document.php
View File

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

10
htdocs/contrat/document.php
View File

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

11
htdocs/ecm/docother.php
View File

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

4
htdocs/expedition/class/expedition.class.php
View File

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

1
htdocs/fichinter/class/fichinter.class.php
View File

@ -517,6 +517,7 @@ class Fichinter extends CommonObject
function delete($user)
{
global $conf;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
$error=0;

15
htdocs/fourn/class/fournisseur.commande.class.php
View File

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

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

@ -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))
{

1
htdocs/fourn/facture/fiche.php
View File

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

1
htdocs/includes/modules/commande/modules_commande.php
View File

@ -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)
{

1
htdocs/includes/modules/facture/modules_facture.php
View File

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

1
htdocs/includes/modules/fichinter/modules_fichinter.php
View File

@ -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)
{

1
htdocs/includes/modules/livraison/modules_livraison.php
View File

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

1
htdocs/includes/modules/project/modules_project.php
View File

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

7
htdocs/includes/modules/propale/modules_propale.php
View File

@ -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)
{

1
htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
View File

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

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

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

1
htdocs/install/upgrade2.php
View File

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

7
htdocs/livraison/class/livraison.class.php
View File

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

4
htdocs/product/class/product.class.php
View File

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

4
htdocs/projet/class/project.class.php
View File

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