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

Fix: object is a parameter

Browse Source
This commit is contained in:
Regis Houssin 2011-07-14 05:21:52 +00:00
parent 23b980b7f4
commit d82e40b010
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/comm/propal/document.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com> * Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2005 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -23,7 +23,7 @@
* \file htdocs/comm/propal/document.php * \file htdocs/comm/propal/document.php
* \ingroup propale * \ingroup propale
* \brief Page de gestion des documents attaches a une proposition commerciale * \brief Page de gestion des documents attaches a une proposition commerciale
* \version $Id: document.php,v 1.66 2011/07/06 20:56:49 eldy Exp $ * \version $Id: document.php,v 1.67 2011/07/14 05:21:53 hregis Exp $
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
@ -110,7 +110,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
$upload_dir = $conf->propale->dir_output . "/" . dol_sanitizeFileName($object->ref); $upload_dir = $conf->propale->dir_output . "/" . dol_sanitizeFileName($object->ref);
$file = $upload_dir . '/' . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). $file = $upload_dir . '/' . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
dol_delete_file($file); dol_delete_file($file,0,0,0,'FILE_DELETE',$object);
$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>'; $mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
} }
} }
@ -209,5 +209,5 @@ else
$db->close(); $db->close();
llxFooter('$Date: 2011/07/06 20:56:49 $ - $Revision: 1.66 $'); llxFooter('$Date: 2011/07/14 05:21:53 $ - $Revision: 1.67 $');
?> ?>

6
htdocs/commande/document.php
View File

@ -23,7 +23,7 @@
* \file htdocs/commande/document.php * \file htdocs/commande/document.php
* \ingroup order * \ingroup order
* \brief Page de gestion des documents attachees a une commande * \brief Page de gestion des documents attachees a une commande
* \version $Id: document.php,v 1.34 2011/07/06 20:56:49 eldy Exp $ * \version $Id: document.php,v 1.35 2011/07/14 05:21:53 hregis Exp $
*/ */
require("../main.inc.php"); require("../main.inc.php");
@ -113,7 +113,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
$upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($object->ref); $upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($object->ref);
$file = $upload_dir . '/' . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). $file = $upload_dir . '/' . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
dol_delete_file($file); dol_delete_file($file,0,0,0,'FILE_DELETE',$object);
$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>'; $mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
} }
} }
@ -193,5 +193,5 @@ else
$db->close(); $db->close();
llxFooter('$Date: 2011/07/06 20:56:49 $ - $Revision: 1.34 $'); llxFooter('$Date: 2011/07/14 05:21:53 $ - $Revision: 1.35 $');
?> ?>

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

@ -23,7 +23,7 @@
* \file htdocs/compta/facture/document.php * \file htdocs/compta/facture/document.php
* \ingroup facture * \ingroup facture
* \brief Page for attached files on invoices * \brief Page for attached files on invoices
* \version $Id: document.php,v 1.44 2011/07/06 20:56:49 eldy Exp $ * \version $Id: document.php,v 1.45 2011/07/14 05:21:53 hregis Exp $
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
@ -115,7 +115,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
$upload_dir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($object->ref); $upload_dir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($object->ref);
$file = $upload_dir . '/' . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). $file = $upload_dir . '/' . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
dol_delete_file($file); dol_delete_file($file,0,0,0,'FILE_DELETE',$object);
$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>'; $mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
} }
} }
@ -213,5 +213,5 @@ else
$db->close(); $db->close();
llxFooter('$Date: 2011/07/06 20:56:49 $ - $Revision: 1.44 $'); llxFooter('$Date: 2011/07/14 05:21:53 $ - $Revision: 1.45 $');
?> ?>

4
htdocs/lib/files.lib.php
View File

@ -20,7 +20,7 @@
/** /**
* \file htdocs/lib/files.lib.php * \file htdocs/lib/files.lib.php
* \brief Library for file managing functions * \brief Library for file managing functions
* \version $Id: files.lib.php,v 1.69 2011/07/13 21:33:38 eldy Exp $ * \version $Id: files.lib.php,v 1.70 2011/07/14 05:21:53 hregis Exp $
*/ */
/** /**
@ -590,7 +590,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
* @param disableglob Disable usage of glob like * * @param disableglob Disable usage of glob like *
* @param nophperrors Disable all PHP output errors * @param nophperrors Disable all PHP output errors
* @param notrigger Disable all triggers * @param notrigger Disable all triggers
* @param triggercode Code of trigger * @param triggercode Code of trigger TODO ???? why ?
* @param object Object for trigger * @param object Object for trigger
* @return boolean True if file is deleted, False if error * @return boolean True if file is deleted, False if error
*/ */

6
htdocs/societe/document.php
View File

@ -23,7 +23,7 @@
* \file htdocs/societe/document.php * \file htdocs/societe/document.php
* \brief Tab for documents linked to third party * \brief Tab for documents linked to third party
* \ingroup societe * \ingroup societe
* \version $Id: document.php,v 1.37 2011/07/06 20:56:49 eldy Exp $ * \version $Id: document.php,v 1.38 2011/07/14 05:21:52 hregis Exp $
*/ */
require("../main.inc.php"); require("../main.inc.php");
@ -118,7 +118,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
if ($object->fetch($socid)) if ($object->fetch($socid))
{ {
$file = $upload_dir . "/" . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). $file = $upload_dir . "/" . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
dol_delete_file($file); dol_delete_file($file,0,0,0,'FILE_DELETE',$object);
$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>'; $mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
} }
} }
@ -241,6 +241,6 @@ else
$db->close(); $db->close();
llxFooter('$Date: 2011/07/06 20:56:49 $ - $Revision: 1.37 $'); llxFooter('$Date: 2011/07/14 05:21:52 $ - $Revision: 1.38 $');
?> ?>