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

[task #216] Move lib in core directory

Browse Source
This commit is contained in:
Regis Houssin 2011-10-24 11:43:55 +02:00
parent 1c86e6b526
commit 82f5d8278e
113 changed files with 160 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/translation/autotranslator.php
View File

@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
// Include Dolibarr environment // Include Dolibarr environment
require_once($path.'../../htdocs/master.inc.php'); require_once($path.'../../htdocs/master.inc.php');
require_once($path.'../../htdocs/lib/files.lib.php'); require_once($path.'../../htdocs/core/lib/files.lib.php');
// After this $db is an opened handler to database. We close it at end of file. // After this $db is an opened handler to database. We close it at end of file.
// Load main language strings // Load main language strings

2
htdocs/adherents/cartes/carte.php
View File

@ -23,7 +23,7 @@
* \brief Page to output members business cards * \brief Page to output members business cards
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/cards/modules_cards.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/cards/modules_cards.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/labels/modules_labels.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/labels/modules_labels.php");

4
htdocs/adherents/document.php
View File

@ -26,7 +26,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
@ -67,7 +67,7 @@ $upload_dir = $conf->adherent->dir_output . "/" . get_exdir($id,2,0,1) . '/' . $
// Envoie fichier // Envoie fichier
if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (create_exdir($upload_dir) >= 0) if (create_exdir($upload_dir) >= 0)
{ {

2
htdocs/adherents/fiche.php
View File

@ -206,7 +206,7 @@ if ($_REQUEST["action"] == 'confirm_sendinfo' && $_REQUEST["confirm"] == 'yes')
if ($_REQUEST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer) if ($_REQUEST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$datenaiss=''; $datenaiss='';
if (isset($_POST["naissday"]) && $_POST["naissday"] if (isset($_POST["naissday"]) && $_POST["naissday"]

4
htdocs/admin/company.php
View File

@ -47,7 +47,7 @@ accessforbidden();
if ( (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["cancel"])) if ( (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["cancel"]))
|| (isset($_POST["action"]) && $_POST["action"] == 'updateedit') ) || (isset($_POST["action"]) && $_POST["action"] == 'updateedit') )
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$new_pays_id=$_POST["pays_id"]; $new_pays_id=$_POST["pays_id"];
$new_pays_code=getCountry($new_pays_id,2); $new_pays_code=getCountry($new_pays_id,2);
@ -201,7 +201,7 @@ if ($_GET["action"] == 'addthumb')
if ($_GET["action"] == 'removelogo') if ($_GET["action"] == 'removelogo')
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$logofile=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo; $logofile=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
dol_delete_file($logofile); dol_delete_file($logofile);

4
htdocs/admin/mails.php
View File

@ -23,7 +23,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("products"); $langs->load("products");
@ -74,7 +74,7 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["can
*/ */
if ($_POST['addfile'] || $_POST['addfilehtml']) if ($_POST['addfile'] || $_POST['addfilehtml'])
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory // Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;

2
htdocs/admin/security_other.php
View File

@ -41,7 +41,7 @@ $upload_dir=$conf->admin->dir_temp;
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$result=create_exdir($upload_dir); // Create dir if not exists $result=create_exdir($upload_dir); // Create dir if not exists
if ($result >= 0) if ($result >= 0)

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

@ -22,7 +22,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$what=$_REQUEST["what"]; $what=$_REQUEST["what"];

2
htdocs/admin/tools/purge.php
View File

@ -21,7 +21,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$langs->load("admin"); $langs->load("admin");

2
htdocs/admin/tools/update.php
View File

@ -22,7 +22,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
include_once $dolibarr_main_document_root."/lib/files.lib.php"; include_once $dolibarr_main_document_root."/core/lib/files.lib.php";
$langs->load("admin"); $langs->load("admin");
$langs->load("other"); $langs->load("other");

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

@ -1201,7 +1201,7 @@ class Categorie
*/ */
function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120) function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$dir = $sdir .'/'. get_exdir($this->id,2) . $this->id ."/"; $dir = $sdir .'/'. get_exdir($this->id,2) . $this->id ."/";
$dir .= "photos/"; $dir .= "photos/";
@ -1306,7 +1306,7 @@ class Categorie
*/ */
function delete_photo($file) function delete_photo($file)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette $dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette

2
htdocs/comm/action/class/actioncomm.class.php
View File

@ -695,7 +695,7 @@ class ActionComm extends CommonObject
if ($cachedelay) if ($cachedelay)
{ {
$nowgmt = dol_now(); $nowgmt = dol_now();
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay)) if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay))
{ {
dol_syslog(get_class($this)."::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled"); dol_syslog(get_class($this)."::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled");

4
htdocs/comm/action/document.php
View File

@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
@ -67,7 +67,7 @@ if (! $sortfield) $sortfield="name";
*/ */
if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Creation repertoire si n'existe pas // Creation repertoire si n'existe pas
$upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($objectid); $upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($objectid);

2
htdocs/comm/action/rapport/index.php
View File

@ -25,7 +25,7 @@
*/ */
require("../../../main.inc.php"); require("../../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/action/rapport.pdf.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/action/rapport.pdf.php");

2
htdocs/comm/mailing/cibles.php
View File

@ -25,7 +25,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");

6
htdocs/comm/mailing/fiche.php
View File

@ -23,8 +23,8 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php");
@ -450,7 +450,7 @@ if (! empty($_POST["removedfileid"]))
// Action update emailing // Action update emailing
if ($_POST["action"] == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"])) if ($_POST["action"] == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"]))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$mil = new Mailing($db); $mil = new Mailing($db);
$mil->fetch($_POST["id"]); $mil->fetch($_POST["id"]);

2
htdocs/comm/mailing/info.php
View File

@ -25,7 +25,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/class/mailing.class.php"); require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/class/mailing.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php");
$langs->load("mails"); $langs->load("mails");

4
htdocs/comm/propal.php
View File

@ -399,7 +399,7 @@ if (GETPOST('action') == 'setstatut' && $user->rights->propale->cloturer)
*/ */
if ($_POST['addfile']) if ($_POST['addfile'])
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory TODO Use a dedicated directory for temp mails files // Set tmp user directory TODO Use a dedicated directory for temp mails files
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;
@ -416,7 +416,7 @@ if ($_POST['addfile'])
*/ */
if (! empty($_POST['removedfile'])) if (! empty($_POST['removedfile']))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory // Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;

2
htdocs/comm/propal/apercu.php
View File

@ -27,7 +27,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
$langs->load('propal'); $langs->load('propal');

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

@ -1734,7 +1734,7 @@ class Propal extends CommonObject
function delete($user, $notrigger=0) function delete($user, $notrigger=0)
{ {
global $conf,$langs; global $conf,$langs;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$error=0; $error=0;

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

@ -27,7 +27,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$langs->load('compta'); $langs->load('compta');

2
htdocs/commande/apercu.php
View File

@ -26,7 +26,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");

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

@ -174,7 +174,7 @@ class Commande extends CommonObject
function valid($user) function valid($user)
{ {
global $conf,$langs; global $conf,$langs;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$error=0; $error=0;
@ -2290,7 +2290,7 @@ class Commande extends CommonObject
function delete($user) function delete($user)
{ {
global $conf, $langs; global $conf, $langs;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$err = 0; $err = 0;

2
htdocs/commande/document.php
View File

@ -26,7 +26,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php');
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php"); require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php");

6
htdocs/commande/fiche.php
View File

@ -892,7 +892,7 @@ if ($action == 'remove_file')
{ {
if ($object->fetch($id)) if ($object->fetch($id))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$upload_dir = $conf->commande->dir_output; $upload_dir = $conf->commande->dir_output;
$file = $upload_dir . '/' . $_GET['file']; $file = $upload_dir . '/' . $_GET['file'];
@ -906,7 +906,7 @@ if ($action == 'remove_file')
*/ */
if ($_POST['addfile']) if ($_POST['addfile'])
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory TODO Use a dedicated directory for temp mails files // Set tmp user directory TODO Use a dedicated directory for temp mails files
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;
@ -922,7 +922,7 @@ if ($_POST['addfile'])
*/ */
if (! empty($_POST['removedfile'])) if (! empty($_POST['removedfile']))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory // Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;

4
htdocs/compta/facture.php
View File

@ -1177,7 +1177,7 @@ if ($action == 'down' && $user->rights->facture->creer)
*/ */
if ($_POST['addfile']) if ($_POST['addfile'])
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory // Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;
@ -1193,7 +1193,7 @@ if ($_POST['addfile'])
*/ */
if (! empty($_POST['removedfile'])) if (! empty($_POST['removedfile']))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory // Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;

2
htdocs/compta/facture/apercu.php
View File

@ -28,7 +28,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
$langs->load("bills"); $langs->load("bills");

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

@ -1488,7 +1488,7 @@ class Facture extends CommonObject
function validate($user, $force_number='') function validate($user, $force_number='')
{ {
global $conf,$langs; global $conf,$langs;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$error=0; $error=0;

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

@ -28,7 +28,7 @@ require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
require_once(DOL_DOCUMENT_ROOT."/lib/invoice.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/invoice.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$langs->load('propal'); $langs->load('propal');

2
htdocs/compta/facture/impayees.php
View File

@ -28,7 +28,7 @@ require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');

2
htdocs/compta/paiement/rapport.php
View File

@ -24,7 +24,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/rapport/pdf_paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/rapport/pdf_paiement.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Security check // Security check
if (! $user->rights->facture->lire) if (! $user->rights->facture->lire)

2
htdocs/compta/prelevement/bon.php
View File

@ -25,7 +25,7 @@
require("../bank/pre.inc.php"); require("../bank/pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"; require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php";
$langs->load("bills"); $langs->load("bills");

2
htdocs/compta/prelevement/fiche.php
View File

@ -58,7 +58,7 @@ if ( $action == 'confirm_credite' && GETPOST("confirm") == 'yes')
if ($action == 'infotrans' && $user->rights->prelevement->bons->send) if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$bon = new BonPrelevement($db,""); $bon = new BonPrelevement($db,"");
$bon->fetch($id); $bon->fetch($id);

2
htdocs/contact/exportimport.php
View File

@ -24,7 +24,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php");
$langs->load("companies"); $langs->load("companies");

2
htdocs/contact/fiche.php
View File

@ -28,7 +28,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");

2
htdocs/contact/info.php
View File

@ -25,7 +25,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php");
$langs->load("companies"); $langs->load("companies");

2
htdocs/contact/ldap.php
View File

@ -24,7 +24,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php");

2
htdocs/contact/perso.php
View File

@ -24,7 +24,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("other"); $langs->load("other");

2
htdocs/contrat/contact.php
View File

@ -23,7 +23,7 @@
*/ */
require ("../main.inc.php"); require ("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php');
require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');

6
htdocs/contrat/document.php
View File

@ -26,9 +26,9 @@
*/ */
require ("../main.inc.php"); require ("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/contract.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/contract.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$langs->load("other"); $langs->load("other");
@ -69,7 +69,7 @@ $modulepart='contract';
*/ */
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (create_exdir($upload_dir) >= 0) if (create_exdir($upload_dir) >= 0)
{ {

2
htdocs/contrat/fiche.php
View File

@ -27,7 +27,7 @@
require ("../main.inc.php"); require ("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php');
require_once(DOL_DOCUMENT_ROOT."/includes/modules/contract/modules_contract.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/contract/modules_contract.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");

2
htdocs/contrat/info.php
View File

@ -23,7 +23,7 @@
require ("../main.inc.php"); require ("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php');
require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
$langs->load("contracts"); $langs->load("contracts");

2
htdocs/contrat/note.php
View File

@ -23,7 +23,7 @@
*/ */
require ("../main.inc.php"); require ("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php');
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
$socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:""; $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";

2
htdocs/core/ajaxfileupload.php
View File

@ -35,7 +35,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't nee
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
error_reporting(E_ALL | E_STRICT); error_reporting(E_ALL | E_STRICT);

2
htdocs/core/class/html.formfile.class.php
View File

@ -182,7 +182,7 @@ class FormFile
function showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hookmanager=false) function showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hookmanager=false)
{ {
// filedir = conf->...dir_ouput."/".get_exdir(id) // filedir = conf->...dir_ouput."/".get_exdir(id)
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
global $langs,$bc,$conf; global $langs,$bc,$conf;

2
htdocs/core/class/html.formmail.class.php
View File

@ -107,7 +107,7 @@ class FormMail
function clear_attached_files() function clear_attached_files()
{ {
global $conf,$user; global $conf,$user;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory // Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;

2
htdocs/core/class/notify.class.php
View File

@ -161,7 +161,7 @@ class Notify
if (dol_strlen($sendto)) if (dol_strlen($sendto))
{ {
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$application=($conf->global->MAIN_APPLICATION_TITLE?$conf->global->MAIN_APPLICATION_TITLE:'Dolibarr ERP/CRM'); $application=($conf->global->MAIN_APPLICATION_TITLE?$conf->global->MAIN_APPLICATION_TITLE:'Dolibarr ERP/CRM');
$subject = '['.$application.'] '.$langs->transnoentitiesnoconv("DolibarrNotification"); $subject = '['.$application.'] '.$langs->transnoentitiesnoconv("DolibarrNotification");

2
htdocs/core/class/rssparser.class.php
View File

@ -80,7 +80,7 @@ class RssParser
*/ */
public function parser($urlRSS, $maxNb=0, $cachedelay=60, $cachedir='') public function parser($urlRSS, $maxNb=0, $cachedelay=60, $cachedir='')
{ {
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$str=''; // This will contain content of feed $str=''; // This will contain content of feed

0
htdocs/lib/doxygen.php → htdocs/core/doxygen.php
View File

2
htdocs/lib/contact.lib.php → htdocs/core/lib/contact.lib.php
View File

@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/lib/contact.lib.php * \file htdocs/core/lib/contact.lib.php
* \brief Ensemble de fonctions de base pour les contacts * \brief Ensemble de fonctions de base pour les contacts
*/ */

2
htdocs/lib/contract.lib.php → htdocs/core/lib/contract.lib.php
View File

@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/lib/contract.lib.php * \file htdocs/core/lib/contract.lib.php
* \brief Ensemble de fonctions de base pour le module contrat * \brief Ensemble de fonctions de base pour le module contrat
*/ */

2
htdocs/lib/ecm.lib.php → htdocs/core/lib/ecm.lib.php
View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/lib/ecm.lib.php * \file htdocs/core/lib/ecm.lib.php
* \brief Ensemble de fonctions de base pour le module ecm * \brief Ensemble de fonctions de base pour le module ecm
* \ingroup ecm * \ingroup ecm
*/ */

2
htdocs/lib/emailing.lib.php → htdocs/core/lib/emailing.lib.php
View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/lib/emailing.lib.php * \file htdocs/core/lib/emailing.lib.php
* \brief Library file with function for emailing module * \brief Library file with function for emailing module
*/ */

2
htdocs/lib/fichinter.lib.php → htdocs/core/lib/fichinter.lib.php
View File

@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/lib/fichinter.lib.php * \file htdocs/core/lib/fichinter.lib.php
* \brief Ensemble de fonctions de base pour le module fichinter * \brief Ensemble de fonctions de base pour le module fichinter
* \ingroup fichinter * \ingroup fichinter
*/ */

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

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/lib/files.lib.php * \file htdocs/core/lib/files.lib.php
* \brief Library for file managing functions * \brief Library for file managing functions
*/ */
@ -724,7 +724,7 @@ function dol_delete_dir_recursive($dir,$count=0,$nophperrors=0)
function dol_delete_preview($object) function dol_delete_preview($object)
{ {
global $langs,$conf; global $langs,$conf;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if ($object->element == 'commande') $dir = $conf->commande->dir_output; if ($object->element == 'commande') $dir = $conf->commande->dir_output;
if (empty($dir)) return 'ErrorObjectNoSupportedByFunction'; if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';

2
htdocs/core/lib/functions2.lib.php
View File

@ -1059,7 +1059,7 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
// with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...). // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).
if (! empty($obj->description)) // List of directories to scan is defined if (! empty($obj->description)) // List of directories to scan is defined
{ {
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$const=$obj->description; $const=$obj->description;
$dirtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const)); $dirtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));

2
htdocs/document.php
View File

@ -47,7 +47,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
function llxHeader() { } function llxHeader() { }
require("./main.inc.php"); // Load $user and permissions require("./main.inc.php"); // Load $user and permissions
require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$encoding = ''; $encoding = '';
$action = GETPOST("action"); $action = GETPOST("action");

4
htdocs/ecm/class/ecmdirectory.class.php
View File

@ -322,7 +322,7 @@ class EcmDirectory // extends CommonObject
function delete($user) function delete($user)
{ {
global $conf, $langs; global $conf, $langs;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$relativepath=$this->getRelativePath(1); // Ex: dir1/dir2/dir3 $relativepath=$this->getRelativePath(1); // Ex: dir1/dir2/dir3
@ -643,7 +643,7 @@ class EcmDirectory // extends CommonObject
function refreshcachenboffile($all=0) function refreshcachenboffile($all=0)
{ {
global $conf; global $conf;
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$dir=$conf->ecm->dir_output.'/'.$this->getRelativePath(); $dir=$conf->ecm->dir_output.'/'.$this->getRelativePath();
$filelist=dol_dir_list($dir,'files',0,'','\.meta$'); $filelist=dol_dir_list($dir,'files',0,'','\.meta$');

4
htdocs/ecm/docfile.php
View File

@ -25,8 +25,8 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php");
// Load traductions files // Load traductions files
$langs->load("ecm"); $langs->load("ecm");

6
htdocs/ecm/docmine.php
View File

@ -26,8 +26,8 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php");
// Load traductions files // Load traductions files
@ -83,7 +83,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
// Upload file // Upload file
if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC)) if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (create_exdir($upload_dir) >= 0) if (create_exdir($upload_dir) >= 0)
{ {

4
htdocs/ecm/docother.php
View File

@ -11,7 +11,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Load traductions files // Load traductions files
$langs->load("ecm"); $langs->load("ecm");
@ -46,7 +46,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$section;
// Envoie fichier // Envoie fichier
if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (create_exdir($upload_dir) >= 0) if (create_exdir($upload_dir) >= 0)
{ {

4
htdocs/ecm/index.php
View File

@ -27,8 +27,8 @@ if (! defined('REQUIRE_JQUERY_LAYOUT')) define('REQUIRE_JQUERY_LAYOUT','1');
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php");
require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");

4
htdocs/ecm/search.php
View File

@ -25,8 +25,8 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php");
require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");

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

@ -421,7 +421,7 @@ class Expedition extends CommonObject
{ {
global $conf, $langs; global $conf, $langs;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
dol_syslog("Expedition::valid"); dol_syslog("Expedition::valid");
@ -770,7 +770,7 @@ class Expedition extends CommonObject
{ {
global $conf, $langs, $user; global $conf, $langs, $user;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$this->db->begin(); $this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";

4
htdocs/expedition/fiche.php
View File

@ -287,7 +287,7 @@ if ($action == 'builddoc') // En get ou en post
*/ */
if ($_POST['addfile']) if ($_POST['addfile'])
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory TODO Use a dedicated directory for temp mails files // Set tmp user directory TODO Use a dedicated directory for temp mails files
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;
@ -303,7 +303,7 @@ if ($_POST['addfile'])
*/ */
if (! empty($_POST['removedfile'])) if (! empty($_POST['removedfile']))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory // Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;

4
htdocs/fichinter/apercu.php
View File

@ -24,8 +24,8 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php');
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");

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

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

2
htdocs/fichinter/contact.php
View File

@ -25,7 +25,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
$langs->load("interventions"); $langs->load("interventions");

6
htdocs/fichinter/document.php
View File

@ -28,8 +28,8 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$langs->load("other"); $langs->load("other");
@ -69,7 +69,7 @@ $modulepart='fichinter';
*/ */
if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC)) if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (create_exdir($upload_dir) >= 0) if (create_exdir($upload_dir) >= 0)
{ {

6
htdocs/fichinter/fiche.php
View File

@ -28,7 +28,7 @@ require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
if ($conf->projet->enabled) if ($conf->projet->enabled)
{ {
@ -458,7 +458,7 @@ if ($action == 'down' && $user->rights->ficheinter->creer)
*/ */
if ($_POST['addfile']) if ($_POST['addfile'])
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory TODO Use a dedicated directory for temp mails files // Set tmp user directory TODO Use a dedicated directory for temp mails files
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;
@ -474,7 +474,7 @@ if ($_POST['addfile'])
*/ */
if (! empty($_POST['removedfile'])) if (! empty($_POST['removedfile']))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory // Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;

2
htdocs/fichinter/info.php
View File

@ -26,7 +26,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
$langs->load('companies'); $langs->load('companies');
$langs->load("interventions"); $langs->load("interventions");

2
htdocs/fichinter/note.php
View File

@ -24,7 +24,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
$langs->load('companies'); $langs->load('companies');
$langs->load("interventions"); $langs->load("interventions");

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

@ -272,7 +272,7 @@ class CommandeFournisseur extends Commande
function valid($user) function valid($user)
{ {
global $langs,$conf; global $langs,$conf;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$error=0; $error=0;

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

@ -26,7 +26,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php');
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"; require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php";
@ -74,7 +74,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))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($commande->ref); $upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($commande->ref);

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

@ -524,7 +524,7 @@ if ($action == 'builddoc') // En get ou en post
// Delete file in doc form // Delete file in doc form
if ($action=='remove_file') if ($action=='remove_file')
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if ($object->fetch($id)) if ($object->fetch($id))
{ {
@ -574,7 +574,7 @@ if ($action == 'create')
*/ */
if ($_POST['addfile']) if ($_POST['addfile'])
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory TODO Use a dedicated directory for temp mails files // Set tmp user directory TODO Use a dedicated directory for temp mails files
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;
@ -590,7 +590,7 @@ if ($_POST['addfile'])
*/ */
if (! empty($_POST['removedfile'])) if (! empty($_POST['removedfile']))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory // Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;

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

@ -28,7 +28,7 @@ require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php');
require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php');
require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php');
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$langs->load('bills'); $langs->load('bills');
@ -62,7 +62,7 @@ if (! $sortfield) $sortfield="name";
// Envoi fichier // Envoi fichier
if ($_POST['sendit'] && ! empty($conf->global->MAIN_UPLOAD_DOC)) if ($_POST['sendit'] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$facture = new FactureFournisseur($db); $facture = new FactureFournisseur($db);
if ($facture->fetch($facid)) if ($facture->fetch($facid))

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

@ -620,7 +620,7 @@ if ($action == 'reopen' && $user->rights->fournisseur->facture->creer)
*/ */
if ($_POST['addfile']) if ($_POST['addfile'])
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory TODO Use a dedicated directory for temp mails files // Set tmp user directory TODO Use a dedicated directory for temp mails files
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;
@ -636,7 +636,7 @@ if ($_POST['addfile'])
*/ */
if (! empty($_POST['removedfile'])) if (! empty($_POST['removedfile']))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory // Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;
@ -838,7 +838,7 @@ if ($action == 'builddoc')
// Delete file in doc form // Delete file in doc form
if ($action == 'remove_file') if ($action == 'remove_file')
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if ($object->fetch($id)) if ($object->fetch($id))
{ {

4
htdocs/ftp/index.php
View File

@ -25,7 +25,7 @@
require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php");
// Load traductions files // Load traductions files
@ -82,7 +82,7 @@ $conn_id=0; // FTP connection ID
// Envoie fichier // Envoie fichier
if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$result=$ecmdir->fetch($_REQUEST["section"]); $result=$ecmdir->fetch($_REQUEST["section"]);
if (! $result > 0) if (! $result > 0)

2
htdocs/imports/emptyexample.php
View File

@ -33,7 +33,7 @@ function llxHeader() { print '<html><title>Build an import example file</title><
function llxFooter() { print '</body></html>'; } function llxFooter() { print '</body></html>'; }
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/imports/class/import.class.php"); require_once(DOL_DOCUMENT_ROOT."/imports/class/import.class.php");
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/import/modules_import.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/import/modules_import.php');

4
htdocs/imports/import.php
View File

@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php");
require_once(DOL_DOCUMENT_ROOT."/imports/class/import.class.php"); require_once(DOL_DOCUMENT_ROOT."/imports/class/import.class.php");
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/import/modules_import.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/import/modules_import.php');
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/import.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/import.lib.php");
$langs->load("exports"); $langs->load("exports");
@ -191,7 +191,7 @@ if ($action == 'add_import_model')
if ($step == 3 && $datatoimport) if ($step == 3 && $datatoimport)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {

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

@ -203,7 +203,7 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0
$outputlangs->charset_output=$sav_charset_output; $outputlangs->charset_output=$sav_charset_output;
// we delete preview files // we delete preview files
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
dol_delete_preview($object); dol_delete_preview($object);
// Appel des triggers // Appel des triggers

2
htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
/** /**

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

@ -306,7 +306,7 @@ function facture_meta_create($db, $facid, $message="")
function facture_delete_preview($db, $facid) function facture_delete_preview($db, $facid)
{ {
global $langs,$conf; global $langs,$conf;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$fac = new Facture($db); $fac = new Facture($db);
$fac->fetch($facid); $fac->fetch($facid);

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

@ -206,7 +206,7 @@ function fichinter_create($db, $object, $modele='', $outputlangs='')
function fichinter_delete_preview($db, $fichinterid, $fichinterref='') function fichinter_delete_preview($db, $fichinterid, $fichinterref='')
{ {
global $langs,$conf; global $langs,$conf;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (!$fichinterref) if (!$fichinterref)
{ {

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

@ -197,7 +197,7 @@ function delivery_order_pdf_create($db, $object, $model='', $outputlangs='')
function delivery_order_delete_preview($db, $deliveryid) function delivery_order_delete_preview($db, $deliveryid)
{ {
global $langs,$conf; global $langs,$conf;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$delivery = new Livraison($db,"",$deliveryid); $delivery = new Livraison($db,"",$deliveryid);
$delivery->fetch($deliveryid); $delivery->fetch($deliveryid);

2
htdocs/includes/modules/mailings/peche.modules.php
View File

@ -104,7 +104,7 @@ class mailing_peche extends MailingTargets
{ {
global $conf,$langs,$_FILES; global $conf,$langs,$_FILES;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// For compatibility with Unix, MS-Dos or Macintosh // For compatibility with Unix, MS-Dos or Macintosh
ini_set('auto_detect_line_endings', true); ini_set('auto_detect_line_endings', true);

2
htdocs/includes/modules/modFacture.class.php
View File

@ -214,7 +214,7 @@ class modFacture extends DolibarrModules
// Remove permissions and default values // Remove permissions and default values
$this->remove($options); $this->remove($options);
require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$dirodt=DOL_DATA_ROOT.'/doctemplates/invoices'; $dirodt=DOL_DATA_ROOT.'/doctemplates/invoices';
create_exdir($dirodt); create_exdir($dirodt);
dol_copy(DOL_DOCUMENT_ROOT.'/install/doctemplates/invoices/template_invoice.odt',$dirodt.'/template_invoice.odt',0,0); dol_copy(DOL_DOCUMENT_ROOT.'/install/doctemplates/invoices/template_invoice.odt',$dirodt.'/template_invoice.odt',0,0);

2
htdocs/includes/modules/modSociete.class.php
View File

@ -305,7 +305,7 @@ class modSociete extends DolibarrModules
// We disable this to prevent pb of modules not correctly disabled // We disable this to prevent pb of modules not correctly disabled
//$this->remove($options); //$this->remove($options);
require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$dirodt=DOL_DATA_ROOT.'/doctemplates/thirdparties'; $dirodt=DOL_DATA_ROOT.'/doctemplates/thirdparties';
create_exdir($dirodt); create_exdir($dirodt);
dol_copy(DOL_DOCUMENT_ROOT.'/install/doctemplates/thirdparties/template_thirdparty.odt',$dirodt.'/template_thirdparty.odt',0,0); dol_copy(DOL_DOCUMENT_ROOT.'/install/doctemplates/thirdparties/template_thirdparty.odt',$dirodt.'/template_thirdparty.odt',0,0);

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

@ -205,7 +205,7 @@ function project_pdf_create($db, $object, $model,$outputlangs)
function project_delete_preview($db, $objectid) function project_delete_preview($db, $objectid)
{ {
global $langs,$conf; global $langs,$conf;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$project = new Project($db); $project = new Project($db);
$project->fetch($objectid); $project->fetch($objectid);

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

@ -248,7 +248,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
function propale_delete_preview($db, $propalid, $propalref='') function propale_delete_preview($db, $propalid, $propalref='')
{ {
global $langs,$conf; global $langs,$conf;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (!$propalref) if (!$propalref)
{ {

2
htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
View File

@ -26,7 +26,7 @@
require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
/** /**

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

@ -128,7 +128,7 @@ function supplier_invoice_pdf_create($db, $object, $model, $outputlangs)
function supplier_invoice_delete_preview($db, $objectid) function supplier_invoice_delete_preview($db, $objectid)
{ {
global $langs,$conf; global $langs,$conf;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$comfourn = new FactureFournisseur($db); $comfourn = new FactureFournisseur($db);
$comfourn->fetch($objectid); $comfourn->fetch($objectid);

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

@ -235,7 +235,7 @@ function supplier_order_pdf_create($db, $object, $model, $outputlangs, $hidedeta
function supplier_order_delete_preview($db, $comfournid, $comfournref='') function supplier_order_delete_preview($db, $comfournid, $comfournref='')
{ {
global $langs,$conf; global $langs,$conf;
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (!$comfournref) if (!$comfournref)
{ {

2
htdocs/install/inc.php
View File

@ -37,7 +37,7 @@ if (! defined('ADODB_PATH'))
require_once('../core/class/translate.class.php'); require_once('../core/class/translate.class.php');
require_once('../lib/functions.lib.php'); require_once('../lib/functions.lib.php');
require_once('../core/lib/admin.lib.php'); require_once('../core/lib/admin.lib.php');
require_once('../lib/files.lib.php'); require_once('../core/lib/files.lib.php');
require_once(ADODB_PATH.'adodb-time.inc.php'); require_once(ADODB_PATH.'adodb-time.inc.php');
error_reporting(E_ALL); // To have all errors without disabled E_STRICT error_reporting(E_ALL); // To have all errors without disabled E_STRICT

2
htdocs/install/upgrade2.php
View File

@ -36,7 +36,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 . '/fourn/class/fournisseur.commande.class.php');
require_once($dolibarr_main_document_root . '/lib/price.lib.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 . '/core/class/menubase.class.php');
require_once($dolibarr_main_document_root . '/lib/files.lib.php'); require_once($dolibarr_main_document_root . '/core/lib/files.lib.php');
$grant_query=''; $grant_query='';
$etape = 2; $etape = 2;

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

@ -58,7 +58,7 @@ function facturefourn_prepare_head($object)
$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id;
/*$filesdir = $conf->fournisseur->dir_output.'/facture/'.get_exdir($fac->id,2).$fac->id; /*$filesdir = $conf->fournisseur->dir_output.'/facture/'.get_exdir($fac->id,2).$fac->id;
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$listoffiles=dol_dir_list($filesdir,'files',1); $listoffiles=dol_dir_list($filesdir,'files',1);
$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
$head[$h][1] = $langs->trans('Documents'); $head[$h][1] = $langs->trans('Documents');
@ -112,7 +112,7 @@ function ordersupplier_prepare_head($object)
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id;
/*$filesdir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($commande->ref); /*$filesdir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($commande->ref);
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$listoffiles=dol_dir_list($filesdir,'files',1); $listoffiles=dol_dir_list($filesdir,'files',1);
$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
$head[$h][1] = $langs->trans('Documents'); $head[$h][1] = $langs->trans('Documents');

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

@ -2081,7 +2081,7 @@ function img_allow($allow,$alt='default')
*/ */
function img_mime($file,$alt='') function img_mime($file,$alt='')
{ {
require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$mimetype=dol_mimetype($file,'',1); $mimetype=dol_mimetype($file,'',1);
$mimeimg=dol_mimetype($file,'',2); $mimeimg=dol_mimetype($file,'',2);
@ -3812,7 +3812,7 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object='
{ {
global $conf,$user; global $conf,$user;
require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
// Check if there is external substitution to do asked by plugins // Check if there is external substitution to do asked by plugins
// We look files into the includes/modules/substitutions directory // We look files into the includes/modules/substitutions directory

2
htdocs/lib/invoice.lib.php
View File

@ -74,7 +74,7 @@ function facture_prepare_head($object)
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id;
/*$filesdir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($fac->ref); /*$filesdir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($fac->ref);
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$listoffiles=dol_dir_list($filesdir,'files',1); $listoffiles=dol_dir_list($filesdir,'files',1);
$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
$head[$h][1] = $langs->trans('Documents'); $head[$h][1] = $langs->trans('Documents');

2
htdocs/lib/order.lib.php
View File

@ -75,7 +75,7 @@ function commande_prepare_head($object)
$head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id;
/*$filesdir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($commande->ref); /*$filesdir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($commande->ref);
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$listoffiles=dol_dir_list($filesdir,'files',1); $listoffiles=dol_dir_list($filesdir,'files',1);
$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
$head[$h][1] = $langs->trans('Documents'); $head[$h][1] = $langs->trans('Documents');

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

@ -59,7 +59,7 @@ function project_prepare_head($object)
$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;
/*$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref); /*$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$listoffiles=dol_dir_list($filesdir,'files',1); $listoffiles=dol_dir_list($filesdir,'files',1);
$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
$head[$h][1] = $langs->trans('Documents'); $head[$h][1] = $langs->trans('Documents');
@ -127,7 +127,7 @@ function task_prepare_head($object)
$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id;
/*$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref); /*$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$listoffiles=dol_dir_list($filesdir,'files',1); $listoffiles=dol_dir_list($filesdir,'files',1);
$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
$head[$h][1] = $langs->trans('Documents'); $head[$h][1] = $langs->trans('Documents');

Some files were not shown because too many files have changed in this diff Show More