From ddad6700f8391e8f641aee4845d404ee4fc3d21e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Oct 2011 16:38:09 +0200 Subject: [PATCH 01/41] Fix: Better error management --- htdocs/fichinter/fiche.php | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 7c804b30c2d..62a31d2cfe6 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -249,7 +249,17 @@ if ($action == 'setdescription') // Add line if ($action == "addline" && $user->rights->ficheinter->creer) { - if ($_POST['np_desc'] && ($_POST['durationhour'] || $_POST['durationmin'])) + if (empty($_POST['np_desc'])) + { + $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Description")).'
'; + $error++; + } + if (empty($_POST['durationhour']) && empty($_POST['durationmin'])) + { + $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Duration")).'
'; + $error++; + } + if (! $error) { $object = new Fichinter($db); $ret=$object->fetch($_POST['fichinterid']); @@ -682,7 +692,7 @@ if ($action == 'create') print ''; print ''; - print ''; + print ''; print ''; @@ -730,7 +740,7 @@ if ($action == 'create') { print ''; print '
'.$langs->trans("Company").''.$societe->getNomUrl(1).'
'.$langs->trans("Thirdparty").''.$societe->getNomUrl(1).'
'; - print ''; print '
'.$langs->trans("Company").''; + print '
'.$langs->trans("Thirdparty").''; $html->select_societes('','socid','',1,1); print '
'; @@ -994,7 +1004,7 @@ elseif ($fichinterid) $db->free($resql); /* - * Ajouter une ligne + * Add line */ if ($object->statut == 0 && $user->rights->ficheinter->creer && $action <> 'editline') { @@ -1029,13 +1039,14 @@ elseif ($fichinterid) // Date intervention print ''; $timearray=dol_getdate(mktime()); - $timewithnohour=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']); + if (empty($_POST['diday'])) $timewithnohour=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']); + else $timewithnohour=dol_mktime($_POST['dihour'],$_POST['dimin'],$_POST['disec'],$_POST['dimonth'],$_POST['diday'],$_POST['diyear']); $html->select_date($timewithnohour,'di',1,1,0,"addinter"); print ''; // Duration print ''; - $html->select_duration('duration',3600); + $html->select_duration('duration',(empty($_POST["durationhour"]) && empty($_POST["durationmin"]))?3600:(60*60*$_POST["durationhour"]+60*$_POST["durationmin"])); print ''; print ''; From 43bd6e1ea823df9f7cb2847df5746786f0509e02 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 22 Oct 2011 15:55:08 +0200 Subject: [PATCH 02/41] Fix: Removed deprecated function --- htdocs/adherents/fiche.php | 4 ++-- htdocs/contact/fiche.php | 4 ++-- htdocs/core/class/html.formcompany.class.php | 20 ++++++-------------- htdocs/public/members/new.php | 2 +- htdocs/societe/soc.php | 2 +- 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index acf978600a5..c234fa4a284 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -696,7 +696,7 @@ if ($action == 'create') // Civility print ''.$langs->trans("UserTitle").''; - print $htmlcompany->select_civilite(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id,'civilite_id').''; + print $htmlcompany->select_civility(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id,'civilite_id').''; print ''; // Lastname @@ -923,7 +923,7 @@ if ($action == 'edit') // Civilite print ''.$langs->trans("UserTitle").''; - print $htmlcompany->select_civilite(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id)."\n"; + print $htmlcompany->select_civility(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id)."\n"; print ''; print ''; diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 745d0c3d6e7..9a44c276e58 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -403,7 +403,7 @@ else // Civility print ''.$langs->trans("UserTitle").''; - print $formcompany->select_civilite(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id); + print $formcompany->select_civility(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id); print ''; print ''.$langs->trans("PostOrFunction").'poste).'">'; @@ -582,7 +582,7 @@ else // Civility print ''.$langs->trans("UserTitle").''; - print $formcompany->select_civilite(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id); + print $formcompany->select_civility(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id); print ''; print ''.$langs->trans("PostOrFunction" ).'poste).'">'; diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php index 34fe0035a5a..0eaaa8b2222 100644 --- a/htdocs/core/class/html.formcompany.class.php +++ b/htdocs/core/class/html.formcompany.class.php @@ -338,19 +338,11 @@ class FormCompany } /** - * \brief Retourne la liste deroulante des civilite actives - * \param selected civilite pre-selectionnee - * \param htmlname Name of HTML select combo field - */ - function select_civilite($selected='',$htmlname='civilite_id') - { - print $this->select_civility($selected,$htmlname); - } - - /** - * \brief Retourne la liste deroulante des civilite actives - * \param selected civilite pre-selectionnee - * \param htmlname Name of HTML select combo field + * Return combo list with people title + * + * @param string $selected Title preselected + * @param string $htmlname Name of HTML select combo field + * @return void */ function select_civility($selected='',$htmlname='civilite_id') { @@ -362,7 +354,7 @@ class FormCompany $sql = "SELECT rowid, code, civilite, active FROM ".MAIN_DB_PREFIX."c_civilite"; $sql.= " WHERE active = 1"; - dol_syslog("Form::select_civilite sql=".$sql); + dol_syslog("Form::select_civility sql=".$sql); $resql=$this->db->query($sql); if ($resql) { diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 5575e87a1d1..dbbbd4f0ab6 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -398,7 +398,7 @@ else } // Civility print ''.$langs->trans("Civility").''; -print $formcompany->select_civilite(GETPOST('civilite_id'),'civilite_id').''."\n"; +print $formcompany->select_civility(GETPOST('civilite_id'),'civilite_id').''."\n"; // Lastname print ''.$langs->trans("Lastname").' *'."\n"; // Firstname diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 2a3f2eeb9de..cd1f6eb26e7 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -690,7 +690,7 @@ else print ''.$langs->trans('FirstName').''; print ' '; print ''.$langs->trans("UserTitle").''; - print $formcompany->select_civilite($contact->civilite_id).''; + print $formcompany->select_civility($contact->civilite_id).''; print ' '; } From 130a9f2e6efd4ea3b5e2b14e5d5c5bd70e18f8e0 Mon Sep 17 00:00:00 2001 From: Spangaro Alexandre Date: Sun, 23 Oct 2011 10:06:01 +0200 Subject: [PATCH 03/41] Add page "info" for trip --- htdocs/compta/deplacement/fiche.php | 5 ++ htdocs/compta/deplacement/info.php | 79 +++++++++++++++++++ htdocs/compta/deplacement/note.php | 5 ++ .../install/mysql/tables/llx_deplacement.sql | 1 + 4 files changed, 90 insertions(+) create mode 100644 htdocs/compta/deplacement/info.php diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index ce36b404709..f8bb30cff04 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -274,6 +274,11 @@ else $head[$h][1] = $langs->trans("Note"); $head[$h][2] = 'note'; $h++; + + $head[$h][0] = DOL_URL_ROOT."/compta/deplacement/info.php?id=$deplacement->id"; + $head[$h][1] = $langs->trans("Info"); + $head[$h][2] = 'info'; + $h++; dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip'); diff --git a/htdocs/compta/deplacement/info.php b/htdocs/compta/deplacement/info.php new file mode 100644 index 00000000000..60b5e199bd8 --- /dev/null +++ b/htdocs/compta/deplacement/info.php @@ -0,0 +1,79 @@ + + * Copyright (C) 2004-2005 Laurent Destailleur + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/compta/deplacement/info.php + * \ingroup facture + * \brief Page to show a trip information + */ + +require("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); + +$langs->load("trips"); + +/* + * View + */ +llxHeader(); + +if ($id) +{ + $deplacement = new Deplacement($db); + $deplacement->fetch($_GET["id"], $user); + $deplacement->info($_GET["id"]); + if ($deplacement > 0) + { + if ($mesg) print $mesg."
"; + + $h=0; + + $head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/fiche.php?id='.$_GET["id"]; + $head[$h][1] = $langs->trans("Card"); + $head[$h][2] = 'card'; + $h++; + + $head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/note.php?id='.$_GET["id"]; + $head[$h][1] = $langs->trans("Note"); + $head[$h][2] = 'note'; + $h++; + + $head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/info.php?id='.$_GET["id"]; + $head[$h][1] = $langs->trans("Info"); + $head[$h][2] = 'info'; + $h++; + + dol_fiche_head($head, 'info', $langs->trans("TripCard"), 0, 'trip'); + + print '
'; + dol_print_object_info($deplacement); + print '
'; + + print ''; + } + else + { + dol_print_error($db); + } +} + +$db->close(); + +llxFooter(); +?> diff --git a/htdocs/compta/deplacement/note.php b/htdocs/compta/deplacement/note.php index 2ef51313192..1aaf5005f5f 100644 --- a/htdocs/compta/deplacement/note.php +++ b/htdocs/compta/deplacement/note.php @@ -116,6 +116,11 @@ if ($id > 0 || ! empty($ref)) $head[$h][1] = $langs->trans("Note"); $head[$h][2] = 'note'; $h++; + + $head[$h][0] = DOL_URL_ROOT."/compta/deplacement/info.php?id=$deplacement->id"; + $head[$h][1] = $langs->trans("Info"); + $head[$h][2] = 'info'; + $h++; dol_fiche_head($head, 'note', $langs->trans("TripCard"), 0, 'trip'); diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index ee508bd3a1f..02560f47ab2 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -28,6 +28,7 @@ create table llx_deplacement dated datetime, fk_user integer NOT NULL, fk_user_author integer, + fk_user_modif integer, -- utilisateur qui a modifie l'info type varchar(12) NOT NULL, fk_statut integer DEFAULT 1 NOT NULL, km real, From 76aa6607b64d50889c77d1bbae88b5a9125e858c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 23 Oct 2011 13:02:54 +0200 Subject: [PATCH 04/41] Fix: Error report when no label provided --- htdocs/contact/fiche.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 9a44c276e58..f0b77eb66df 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -154,7 +154,7 @@ if (empty($reshook)) if (! $_POST["name"]) { $error++; $errors[]=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname").' / '.$langs->transnoentities("Label")); - $_GET["action"] = $_POST["action"] = 'create'; + $action = 'create'; } if ($_POST["name"]) @@ -163,7 +163,7 @@ if (empty($reshook)) if ($id <= 0) { $error++; $errors[]=($object->error?array($object->error):$object->errors); - $_GET["action"] = $_POST["action"] = 'create'; + $action = 'create'; } } From a7deb7c23adaaa3ddea2f89bb27570bfda0e9eb3 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 23 Oct 2011 14:55:37 +0200 Subject: [PATCH 05/41] Fix: uniformize code --- htdocs/compta/deplacement/fiche.php | 147 ++++++++---------- htdocs/compta/deplacement/index.php | 10 +- htdocs/compta/deplacement/info.php | 49 ++---- htdocs/compta/deplacement/list.php | 10 +- htdocs/compta/deplacement/note.php | 89 ++++------- .../install/mysql/migration/3.1.0-3.2.0.sql | 2 + .../install/mysql/tables/llx_deplacement.sql | 12 +- htdocs/lib/trip.lib.php | 61 ++++++++ 8 files changed, 195 insertions(+), 185 deletions(-) create mode 100644 htdocs/lib/trip.lib.php diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index f8bb30cff04..12cfd81ac65 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -1,7 +1,7 @@ - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2005-2011 Regis Houssin * * 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 @@ -23,6 +23,7 @@ */ require("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/trip.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); if ($conf->projet->enabled) @@ -35,21 +36,23 @@ $langs->load("trips"); // Security check -$id=isset($_GET["id"])?$_GET["id"]:$_POST["id"]; +$id = GETPOST('id'); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'deplacement', $id,''); +$action = GETPOST('action'); +$confirm = GETPOST('confirm'); + $mesg = ''; - +$object = new Deplacement($db); /* * Actions */ -if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->deplacement->supprimer) +if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer) { - $deplacement = new Deplacement($db); - $result=$deplacement->delete($_GET["id"]); + $result=$object->delete($id); if ($result >= 0) { Header("Location: index.php"); @@ -57,11 +60,11 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user- } else { - $mesg=$deplacement->error; + $mesg=$object->error; } } -if ($_POST["action"] == 'add' && $user->rights->deplacement->creer) +if ($action == 'add' && $user->rights->deplacement->creer) { if (! $_POST["cancel"]) { @@ -72,26 +75,25 @@ if ($_POST["action"] == 'add' && $user->rights->deplacement->creer) $_POST["reday"], $_POST["reyear"]); - $deplacement = new Deplacement($db); - $deplacement->date = $dated; - $deplacement->km = $_POST["km"]; - $deplacement->type = $_POST["type"]; - $deplacement->socid = $_POST["socid"]; - $deplacement->fk_user = $_POST["fk_user"]; - $deplacement->note = $_POST["note"]; - $deplacement->note_public = $_POST["note_public"]; + $object->date = $dated; + $object->km = $_POST["km"]; + $object->type = $_POST["type"]; + $object->socid = $_POST["socid"]; + $object->fk_user = $_POST["fk_user"]; + $object->note = $_POST["note"]; + $object->note_public = $_POST["note_public"]; - if (! $deplacement->date) + if (! $object->date) { $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")); $error++; } - if ($deplacement->type == '-1') // Otherwise it is TF_LUNCH,... + if ($object->type == '-1') // Otherwise it is TF_LUNCH,... { $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'
'; $error++; } - if (! ($deplacement->fk_user > 0)) + if (! ($object->fk_user > 0)) { $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Person")).'
'; $error++; @@ -99,22 +101,22 @@ if ($_POST["action"] == 'add' && $user->rights->deplacement->creer) if (! $error) { - $id = $deplacement->create($user); + $id = $object->create($user); if ($id > 0) { - Header("Location: fiche.php?id=".$id); + Header("Location: " . $_SERVER["PHP_SELF"] . "?id=".$id); exit; } else { - $mesg=$deplacement->error; - $_GET["action"]='create'; + $mesg=$object->error; + $action='create'; } } else { - $_GET["action"]='create'; + $action='create'; } } else @@ -124,45 +126,44 @@ if ($_POST["action"] == 'add' && $user->rights->deplacement->creer) } } -if ($_POST["action"] == 'update' && $user->rights->deplacement->creer) +if ($action == 'update' && $user->rights->deplacement->creer) { if (empty($_POST["cancel"])) { - $deplacement = new Deplacement($db); - $result = $deplacement->fetch($_POST["id"]); + $result = $object->fetch($id); - $deplacement->date = dol_mktime(12, 0 , 0, + $object->date = dol_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); - $deplacement->km = $_POST["km"]; - $deplacement->type = $_POST["type"]; - $deplacement->fk_user = $_POST["fk_user"]; - $deplacement->socid = $_POST["socid"]; - $result = $deplacement->update($user); + $object->km = $_POST["km"]; + $object->type = $_POST["type"]; + $object->fk_user = $_POST["fk_user"]; + $object->socid = $_POST["socid"]; + $result = $object->update($user); if ($result > 0) { - Header("Location: fiche.php?id=".$_POST["id"]); + Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); exit; } else { - $mesg=$deplacement->error; + $mesg=$object->error; } } else { - Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST["id"]); + Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); exit; } } // Set into a project -if ($_POST['action'] == 'classin') +if ($action == 'classin') { $trip = new Deplacement($db); - $trip->fetch($_GET['id']); + $trip->fetch($id); $result=$trip->setProject($_POST['projectid']); if ($result < 0) dol_print_error($db,$trip->error); } @@ -180,7 +181,7 @@ $html = new Form($db); /* * Action create */ -if ($_GET["action"] == 'create') +if ($action == 'create') { print_fiche_titre($langs->trans("NewTrip")); @@ -191,7 +192,7 @@ if ($_GET["action"] == 'create') $_POST["reday"], $_POST["reyear"]); - print "\n"; + print '' . "\n"; print ''; print ''; @@ -257,40 +258,24 @@ else { if ($id) { - $deplacement = new Deplacement($db); - $result = $deplacement->fetch($id); + $result = $object->fetch($id); if ($result > 0) { - if ($mesg) print $mesg."
"; + dol_htmloutput_mesg($mesg); - $h=0; - - $head[$h][0] = DOL_URL_ROOT."/compta/deplacement/fiche.php?id=$deplacement->id"; - $head[$h][1] = $langs->trans("Card"); - $head[$h][2] = 'card'; - $h++; - - $head[$h][0] = DOL_URL_ROOT."/compta/deplacement/note.php?id=$deplacement->id"; - $head[$h][1] = $langs->trans("Note"); - $head[$h][2] = 'note'; - $h++; - - $head[$h][0] = DOL_URL_ROOT."/compta/deplacement/info.php?id=$deplacement->id"; - $head[$h][1] = $langs->trans("Info"); - $head[$h][2] = 'info'; - $h++; + $head = trip_prepare_head($object); dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip'); if ($_GET["action"] == 'edit') { $soc = new Societe($db); - if ($deplacement->socid) + if ($object->socid) { - $soc->fetch($deplacement->socid); + $soc->fetch($object->socid); } - print "\n"; + print '' . "\n"; print ''; print ''; print ''; @@ -300,28 +285,28 @@ else // Ref print ""; print ''.$langs->trans("Ref").''; - print $deplacement->ref; + print $object->ref; print ''; // Type print ""; print ''.$langs->trans("Type").''; - print $html->select_type_fees($_POST["type"]?$_POST["type"]:$deplacement->type,'type',0); + print $html->select_type_fees($_POST["type"]?$_POST["type"]:$object->type,'type',0); print ''; // Who print ""; print ''.$langs->trans("Person").''; - print $html->select_users($_POST["fk_user"]?$_POST["fk_user"]:$deplacement->fk_user,'fk_user',0); + print $html->select_users($_POST["fk_user"]?$_POST["fk_user"]:$object->fk_user,'fk_user',0); print ''; // Date print ''.$langs->trans("Date").''; - print $html->select_date($deplacement->date,'','','','','update'); + print $html->select_date($object->date,'','','','','update'); print ''; // Km - print ''.$langs->trans("FeesKilometersOrAmout").''; + print ''.$langs->trans("FeesKilometersOrAmout").''; // Where print ""; @@ -344,40 +329,40 @@ else /* * Confirmation de la suppression du deplacement */ - if ($_GET["action"] == 'delete') + if ($action == 'delete') { $ret=$html->form_confirm("fiche.php?id=".$id,$langs->trans("DeleteTrip"),$langs->trans("ConfirmDeleteTrip"),"confirm_delete"); if ($ret == 'html') print '
'; } $soc = new Societe($db); - if ($deplacement->socid) $soc->fetch($deplacement->socid); + if ($object->socid) $soc->fetch($object->socid); print ''; // Ref print ""; print ''; // Type - print ''; + print ''; // Who print ''; // Date print ''; // Km/Price - print ''; + print ''; // Where print ''; @@ -397,7 +382,7 @@ else print ''; if ($_GET['action'] != 'classify') { - print ''; } @@ -405,18 +390,18 @@ else print ''; print ''; } // Statut - print ''; + print ''; print "
'.$langs->trans("Ref").''; - print $html->showrefnav($deplacement,'id','',1,'rowid','ref',''); + print $html->showrefnav($object,'id','',1,'rowid','ref',''); print '
'.$langs->trans("Type").''.$langs->trans($deplacement->type).'
'.$langs->trans("Type").''.$langs->trans($object->type).'
'.$langs->trans("Person").''; $userfee=new User($db); - $userfee->fetch($deplacement->fk_user); + $userfee->fetch($object->fk_user); print $userfee->getNomUrl(1); print '
'.$langs->trans("Date").''; - print dol_print_date($deplacement->date,'day'); + print dol_print_date($object->date,'day'); print '
'.$langs->trans("FeesKilometersOrAmout").''.$deplacement->km.'
'.$langs->trans("FeesKilometersOrAmout").''.$object->km.'
'.$langs->trans("CompanyVisited").'id.'">'; + print 'id.'">'; print img_edit($langs->trans('SetProject'),1); print ''; if ($_GET['action'] == 'classify') { - $html->form_project($_SERVER['PHP_SELF'].'?id='.$deplacement->id, $deplacement->socid, $deplacement->fk_project,'projectid'); + $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'projectid'); } else { - $html->form_project($_SERVER['PHP_SELF'].'?id='.$deplacement->id, $deplacement->socid, $deplacement->fk_project,'none'); + $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'none'); } print '
'.$langs->trans("Status").''.$deplacement->getLibStatut(4).'
'.$langs->trans("Status").''.$object->getLibStatut(4).'
"; @@ -439,7 +424,7 @@ else print '
'; -if ($_GET["action"] != 'create' && $_GET["action"] != 'edit') +if ($action != 'create' && $action != 'edit') { if ($user->rights->deplacement->creer) { diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index 46220223823..995ae8966c4 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -1,8 +1,8 @@ - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2009 Regis Houssin +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2004 Eric Seigne + * Copyright (C) 2005-2011 Regis Houssin * * 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 @@ -32,7 +32,7 @@ $langs->load("users"); $langs->load("trips"); // Security check -$socid = $_GET["socid"]?$_GET["socid"]:''; +$socid = GETPOST('socid'); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'deplacement','',''); diff --git a/htdocs/compta/deplacement/info.php b/htdocs/compta/deplacement/info.php index 60b5e199bd8..788759148e9 100644 --- a/htdocs/compta/deplacement/info.php +++ b/htdocs/compta/deplacement/info.php @@ -17,60 +17,45 @@ */ /** - * \file htdocs/compta/deplacement/info.php - * \ingroup facture - * \brief Page to show a trip information + * \file htdocs/compta/deplacement/info.php + * \ingroup trip + * \brief Page to show a trip information */ require("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/trip.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); $langs->load("trips"); +// Security check +$id = GETPOST('id'); +if ($user->societe_id) $socid=$user->societe_id; +$result = restrictedArea($user, 'deplacement', $id, ''); + + /* * View */ + llxHeader(); if ($id) { - $deplacement = new Deplacement($db); - $deplacement->fetch($_GET["id"], $user); - $deplacement->info($_GET["id"]); - if ($deplacement > 0) - { - if ($mesg) print $mesg."
"; - - $h=0; - - $head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/fiche.php?id='.$_GET["id"]; - $head[$h][1] = $langs->trans("Card"); - $head[$h][2] = 'card'; - $h++; - - $head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/note.php?id='.$_GET["id"]; - $head[$h][1] = $langs->trans("Note"); - $head[$h][2] = 'note'; - $h++; + $object = new Deplacement($db); + $object->fetch($id); + $object->info($id); - $head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/info.php?id='.$_GET["id"]; - $head[$h][1] = $langs->trans("Info"); - $head[$h][2] = 'info'; - $h++; + $head = trip_prepare_head($object); - dol_fiche_head($head, 'info', $langs->trans("TripCard"), 0, 'trip'); + dol_fiche_head($head, 'info', $langs->trans("TripCard"), 0, 'trip'); print '
'; - dol_print_object_info($deplacement); + dol_print_object_info($object); print '
'; print '
'; - } - else - { - dol_print_error($db); - } } $db->close(); diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index 8ac93658241..5a74877adc3 100755 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -1,8 +1,8 @@ - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2009 Regis Houssin +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2004 Eric Seigne + * Copyright (C) 2005-2011 Regis Houssin * * 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 @@ -32,7 +32,7 @@ $langs->load("users"); $langs->load("trips"); // Security check -$socid = $_GET["socid"]?$_GET["socid"]:''; +$socid = GETPOST('socid'); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'deplacement','',''); diff --git a/htdocs/compta/deplacement/note.php b/htdocs/compta/deplacement/note.php index 1aaf5005f5f..cb0ef37b83d 100644 --- a/htdocs/compta/deplacement/note.php +++ b/htdocs/compta/deplacement/note.php @@ -23,42 +23,38 @@ */ require("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/trip.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); -$socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:""; - -if (!$user->rights->deplacement->lire) - accessforbidden(); - $langs->load("companies"); -$langs->load("bills"); $langs->load("trips"); -// Securiy check -if ($user->societe_id > 0) -{ - unset($_GET["action"]); - $socid = $user->societe_id; -} +$id = GETPOST('id'); +$ref = GETPOST('ref'); +$action = GETPOST('action'); +$confirm = GETPOST('confirm'); +// Security check +if ($user->societe_id) $socid=$user->societe_id; +$result = restrictedArea($user, 'deplacement', $id, ''); -$trip = new Deplacement($db); +$object = new Deplacement($db); /******************************************************************************/ /* Actions */ /******************************************************************************/ -if ($_POST["action"] == 'update_public' && $user->rights->deplacement->creer) +if ($action == 'update_public' && $user->rights->deplacement->creer) { $db->begin(); - $trip->fetch($_GET["id"]); + $object->fetch($id); - $res=$trip->update_note_public($_POST["note_public"],$user); + $res=$object->update_note_public($_POST["note_public"]); if ($res < 0) { - $mesg='
'.$fac->error.'
'; + $mesg='
'.$object->error.'
'; $db->rollback(); } else @@ -67,16 +63,16 @@ if ($_POST["action"] == 'update_public' && $user->rights->deplacement->creer) } } -if ($_POST["action"] == 'update' && $user->rights->deplacement->creer) +if ($action == 'update' && $user->rights->deplacement->creer) { $db->begin(); - $trip->fetch($_GET["id"]); + $object->fetch($id); - $res=$trip->update_note($_POST["note"],$user); + $res=$object->update_note($_POST["note"]); if ($res < 0) { - $mesg='
'.$fac->error.'
'; + $mesg='
'.$object->error.'
'; $db->rollback(); } else @@ -95,53 +91,34 @@ llxHeader(); $html = new Form($db); -$id = $_GET['id']; -$ref= $_GET['ref']; if ($id > 0 || ! empty($ref)) { - $trip = new Deplacement($db); - $trip->fetch($id,$ref); + $object->fetch($id, $ref); $soc = new Societe($db); - $soc->fetch($trip->socid); + $soc->fetch($object->socid); - $h=0; - - $head[$h][0] = DOL_URL_ROOT."/compta/deplacement/fiche.php?id=$trip->id"; - $head[$h][1] = $langs->trans("Card"); - $head[$h][2] = 'card'; - $h++; - - $head[$h][0] = DOL_URL_ROOT."/compta/deplacement/note.php?id=$trip->id"; - $head[$h][1] = $langs->trans("Note"); - $head[$h][2] = 'note'; - $h++; - - $head[$h][0] = DOL_URL_ROOT."/compta/deplacement/info.php?id=$deplacement->id"; - $head[$h][1] = $langs->trans("Info"); - $head[$h][2] = 'info'; - $h++; + $head = trip_prepare_head($object); dol_fiche_head($head, 'note', $langs->trans("TripCard"), 0, 'trip'); - print ''; // Ref print ''; print ''; // Type - print ''; + print ''; // Who print ""; print ''; @@ -153,18 +130,18 @@ if ($id > 0 || ! empty($ref)) // Note publique print ''; print '"; @@ -173,18 +150,18 @@ if ($id > 0 || ! empty($ref)) { print ''; print '"; } @@ -198,9 +175,9 @@ if ($id > 0 || ! empty($ref)) print ''; print '
'; - if ($user->rights->deplacement->creer && $_GET["action"] <> 'edit') + if ($action <> 'edit' && $user->rights->deplacement->creer) { - print "id&action=edit\">".$langs->trans('Modify').""; + print '' . $langs->trans('Modify') . ''; } print "
"; diff --git a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql index 60bf0d26d74..db1a3928437 100755 --- a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql +++ b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql @@ -67,3 +67,5 @@ ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseu DROP TABLE IF EXISTS llx_pos_tmp; +ALTER TABLE llx_deplacement ADD COLUMN fk_user_modif integer AFTER fk_user_author; + diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index 02560f47ab2..46f240e18d5 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -1,7 +1,7 @@ -- ============================================================================ --- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2009 Regis Houssin --- Copyright (C) 2010 Laurent Destailleur +-- Copyright (C) 2003 Rodolphe Quiedeville +-- Copyright (C) 2009-2011 Regis Houssin +-- Copyright (C) 2010 Laurent Destailleur -- -- 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 @@ -21,14 +21,14 @@ create table llx_deplacement ( rowid integer AUTO_INCREMENT PRIMARY KEY, - ref varchar(30) DEFAULT NULL, -- Ref donation (TODO change to NOT NULL) - entity integer DEFAULT 1 NOT NULL, -- multi company id + ref varchar(30) DEFAULT NULL, -- Ref donation (TODO change to NOT NULL) + entity integer DEFAULT 1 NOT NULL, -- multi company id datec datetime NOT NULL, tms timestamp, dated datetime, fk_user integer NOT NULL, fk_user_author integer, - fk_user_modif integer, -- utilisateur qui a modifie l'info + fk_user_modif integer, -- utilisateur qui a modifie l'info type varchar(12) NOT NULL, fk_statut integer DEFAULT 1 NOT NULL, km real, diff --git a/htdocs/lib/trip.lib.php b/htdocs/lib/trip.lib.php new file mode 100644 index 00000000000..726f1575b8e --- /dev/null +++ b/htdocs/lib/trip.lib.php @@ -0,0 +1,61 @@ + + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * or see http://www.gnu.org/ + */ + +/** + * \file htdocs/lib/trip.lib.php + * \brief Ensemble de fonctions de base pour les deplacements + */ + +/** + * Enter description here... + * + * @param $object + * @return array + */ +function trip_prepare_head($object) +{ + global $langs, $conf; + + $h = 0; + $head = array(); + + $head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/fiche.php?id=' . $object->id; + $head[$h][1] = $langs->trans("Card"); + $head[$h][2] = 'card'; + $h++; + + $head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/note.php?id=' . $object->id; + $head[$h][1] = $langs->trans("Note"); + $head[$h][2] = 'note'; + $h++; + + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab + complete_head_from_modules($conf,$langs,$object,$head,$h,'trip'); + + $head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/info.php?id=' . $object->id; + $head[$h][1] = $langs->trans("Info"); + $head[$h][2] = 'info'; + $h++; + + return $head; +} + +?> \ No newline at end of file From a308a666e40ba2f891c5cb9204fc69b41f20f3df Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 23 Oct 2011 18:36:47 +0200 Subject: [PATCH 06/41] Added temporarily before to find another solution --- htdocs/core/class/commonobject.class.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index e3167957336..eef6a4aadde 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1345,11 +1345,14 @@ abstract class CommonObject if ($objecttype == 'delivery') { $classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon'; } if ($objecttype == 'invoice_supplier') { $classpath = 'fourn/class'; } if ($objecttype == 'order_supplier') { $classpath = 'fourn/class'; } - if ($objecttype == 'fichinter') { $classpath = 'fichinter/class'; $subelement ='fichinter'; $module ='ficheinter'; } + if ($objecttype == 'fichinter') { $classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter'; } + + // TODO ajout temporaire - MAXIME MANGIN + if ($objecttype == 'contratabonnement') { $classpath = 'contrat/class'; $subelement = 'contrat'; $module = 'contratabonnement'; } $classfile = strtolower($subelement); $classname = ucfirst($subelement); - if ($objecttype == 'invoice_supplier') { $classfile = 'fournisseur.facture'; $classname='FactureFournisseur'; } - if ($objecttype == 'order_supplier') { $classfile = 'fournisseur.commande'; $classname='CommandeFournisseur'; } + if ($objecttype == 'invoice_supplier') { $classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur'; } + if ($objecttype == 'order_supplier') { $classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur'; } if ($conf->$module->enabled && $element != $this->element) { From c7804b98fd54a039c0844c60d5fec7720d2ef922 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 23 Oct 2011 20:02:15 +0200 Subject: [PATCH 07/41] Fix: Error when creating a group using posix class --- .../interface_modLdap_Ldapsynchro.class.php | 6 ++++- htdocs/lib/ldap.class.php | 27 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php b/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php index d1bd3e3fffc..713316051f1 100644 --- a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php +++ b/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php @@ -217,7 +217,11 @@ class InterfaceLdapsynchro $info=$object->_load_ldap_info(); $dn=$object->_load_ldap_dn($info); - + + // Get a gid number for objectclass PosixGroup + if(in_array('posixGroup',$info['objectclass'])) + $info['gidNumber'] = $ldap->getNextGroupGid(); + $result=$ldap->add($dn,$info,$user); if ($result < 0) { diff --git a/htdocs/lib/ldap.class.php b/htdocs/lib/ldap.class.php index 2175a2c3e55..122c3faa1dd 100644 --- a/htdocs/lib/ldap.class.php +++ b/htdocs/lib/ldap.class.php @@ -1316,6 +1316,33 @@ class Ldap if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') $str=utf8_encode($str); return $str; } + + + /** + * \brief Return available value of group GID + * \param + * \return int gid number + */ + function getNextGroupGid() { + global $conf; + $search='('.$conf->global->LDAP_KEY_GROUPS.'=*)'; + $result = $this->search($this->groups,$search); + if($result) { + $c = $result['count']; + $gids = array(); + for($i=0;$i<$c;$i++) + { + $gids[] = $result[$i]['gidnumber'][0]; + } + rsort($gids); + + + return $gids[0]+1; + } + + return 0; + + } } From dbd4bdfd78d40c30cafc800053b39568b1de5f67 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 23 Oct 2011 22:10:30 +0200 Subject: [PATCH 08/41] Removed a TODO --- htdocs/core/class/commonobject.class.php | 46 ++++++++++++++++-------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index eef6a4aadde..1b20860c6c8 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1083,10 +1083,10 @@ abstract class CommonObject } /** - * Update public note of element + * Update public note of element * - * @param string $note_public New value for note - * @return int <0 if KO, >0 if OK + * @param string $note_public New value for note + * @return int <0 if KO, >0 if OK */ function update_note_public($note_public) { @@ -1116,9 +1116,9 @@ abstract class CommonObject /** * Update total_ht, total_ttc and total_vat for an object (sum of lines) * - * @param exclspec Exclude special product (product_type=9) - * @param roundingadjust -1=Use default method (MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND or 0), 0=Use total of rounding, 1=Use rounding of total - * @return int <0 if KO, >0 if OK + * @param int $exclspec Exclude special product (product_type=9) + * @param int $roundingadjust -1=Use default method (MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND or 0), 0=Use total of rounding, 1=Use rounding of total + * @return int <0 if KO, >0 if OK */ function update_price($exclspec=0,$roundingadjust=-1) { @@ -1129,7 +1129,7 @@ abstract class CommonObject $err=0; - // List lines to sum + // Define constants to find lines to sum $fieldtva='total_tva'; $fieldlocaltax1='total_localtax1'; $fieldlocaltax2='total_localtax2'; @@ -1150,6 +1150,8 @@ abstract class CommonObject $this->total_localtax1 = 0; $this->total_localtax2 = 0; $this->total_ttc = 0; + $vatrates = array(); + $vatrates_alllines = array(); $num = $this->db->num_rows($resql); $i = 0; @@ -1163,9 +1165,25 @@ abstract class CommonObject $this->total_localtax2 += $obj->total_localtax2; $this->total_ttc += $obj->total_ttc; - // TODO Also fill array by vat rate - $varates[$this->vatrate][]=array('total_ht'=>$obj->total_ht,'total_tva'=>$obj->total_tva,'total_ttc'=>$obj->total_ttc, - 'total_localtax1'=>$obj->total_localtax1,'total_localtax2'=>$obj->total_localtax2); + // Define vatrates with totals for each line and for all lines + $vatrates[$this->vatrate][]=array( + 'total_ht' =>$obj->total_ht, + 'total_tva' =>$obj->total_tva, + 'total_ttc' =>$obj->total_ttc, + 'total_localtax1'=>$obj->total_localtax1, + 'total_localtax2'=>$obj->total_localtax2 + ); + if (! isset($vatrates_alllines[$this->vatrate]['total_ht'])) $vatrates_alllines[$this->vatrate]['total_ht']=0; + if (! isset($vatrates_alllines[$this->vatrate]['total_tva'])) $vatrates_alllines[$this->vatrate]['total_tva']=0; + if (! isset($vatrates_alllines[$this->vatrate]['total_localtax1'])) $vatrates_alllines[$this->vatrate]['total_localtax1']=0; + if (! isset($vatrates_alllines[$this->vatrate]['total_localtax2'])) $vatrates_alllines[$this->vatrate]['total_localtax2']=0; + if (! isset($vatrates_alllines[$this->vatrate]['total_ttc'])) $vatrates_alllines[$this->vatrate]['total_ttc']=0; + $vatrates_alllines[$this->vatrate]['total_ht'] +=$obj->total_ht; + $vatrates_alllines[$this->vatrate]['total_tva'] +=$obj->total_tva; + $vatrates_alllines[$this->vatrate]['total_localtax1']+=$obj->total_localtax1; + $vatrates_alllines[$this->vatrate]['total_localtax2']+=$obj->total_localtax2; + $vatrates_alllines[$this->vatrate]['total_ttc'] +=$obj->total_ttc; + $i++; } @@ -1186,7 +1204,7 @@ abstract class CommonObject } } - // Now update field total_ht, total_ttc and tva + // Now update global field total_ht, total_ttc and tva $fieldht='total_ht'; $fieldtva='tva'; $fieldlocaltax1='localtax1'; @@ -1227,9 +1245,9 @@ abstract class CommonObject } /** - * Add objects linked in llx_element_element. + * Add objects linked in llx_element_element. * - * @return int <=0 if KO, >0 if OK + * @return int <=0 if KO, >0 if OK */ function add_object_linked() { @@ -1346,7 +1364,7 @@ abstract class CommonObject if ($objecttype == 'invoice_supplier') { $classpath = 'fourn/class'; } if ($objecttype == 'order_supplier') { $classpath = 'fourn/class'; } if ($objecttype == 'fichinter') { $classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter'; } - + // TODO ajout temporaire - MAXIME MANGIN if ($objecttype == 'contratabonnement') { $classpath = 'contrat/class'; $subelement = 'contrat'; $module = 'contratabonnement'; } From 45a7ec5d818edff1b9b0a10353ecbff5bb0a76e9 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Oct 2011 08:44:34 +0200 Subject: [PATCH 09/41] Fix: uniform code --- htdocs/compta/deplacement/fiche.php | 36 +++++++++++------------------ 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index 12cfd81ac65..cc6f20e5454 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -70,12 +70,7 @@ if ($action == 'add' && $user->rights->deplacement->creer) { $error=0; - $dated=dol_mktime(12, 0, 0, - $_POST["remonth"], - $_POST["reday"], - $_POST["reyear"]); - - $object->date = $dated; + $object->date = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); $object->km = $_POST["km"]; $object->type = $_POST["type"]; $object->socid = $_POST["socid"]; @@ -105,7 +100,7 @@ if ($action == 'add' && $user->rights->deplacement->creer) if ($id > 0) { - Header("Location: " . $_SERVER["PHP_SELF"] . "?id=".$id); + Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); exit; } else @@ -132,14 +127,12 @@ if ($action == 'update' && $user->rights->deplacement->creer) { $result = $object->fetch($id); - $object->date = dol_mktime(12, 0 , 0, - $_POST["remonth"], - $_POST["reday"], - $_POST["reyear"]); - $object->km = $_POST["km"]; - $object->type = $_POST["type"]; - $object->fk_user = $_POST["fk_user"]; - $object->socid = $_POST["socid"]; + $object->date = dol_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + $object->km = $_POST["km"]; + $object->type = $_POST["type"]; + $object->fk_user = $_POST["fk_user"]; + $object->socid = $_POST["socid"]; + $result = $object->update($user); if ($result > 0) @@ -187,10 +180,7 @@ if ($action == 'create') dol_htmloutput_errors($mesg); - $datec = dol_mktime(12, 0, 0, - $_POST["remonth"], - $_POST["reday"], - $_POST["reyear"]); + $datec = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); print '
' . "\n"; print ''; @@ -200,12 +190,12 @@ if ($action == 'create') print ""; print ''; print ""; print ''; print ""; @@ -214,12 +204,12 @@ if ($action == 'create') print ''; // Km - print ''; + print ''; // Company print ""; print ''; // Public note From 2b8332eb2d9d21a131f38571c4dd7853afc2e1d2 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Oct 2011 08:53:26 +0200 Subject: [PATCH 10/41] Move ldap.class.php to core/class --- htdocs/adherents/ldap.php | 2 +- htdocs/admin/ldap.php | 2 +- htdocs/admin/ldap_contacts.php | 2 +- htdocs/admin/ldap_groups.php | 2 +- htdocs/admin/ldap_members.php | 2 +- htdocs/admin/ldap_users.php | 2 +- htdocs/contact/ldap.php | 2 +- htdocs/{lib => core/class}/ldap.class.php | 2 +- htdocs/includes/login/functions_ldap.php | 2 +- .../includes/triggers/interface_modLdap_Ldapsynchro.class.php | 2 +- htdocs/user/class/usergroup.class.php | 2 +- htdocs/user/fiche.php | 2 +- htdocs/user/group/ldap.php | 2 +- htdocs/user/ldap.php | 2 +- htdocs/user/passwordforgotten.php | 2 +- scripts/company/sync_contacts_dolibarr2ldap.php | 2 +- scripts/members/sync_members_dolibarr2ldap.php | 2 +- scripts/members/sync_members_ldap2dolibarr.php | 2 +- scripts/user/sync_groups_dolibarr2ldap.php | 2 +- scripts/user/sync_users_dolibarr2ldap.php | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) rename htdocs/{lib => core/class}/ldap.class.php (99%) diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php index 5bfcf87acdf..3b8282c08e5 100644 --- a/htdocs/adherents/ldap.php +++ b/htdocs/adherents/ldap.php @@ -24,8 +24,8 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index a700b45cd91..0f2db88c512 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -28,7 +28,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); $langs->load("admin"); diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index a618a34562c..d4809e66452 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -28,7 +28,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index 52819bdc855..64f6635dbb7 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -30,7 +30,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); $langs->load("admin"); diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index da40f8611ad..ebc3fe9b653 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -30,7 +30,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.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."/lib/ldap.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); $langs->load("admin"); diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index 162391dd6cb..e6521f5399c 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -30,7 +30,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); $langs->load("admin"); diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php index 82f48c2d381..9ed2575ab86 100644 --- a/htdocs/contact/ldap.php +++ b/htdocs/contact/ldap.php @@ -25,7 +25,7 @@ require("../main.inc.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."/lib/ldap.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); $langs->load("companies"); diff --git a/htdocs/lib/ldap.class.php b/htdocs/core/class/ldap.class.php similarity index 99% rename from htdocs/lib/ldap.class.php rename to htdocs/core/class/ldap.class.php index 122c3faa1dd..29f1f1172f7 100644 --- a/htdocs/lib/ldap.class.php +++ b/htdocs/core/class/ldap.class.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/lib/ldap.class.php + * \file htdocs/core/class/ldap.class.php * \brief File of class to manage LDAP features */ diff --git a/htdocs/includes/login/functions_ldap.php b/htdocs/includes/login/functions_ldap.php index dd3ddb9e340..c817fd47980 100644 --- a/htdocs/includes/login/functions_ldap.php +++ b/htdocs/includes/login/functions_ldap.php @@ -71,7 +71,7 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) if ($ldapdebug) print "DEBUG: Logging LDAP steps
\n"; - require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); $ldap=new Ldap(); $ldap->server=array($ldaphost); $ldap->serverPort=$ldapport; diff --git a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php b/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php index 713316051f1..3c878206947 100644 --- a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php +++ b/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php @@ -20,7 +20,7 @@ * \ingroup core * \brief Fichier de gestion des triggers LDAP */ -require_once (DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); +require_once (DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); /** diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index fcc6b9c667b..0bf7953545e 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -24,7 +24,7 @@ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); -if ($conf->ldap->enabled) require_once (DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); +if ($conf->ldap->enabled) require_once (DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); /** diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 3d908e06df1..26c66c27972 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); -if ($conf->ldap->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); +if ($conf->ldap->enabled) require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); if (! empty($conf->multicompany->enabled)) dol_include_once("/multicompany/class/actions_multicompany.class.php"); diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index 13aefda7094..03a21c341b5 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); $langs->load("companies"); diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 248885718f8..45e15124204 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -24,7 +24,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); $langs->load("users"); diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index e4fe95fccec..b7b1737a085 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -25,8 +25,8 @@ define("NOLOGIN",1); // This means this output page does not require to be logge require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); +if ($conf->ldap->enabled) require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); $langs->load("other"); $langs->load("users"); diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php index 8b11042952c..e80443430b1 100644 --- a/scripts/company/sync_contacts_dolibarr2ldap.php +++ b/scripts/company/sync_contacts_dolibarr2ldap.php @@ -46,7 +46,7 @@ $version='1.25'; require_once($path."../../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); $error=0; diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php index 4ee247faf0e..7fdf7831d59 100644 --- a/scripts/members/sync_members_dolibarr2ldap.php +++ b/scripts/members/sync_members_dolibarr2ldap.php @@ -41,7 +41,7 @@ $path=str_replace($script_file,'',$_SERVER["PHP_SELF"]); $error=0; require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php index cb63a9455c7..1a66df276ab 100644 --- a/scripts/members/sync_members_ldap2dolibarr.php +++ b/scripts/members/sync_members_ldap2dolibarr.php @@ -43,7 +43,7 @@ $forcecommit=0; require_once($path."../../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php index bf911b2b927..8eaa5051894 100644 --- a/scripts/user/sync_groups_dolibarr2ldap.php +++ b/scripts/user/sync_groups_dolibarr2ldap.php @@ -44,7 +44,7 @@ $now=$argv[1]; $version='1.10'; require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); $error=0; diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php index 592483b36fd..044b3f133ac 100644 --- a/scripts/user/sync_users_dolibarr2ldap.php +++ b/scripts/user/sync_users_dolibarr2ldap.php @@ -44,7 +44,7 @@ $now=$argv[1]; $version='1.13'; require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); $error=0; From 65b986ec0016bdb25059eb0c1288938bf2ad370d Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Oct 2011 08:59:14 +0200 Subject: [PATCH 11/41] Fix: avoid warning --- htdocs/core/class/ldap.class.php | 42 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php index 29f1f1172f7..a8cf6927cef 100644 --- a/htdocs/core/class/ldap.class.php +++ b/htdocs/core/class/ldap.class.php @@ -1,8 +1,8 @@ - * Copyright (C) 2004 Benoit Mortier - * Copyright (C) 2005-2006 Regis Houssin - * Copyright (C) 2006 Laurent Destailleur +/* Copyright (C) 2004 Rodolphe Quiedeville + * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2005-2011 Regis Houssin + * Copyright (C) 2006-2011 Laurent Destailleur * * 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 @@ -104,7 +104,7 @@ class Ldap /** * Constructor */ - function Ldap () + function __construct() { global $conf; @@ -1319,29 +1319,29 @@ class Ldap /** - * \brief Return available value of group GID - * \param - * \return int gid number + * Return available value of group GID + * @return int gid number */ - function getNextGroupGid() { + function getNextGroupGid() + { global $conf; + $search='('.$conf->global->LDAP_KEY_GROUPS.'=*)'; $result = $this->search($this->groups,$search); - if($result) { - $c = $result['count']; - $gids = array(); - for($i=0;$i<$c;$i++) + if($result) { - $gids[] = $result[$i]['gidnumber'][0]; - } - rsort($gids); - - - return $gids[0]+1; + $c = $result['count']; + $gids = array(); + for($i=0;$i<$c;$i++) + { + $gids[] = $result[$i]['gidnumber'][0]; + } + rsort($gids); + + return $gids[0]+1; } - return 0; - + return 0; } } From 30c5f4b21494200e67a73543deaf0140da9229a1 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Oct 2011 09:29:17 +0200 Subject: [PATCH 12/41] Move all core class in htdocs/core/class --- htdocs/adherents/admin/adherent.php | 2 +- htdocs/adherents/class/adherent.class.php | 2 +- htdocs/adherents/note.php | 2 +- htdocs/adherents/type.php | 4 ++-- htdocs/admin/fckeditor.php | 2 +- htdocs/admin/geoipmaxmind.php | 2 +- htdocs/admin/ihm.php | 4 ++-- htdocs/admin/mails.php | 4 ++-- htdocs/admin/sms.php | 4 ++-- htdocs/categories/edit.php | 2 +- htdocs/categories/fiche.php | 2 +- htdocs/comm/action/fiche.php | 4 ++-- htdocs/comm/mailing/cibles.php | 2 +- htdocs/comm/mailing/fiche.php | 6 +++--- htdocs/comm/propal.php | 2 +- htdocs/commande/fiche.php | 2 +- htdocs/compta/bank/fiche.php | 4 ++-- htdocs/compta/facture.php | 2 +- .../compta/prelevement/class/rejet-prelevement.class.php | 2 +- htdocs/{lib => core/class}/CMailFile.class.php | 2 +- htdocs/{lib => core/class}/CSMSFile.class.php | 2 +- htdocs/{lib => core/class}/antivir.class.php | 2 +- htdocs/{lib => core/class}/doleditor.class.php | 2 +- htdocs/{lib => core/class}/dolgeoip.class.php | 2 +- htdocs/core/class/extrafields.class.php | 2 +- htdocs/{lib => core/class}/google.class.php | 2 +- htdocs/core/class/html.formmail.class.php | 2 +- htdocs/core/class/notify.class.php | 2 +- htdocs/core/tpl/freeproductline_create.tpl.php | 2 +- htdocs/core/tpl/freeproductline_edit.tpl.php | 2 +- htdocs/core/tpl/predefinedproductline_create.tpl.php | 2 +- htdocs/core/tpl/predefinedproductline_edit.tpl.php | 2 +- htdocs/expedition/fiche.php | 2 +- htdocs/fichinter/fiche.php | 6 +++--- htdocs/fourn/commande/fiche.php | 8 ++++---- htdocs/fourn/facture/fiche.php | 6 +++--- htdocs/lib/files.lib.php | 2 +- htdocs/lib/functions.lib.php | 4 ++-- htdocs/paybox/admin/paybox.php | 2 +- htdocs/paypal/admin/paypal.php | 2 +- htdocs/product/fiche.php | 8 ++++---- htdocs/product/stock/fiche.php | 4 ++-- htdocs/product/traduction.php | 8 ++++---- htdocs/societe/socnote.php | 2 +- htdocs/user/class/user.class.php | 2 +- htdocs/user/fiche.php | 2 +- htdocs/user/group/fiche.php | 4 ++-- htdocs/user/note.php | 2 +- scripts/emailings/mailing-send.php | 2 +- .../invoices/email_unpaid_invoices_to_representatives.php | 2 +- test/phpunit/CMailFileTest.php | 2 +- 51 files changed, 75 insertions(+), 75 deletions(-) rename htdocs/{lib => core/class}/CMailFile.class.php (99%) rename htdocs/{lib => core/class}/CSMSFile.class.php (99%) rename htdocs/{lib => core/class}/antivir.class.php (98%) rename htdocs/{lib => core/class}/doleditor.class.php (99%) rename htdocs/{lib => core/class}/dolgeoip.class.php (98%) rename htdocs/{lib => core/class}/google.class.php (97%) diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index 512423e1400..91a37a77f3e 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -442,7 +442,7 @@ function form_constantes($tableau) } else if (in_array($const,array('ADHERENT_AUTOREGISTER_MAIL','ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) { - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('constvalue'.$const,$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60); $doleditor->Create(); diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index abd23ca85c2..b3728ddb9d4 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -162,7 +162,7 @@ class Adherent extends CommonObject $from=$conf->email_from; if ($conf->global->ADHERENT_MAIL_FROM) $from=$conf->global->ADHERENT_MAIL_FROM; - include_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); + include_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); $mailfile = new CMailFile($subjecttosend, $this->email, $from, $texttosend, $filename_list, $mimetype_list, $mimefilename_list, $addr_cc, $addr_bcc, $deliveryreceipt, $msgishtml); if ($mailfile->sendfile()) { diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 731a2412b83..0a5820c2dc4 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -136,7 +136,7 @@ if ($id) { print ""; print "id."\">"; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('note',$adh->note,'',280,'dolibarr_notes','',true,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MEMBER,10,80); $doleditor->Create(); } diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 741f2b24564..81df560664c 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -240,7 +240,7 @@ if ($_GET["action"] == 'create') print ""; print ''; @@ -620,7 +620,7 @@ if ($rowid > 0) print ""; print '"; diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php index 48aff03a4c3..a062d686e15 100644 --- a/htdocs/admin/fckeditor.php +++ b/htdocs/admin/fckeditor.php @@ -25,7 +25,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $langs->load("admin"); $langs->load("fckeditor"); diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php index 4c36de52c91..48a61111cde 100644 --- a/htdocs/admin/geoipmaxmind.php +++ b/htdocs/admin/geoipmaxmind.php @@ -24,7 +24,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/dolgeoip.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/dolgeoip.class.php"); // Security check if (!$user->admin) diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 7cdc95b6fa5..ad2b89d0803 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -234,7 +234,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit $var=!$var; print ''."\n"; @@ -242,7 +242,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit // Message of the day on home page $var=!$var; print ''."\n"; diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 091be0c5e3c..f1513907cda 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -207,7 +207,7 @@ if (($_POST['action'] == 'send' || $_POST['action'] == 'sendhtml') $subject=make_substitutions($subject,$substitutionarrayfortest); $body=make_substitutions($body,$substitutionarrayfortest); - require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); $mailfile = new CMailFile( $subject, $sendto, $email_from, $body, $filepath, $mimetype, $filename, @@ -639,7 +639,7 @@ else // If we use SSL/TLS if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server; - include_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); + include_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); $mail = new CMailFile('','','',''); $result=$mail->check_server_port($server,$port); if ($result) print '
'.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'
'; diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index a7c1a92c164..4d58e3f5756 100755 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -115,7 +115,7 @@ if ($action == 'send' && ! $_POST['cancel']) complete_substitutions_array($substitutionarrayfortest, $langs); $body=make_substitutions($body,$substitutionarrayfortest); - require_once(DOL_DOCUMENT_ROOT."/lib/CSMSFile.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/CSMSFile.class.php"); $smsfile = new CSMSFile($sendto, $smsfrom, $body, $deliveryreceipt, $deferred, $priority, $class); // This define OvhSms->login, pass, session and account $result=$smsfile->sendfile(); // This send SMS @@ -299,7 +299,7 @@ else // If we use SSL/TLS if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server; - include_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); + include_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); $mail = new CSMSFile('','','',''); $result=$mail->check_server_port($server,$port); if ($result) print '
'.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'
'; diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index acb12159f9e..e513b901db0 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -134,7 +134,7 @@ print ''; print ''; print ''; print ''; diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php index 5ac78405053..c59567527bc 100644 --- a/htdocs/categories/fiche.php +++ b/htdocs/categories/fiche.php @@ -209,7 +209,7 @@ if ($user->rights->categorie->creer) // Description print ''; diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index ca45390ea42..a89e146499c 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -587,7 +587,7 @@ if ($action == 'create') // Description print ''; @@ -801,7 +801,7 @@ if ($id) // Description print ''; diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 72505c0c145..8f6cfcefc55 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -26,7 +26,7 @@ require("../../main.inc.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."/lib/CMailFile.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); $langs->load("mails"); diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 777729e97a2..70b0e0503de 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -25,7 +25,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); @@ -633,7 +633,7 @@ if ($_GET["action"] == 'create') print ''; print ''; @@ -1045,7 +1045,7 @@ else print ''; print ''; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 11d66010363..e779858d8f0 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -501,7 +501,7 @@ if ($_POST['action'] == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] $mimetype = $attachedfiles['mimes']; // Envoi de la propal - require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index deb3b0fd568..1570609905a 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1006,7 +1006,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P $mimetype = $attachedfiles['mimes']; // Send mail - require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index ad4072918c5..6b52b903aee 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -301,7 +301,7 @@ if ($action == 'create') print ''; print ''; @@ -589,7 +589,7 @@ else print ''; print ''; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 369fe03290f..013264d3385 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1292,7 +1292,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO $mimetype = $attachedfiles['mimes']; // Send mail - require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1); if ($mailfile->error) { diff --git a/htdocs/compta/prelevement/class/rejet-prelevement.class.php b/htdocs/compta/prelevement/class/rejet-prelevement.class.php index 90dd3bf8016..46cfd1791d0 100644 --- a/htdocs/compta/prelevement/class/rejet-prelevement.class.php +++ b/htdocs/compta/prelevement/class/rejet-prelevement.class.php @@ -218,7 +218,7 @@ class RejetPrelevement $soc = new Societe($this->db); $soc->fetch($fac->socid); - require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); $subject = $langs->trans("InfoRejectSubject"); $sendto = $emuser->getFullName($langs)." <".$emuser->email.">"; diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php similarity index 99% rename from htdocs/lib/CMailFile.class.php rename to htdocs/core/class/CMailFile.class.php index 9c2a1059e91..c0db88697b3 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/lib/CMailFile.class.php + * \file htdocs/core/class/CMailFile.class.php * \brief File of class to send emails (with attachments or not) * \author Dan Potter. * \author Eric Seigne diff --git a/htdocs/lib/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php similarity index 99% rename from htdocs/lib/CSMSFile.class.php rename to htdocs/core/class/CSMSFile.class.php index 5e38bc9d7f7..658e09f2db3 100755 --- a/htdocs/lib/CSMSFile.class.php +++ b/htdocs/core/class/CSMSFile.class.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/lib/CSMSFile.class.php + * \file htdocs/core/class/CSMSFile.class.php * \brief File of class to send sms * \author Laurent Destailleur. */ diff --git a/htdocs/lib/antivir.class.php b/htdocs/core/class/antivir.class.php similarity index 98% rename from htdocs/lib/antivir.class.php rename to htdocs/core/class/antivir.class.php index cbf71e70839..8a43c28f8a4 100644 --- a/htdocs/lib/antivir.class.php +++ b/htdocs/core/class/antivir.class.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/lib/antivir.class.php + * \file htdocs/core/class/antivir.class.php * \brief File of class to scan viruses * \author Laurent Destailleur. */ diff --git a/htdocs/lib/doleditor.class.php b/htdocs/core/class/doleditor.class.php similarity index 99% rename from htdocs/lib/doleditor.class.php rename to htdocs/core/class/doleditor.class.php index d7219283079..0339dedb3b1 100644 --- a/htdocs/lib/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/doleditor.class.php + * \file htdocs/core/class/doleditor.class.php * \brief Class to manage a WYSIWYG editor */ diff --git a/htdocs/lib/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php similarity index 98% rename from htdocs/lib/dolgeoip.class.php rename to htdocs/core/class/dolgeoip.class.php index 08192ca0167..7ffa64d1961 100644 --- a/htdocs/lib/dolgeoip.class.php +++ b/htdocs/core/class/dolgeoip.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/dolgeoip.class.php + * \file htdocs/core/class/dolgeoip.class.php * \ingroup geoip * \brief Library for managing module geoip */ diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 25eaa6bcf54..86ebf20bf6f 100755 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -435,7 +435,7 @@ class ExtraFields } else if ($type == 'text') { - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('options_'.$key,$value,'',200,'dolibarr_notes','In',false,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,5,100); $out=$doleditor->Create(1); } diff --git a/htdocs/lib/google.class.php b/htdocs/core/class/google.class.php similarity index 97% rename from htdocs/lib/google.class.php rename to htdocs/core/class/google.class.php index ce0423c715d..c1b79235564 100644 --- a/htdocs/lib/google.class.php +++ b/htdocs/core/class/google.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/google.class.php + * \file htdocs/core/class/google.class.php * \brief A set of functions for using Google APIs */ class GoogleAPI diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index f4825fa2a1b..fd98f27f37d 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -600,7 +600,7 @@ class FormMail } // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('message',$defaultmessage,'',280,'dolibarr_notes','In',true,false,$this->withfckeditor,8,72); $out.= $doleditor->Create(1); } diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index 63379df6442..c1ea9e4a6b1 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -21,7 +21,7 @@ * \ingroup notification * \brief File of class to manage notifications */ -require_once(DOL_DOCUMENT_ROOT ."/lib/CMailFile.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/core/class/CMailFile.class.php"); /** diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php index 8f8a4c8c68b..92b2d03868c 100644 --- a/htdocs/core/tpl/freeproductline_create.tpl.php +++ b/htdocs/core/tpl/freeproductline_create.tpl.php @@ -53,7 +53,7 @@ } // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],'',100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); diff --git a/htdocs/core/tpl/freeproductline_edit.tpl.php b/htdocs/core/tpl/freeproductline_edit.tpl.php index a17b510fc21..666d9945ccf 100644 --- a/htdocs/core/tpl/freeproductline_edit.tpl.php +++ b/htdocs/core/tpl/freeproductline_edit.tpl.php @@ -47,7 +47,7 @@ // editeur wysiwyg $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('desc',$line->description,'',164,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); $doleditor->Create(); ?> diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php index 4660a93589d..cbef00b611d 100644 --- a/htdocs/core/tpl/predefinedproductline_create.tpl.php +++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php @@ -60,7 +60,7 @@ } // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('np_desc',$_POST["np_desc"],'',100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); diff --git a/htdocs/core/tpl/predefinedproductline_edit.tpl.php b/htdocs/core/tpl/predefinedproductline_edit.tpl.php index d417c6bb36d..f80c927aba9 100644 --- a/htdocs/core/tpl/predefinedproductline_edit.tpl.php +++ b/htdocs/core/tpl/predefinedproductline_edit.tpl.php @@ -57,7 +57,7 @@ // editeur wysiwyg $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('desc',$line->description,'',164,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); $doleditor->Create(); ?> diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 75a697ec93a..d049528d8e4 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -387,7 +387,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P $mimetype = $attachedfiles['mimes']; // Send mail - require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 62a31d2cfe6..c363ebe24df 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -558,7 +558,7 @@ if ($action == 'send' && ! $_POST['cancel'] && (empty($conf->global->MAIN_USE_AD $mimetype = $attachedfiles['mimes']; // Envoi de la propal - require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { @@ -976,7 +976,7 @@ elseif ($fichinterid) print ''; // ancre pour retourner sur la ligne // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('np_desc',$objp->description,'',164,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70); $doleditor->Create(); print ''; @@ -1031,7 +1031,7 @@ elseif ($fichinterid) print '\n"; print ''; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index d8cc040b2e6..c2fa0cff8f1 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -674,7 +674,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P $mimetype = $attachedfiles['mimes']; // Send mail - require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { @@ -1165,7 +1165,7 @@ if ($id > 0 || ! empty($ref)) } // Description - Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('eldesc',$line->description,'',200,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); @@ -1218,7 +1218,7 @@ if ($id > 0 || ! empty($ref)) || (empty($conf->product->enabled) && empty($conf->service->enabled))) print '
'; // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],'',100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); @@ -1269,7 +1269,7 @@ if ($id > 0 || ! empty($ref)) if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '
'; // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('np_desc',$_POST["np_desc"],'',100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 5218b2e8aa0..8b3be30dc79 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -719,7 +719,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P $mimetype = $attachedfiles['mimes']; // Send mail - require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { @@ -1459,7 +1459,7 @@ else } // Description - Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('label',$fac->lines[$i]->description,'',128,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); @@ -1589,7 +1589,7 @@ else || (empty($conf->product->enabled) && empty($conf->service->enabled))) print '
'; // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('label',GETPOST("label"),'',100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php index b1a237fe45e..ee08274abc8 100644 --- a/htdocs/lib/files.lib.php +++ b/htdocs/lib/files.lib.php @@ -520,7 +520,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable // If we need to make a virus scan if (empty($disablevirusscan) && file_exists($src_file) && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) { - require_once(DOL_DOCUMENT_ROOT.'/lib/antivir.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php'); $antivir=new AntiVir($db); $result = $antivir->dol_avscan_file($src_file); if ($result < 0) // If virus or error, we stop here diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 2b8c75ebba7..6ac60b15bd5 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -1221,7 +1221,7 @@ function dol_print_ip($ip,$mode=0) //$ip='24.24.24.24'; //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat'; Note that this must be downloaded datafile (not same than datafile provided with ubuntu packages) - include_once(DOL_DOCUMENT_ROOT.'/lib/dolgeoip.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php'); $geoip=new DolGeoIP('country',$datafile); //print 'ip='.$ip.' databaseType='.$geoip->gi->databaseType." GEOIP_CITY_EDITION_REV1=".GEOIP_CITY_EDITION_REV1."\n"; //print "geoip_country_id_by_addr=".geoip_country_id_by_addr($geoip->gi,$ip)."\n"; @@ -1257,7 +1257,7 @@ function dol_user_country() $datafile=$conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE; //$ip='24.24.24.24'; //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat'; - include_once(DOL_DOCUMENT_ROOT.'/lib/dolgeoip.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php'); $geoip=new DolGeoIP('country',$datafile); $countrycode=$geoip->getCountryCodeFromIP($ip); $ret=$countrycode; diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php index e8f04306729..d25c26e1ae2 100644 --- a/htdocs/paybox/admin/paybox.php +++ b/htdocs/paybox/admin/paybox.php @@ -25,7 +25,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $servicename='PayBox'; diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php index f3f171e9a2f..568c0a56d75 100644 --- a/htdocs/paypal/admin/paypal.php +++ b/htdocs/paypal/admin/paypal.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $servicename='PayPal'; diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 439770dd687..e4df1b3e2d8 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -709,7 +709,7 @@ else // Description (used in invoice, propal...) print '"; @@ -961,7 +961,7 @@ else // Note print '"; diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php index 85c067559f6..1391e71d156 100644 --- a/htdocs/product/stock/fiche.php +++ b/htdocs/product/stock/fiche.php @@ -173,7 +173,7 @@ if ($_GET["action"] == 'create') // Description print ''; @@ -479,7 +479,7 @@ else // Description print ''; diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index b092a471204..a4b0ad522c0 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -168,12 +168,12 @@ if ($_GET["action"] == 'edit') print '
'.$langs->trans('Ref').''; $morehtmlref=''; - print $html->showrefnav($trip,'ref','',1,'ref','ref',$morehtmlref); + print $html->showrefnav($object,'ref','',1,'ref','ref',$morehtmlref); print '
'.$langs->trans("Type").''.$langs->trans($trip->type).'
'.$langs->trans("Type").''.$langs->trans($object->type).'
'.$langs->trans("Person").''; $userfee=new User($db); - $userfee->fetch($trip->fk_user); + $userfee->fetch($object->fk_user); print $userfee->getNomUrl(1); print '
'.$langs->trans("NotePublic").''; - if ($_GET["action"] == 'edit') + if ($action == 'edit') { - print ''; + print ''; print ''; print ''; - print '
"; + print '
"; print ''; print ''; } else { - print ($trip->note_public?nl2br($trip->note_public):" "); + print ($object->note_public?nl2br($object->note_public):" "); } print "
'.$langs->trans("NotePrivate").''; - if ($_GET["action"] == 'edit') + if ($action == 'edit') { - print '
'; + print ''; print ''; print ''; - print '
"; + print '
"; print ''; print '
'; } else { - print ($trip->note?nl2br($trip->note):" "); + print ($object->note?nl2br($object->note):" "); } print "
'.$langs->trans("Type").''; - print $html->select_type_fees($_POST["type"]?$_POST["type"]:$_GET["type"],'type',1); + print $html->select_type_fees(GETPOST("type"),'type',1); print '
'.$langs->trans("Person").''; - print $html->select_users($_POST["fk_user"]?$_POST["fk_user"]:$_GET["fk_user"],'fk_user',1); + print $html->select_users(GETPOST("fk_user"),'fk_user',1); print '
'.$langs->trans("FeesKilometersOrAmout").'
'.$langs->trans("FeesKilometersOrAmout").'
'.$langs->trans("CompanyVisited").''; - print $html->select_societes($_POST["socid"]?$_POST["socid"]:$_GET["socid"],'socid','',1); + print $html->select_societes(GETPOST("socid"),'socid','',1); print '
'.$langs->trans("WelcomeEMail").''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('mail_valid',$adht->mail_valid,'',280,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,15,90); $doleditor->Create(); print '
'.$langs->trans("WelcomeEMail").''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('mail_valid',$adht->mail_valid,'',280,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,15,90); $doleditor->Create(); print "
'.$langs->trans("MessageLogin").''; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('main_home',$conf->global->MAIN_HOME,'',142,'dolibarr_notes','In',false,true,true,ROWS_4,90); $doleditor->Create(); print '
'.$langs->trans("MessageOfDay").''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('main_motd',$conf->global->MAIN_MOTD,'',142,'dolibarr_notes','In',false,true,true,ROWS_4,90); $doleditor->Create(); print '
'.$langs->trans("Description").''; -require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('description',$categorie->description,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,ROWS_6,50); $doleditor->Create(); print '
'.$langs->trans("Description").''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('description',$object->description,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,ROWS_6,50); $doleditor->Create(); print '
'.$langs->trans("Description").''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('note',($_POST["note"]?$_POST["note"]:$actioncomm->note),'',280,'dolibarr_notes','In',true,true,$conf->fckeditor->enabled,ROWS_7,90); $doleditor->Create(); print '
'.$langs->trans("Description").''; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('note',$act->note,'',240,'dolibarr_notes','In',true,true,$conf->fckeditor->enabled,ROWS_5,90); $doleditor->Create(); print '
'; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('body',$_POST['body'],'',320,'dolibarr_mailings','',true,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING,20,70); $doleditor->Create(); print '
'; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('body',$mil->body,'',320,'dolibarr_mailings','',true,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING,20,70); $doleditor->Create(); print '
'.$langs->trans("Comment").''; // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('account_comment',$account->comment,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70); $doleditor->Create(); print '
'.$langs->trans("Comment").''; // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('account_comment',(isset($_POST["account_comment"])?$_POST["account_comment"]:$account->comment),'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70); $doleditor->Create(); print '
'; // editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('np_desc',$_POST["np_desc"],'',100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70); $doleditor->Create(); print '
'.$langs->trans("Description").''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('desc',$_POST["desc"],'',160,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,4,90); $doleditor->Create(); @@ -771,7 +771,7 @@ else // Note (invisible sur facture, propales...) print '
'.$langs->trans("NoteNotVisibleOnBill").''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('note',$_POST["note"],'',180,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,8,70); $doleditor->Create(); @@ -883,7 +883,7 @@ else // Description (used in invoice, propal...) print '
'.$langs->trans("Description").''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('desc',$object->description,'',160,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,4,90); $doleditor->Create(); print "
'.$langs->trans("NoteNotVisibleOnBill").''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('note',$object->note,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,8,70); $doleditor->Create(); print "
'.$langs->trans("Description").''; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('desc',$entrepot->description,'',180,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,5,70); $doleditor->Create(); print '
'.$langs->trans("Description").''; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('desc',$entrepot->description,'',180,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,5,70); $doleditor->Create(); print '
'; print ''; print ''; print ''; @@ -244,12 +244,12 @@ if ($_GET["action"] == 'add' && ($user->rights->produit->creer || $user->rights- print ''; print ''; print ''; print ''; diff --git a/htdocs/societe/socnote.php b/htdocs/societe/socnote.php index 0cb56f317fd..9395c90d93e 100644 --- a/htdocs/societe/socnote.php +++ b/htdocs/societe/socnote.php @@ -119,7 +119,7 @@ if ($socid > 0) print "id."\">"; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70); $doleditor->Create(); } diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 09e3246f3ab..9f144f94570 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1357,7 +1357,7 @@ class User extends CommonObject { global $conf,$langs; - require_once DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"; + require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"; $subject = $langs->trans("SubjectNewPassword"); $msgishtml=0; diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 26c66c27972..43a64074586 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -808,7 +808,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print '".' + onClick="loadMonth('','','','','defaultlang ?>')"><< + onClick="loadMonth('','','','','defaultlang ?>')">< + onClick="loadMonth('','','','','defaultlang ?>')"> + onClick="loadMonth('','','','','defaultlang ?>')">> + onClick="loadMonth('','','','','defaultlang ?>')">>> diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index 912ea58e1c0..b035f3af6e9 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -131,7 +131,7 @@ jQuery(document).ready(function () {
'.$langs->trans('Label').'
'.$langs->trans('Description').''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('desc-'.$key.'',$product->multilangs[$key]["description"],'',160,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,3,80); $doleditor->Create(); print '
'.$langs->trans('Note').''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('note-'.$key.'',$product->multilangs[$key]["note"],'',160,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,3,80); $doleditor->Create(); print '
'.$langs->trans('Label').'
'.$langs->trans('Description').''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('desc','','',160,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,3,80); $doleditor->Create(); print '
'.$langs->trans('Note').''; - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('note','','',160,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,3,80); $doleditor->Create(); print '
'; if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_USER) { - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('note','','',180,'dolibarr_notes','',false); $doleditor->Create(); } diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index 2e6b5995a6b..a5842f331e0 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -243,7 +243,7 @@ if ($action == 'create') print "
'.$langs->trans("Note").''; if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_USER) { - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('note','','',240,'dolibarr_notes','',false); $doleditor->Create(); } @@ -500,7 +500,7 @@ else if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_USER) { - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('note',$object->note,'',240,'dolibarr_notes','',true); $doleditor->Create(); } diff --git a/htdocs/user/note.php b/htdocs/user/note.php index 6047631c312..d83adced357 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.php @@ -122,7 +122,7 @@ if ($id) print ""; print "id."\">"; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $doleditor=new DolEditor('note',$fuser->note,'',280,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_USER,10,80); $doleditor->Create(); } diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php index 1d9276d17b0..9a456a73767 100644 --- a/scripts/emailings/mailing-send.php +++ b/scripts/emailings/mailing-send.php @@ -42,7 +42,7 @@ if (! isset($argv[1]) || ! $argv[1]) { $id=$argv[1]; require_once ($path."../../htdocs/master.inc.php"); -require_once (DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); +require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); $error = 0; diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php index 261296aa806..2fe69d8055b 100644 --- a/scripts/invoices/email_unpaid_invoices_to_representatives.php +++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php @@ -42,7 +42,7 @@ if (! isset($argv[1]) || ! $argv[1]) { require($path."../../htdocs/master.inc.php"); -require_once (DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); +require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); $error = 0; diff --git a/test/phpunit/CMailFileTest.php b/test/phpunit/CMailFileTest.php index 3d6cb770ad5..133249a2b1c 100755 --- a/test/phpunit/CMailFileTest.php +++ b/test/phpunit/CMailFileTest.php @@ -27,7 +27,7 @@ global $conf,$user,$langs,$db; //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; -require_once dirname(__FILE__).'/../../htdocs/lib/CMailFile.class.php'; +require_once dirname(__FILE__).'/../../htdocs/core/class/CMailFile.class.php'; if (empty($user->id)) { From b1271a5398027c4df437f19fb23ca37305e6b192 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Oct 2011 09:36:58 +0200 Subject: [PATCH 13/41] Move core js in /htdocs/core/js --- htdocs/{lib => core/js}/lib_calendar.js | 0 htdocs/{lib => core/js}/lib_head.js | 2 +- htdocs/{lib => core/js}/lib_photosresize.js | 0 htdocs/{lib => core/js}/lib_rare.js | 2 +- htdocs/core/photos_resize.php | 2 +- htdocs/lib/datepicker.php | 2 +- htdocs/main.inc.php | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename htdocs/{lib => core/js}/lib_calendar.js (100%) rename htdocs/{lib => core/js}/lib_head.js (99%) rename htdocs/{lib => core/js}/lib_photosresize.js (100%) rename htdocs/{lib => core/js}/lib_rare.js (94%) diff --git a/htdocs/lib/lib_calendar.js b/htdocs/core/js/lib_calendar.js similarity index 100% rename from htdocs/lib/lib_calendar.js rename to htdocs/core/js/lib_calendar.js diff --git a/htdocs/lib/lib_head.js b/htdocs/core/js/lib_head.js similarity index 99% rename from htdocs/lib/lib_head.js rename to htdocs/core/js/lib_head.js index 9bc3eeafb73..d89f20064ca 100644 --- a/htdocs/lib/lib_head.js +++ b/htdocs/core/js/lib_head.js @@ -5,7 +5,7 @@ // // -// \file htdocs/lib/lib_head.js +// \file htdocs/core/js/lib_head.js // \brief File that include javascript functions (included if option use_javascript activated) // diff --git a/htdocs/lib/lib_photosresize.js b/htdocs/core/js/lib_photosresize.js similarity index 100% rename from htdocs/lib/lib_photosresize.js rename to htdocs/core/js/lib_photosresize.js diff --git a/htdocs/lib/lib_rare.js b/htdocs/core/js/lib_rare.js similarity index 94% rename from htdocs/lib/lib_rare.js rename to htdocs/core/js/lib_rare.js index 6453e7e255d..a78de915ba6 100644 --- a/htdocs/lib/lib_rare.js +++ b/htdocs/core/js/lib_rare.js @@ -2,7 +2,7 @@ // // Script javascript that contains functions not frequently used // -// \file htdocs/lib/lib_rare.js +// \file htdocs/core/js/lib_rare.js // \brief File that include javascript functions not frequently used (included if option use_javascript activated) diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php index 01b7887f2ec..884e5e0b97b 100644 --- a/htdocs/core/photos_resize.php +++ b/htdocs/core/photos_resize.php @@ -130,7 +130,7 @@ if ($_POST["action"] == 'confirm_crop') * View */ -llxHeader($head, $langs->trans("Image"), '', '', 0, 0, array('/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js','/lib/lib_photosresize.js'), array('/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css')); +llxHeader($head, $langs->trans("Image"), '', '', 0, 0, array('/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js','/core/js/lib_photosresize.js'), array('/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css')); print_fiche_titre($langs->trans("ImageEditor")); diff --git a/htdocs/lib/datepicker.php b/htdocs/lib/datepicker.php index 978f06a1baf..a9073ca3a3b 100644 --- a/htdocs/lib/datepicker.php +++ b/htdocs/lib/datepicker.php @@ -53,7 +53,7 @@ print ''."\n"; print ''."\n"; if (GETPOST('mode') && GETPOST('mode') == 'test') { - print ''."\n"; + print ''."\n"; } else { diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 4bdba0edc70..cc6502d1924 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -953,7 +953,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs } // Global js function print ''."\n"; - print ''."\n"; + print ''."\n"; } // Output module javascript From ecc5519a4ee958e202fa4e62a6e49cbbc1640218 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Oct 2011 09:49:50 +0200 Subject: [PATCH 14/41] Move core lib files in /core/lib --- htdocs/adherents/admin/adherent.php | 2 +- htdocs/compta/deplacement/fiche.php | 2 +- htdocs/compta/deplacement/info.php | 2 +- htdocs/compta/deplacement/note.php | 2 +- htdocs/{ => core}/lib/ajax.lib.php | 2 +- htdocs/{ => core}/lib/format_cards.lib.php | 2 +- htdocs/{ => core}/lib/functions_ch.lib.php | 2 +- htdocs/{ => core}/lib/trip.lib.php | 2 +- htdocs/includes/modules/member/cards/pdf_standard.class.php | 2 +- .../modules/member/labels/pdf_standardlabel.class.php | 2 +- htdocs/main.inc.php | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) rename htdocs/{ => core}/lib/ajax.lib.php (99%) rename htdocs/{ => core}/lib/format_cards.lib.php (98%) rename htdocs/{ => core}/lib/functions_ch.lib.php (98%) rename htdocs/{ => core}/lib/trip.lib.php (97%) diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index 91a37a77f3e..8d2ac7a9d70 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -417,7 +417,7 @@ function form_constantes($tableau) { print ''; // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php) - require_once(DOL_DOCUMENT_ROOT.'/lib/format_cards.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'); $arrayoflabels=array(); foreach(array_keys($_Avery_Labels) as $codecards) { diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index cc6f20e5454..18e4ff0292d 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/trip.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/trip.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); if ($conf->projet->enabled) diff --git a/htdocs/compta/deplacement/info.php b/htdocs/compta/deplacement/info.php index 788759148e9..cf01bcfc153 100644 --- a/htdocs/compta/deplacement/info.php +++ b/htdocs/compta/deplacement/info.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/trip.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/trip.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); diff --git a/htdocs/compta/deplacement/note.php b/htdocs/compta/deplacement/note.php index cb0ef37b83d..d0a81e9e950 100644 --- a/htdocs/compta/deplacement/note.php +++ b/htdocs/compta/deplacement/note.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/trip.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/trip.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); $langs->load("companies"); diff --git a/htdocs/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php similarity index 99% rename from htdocs/lib/ajax.lib.php rename to htdocs/core/lib/ajax.lib.php index 6d29a8e457e..ab8b5228899 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/ajax.lib.php + * \file htdocs/core/lib/ajax.lib.php * \brief Page called by Ajax request for produts */ diff --git a/htdocs/lib/format_cards.lib.php b/htdocs/core/lib/format_cards.lib.php similarity index 98% rename from htdocs/lib/format_cards.lib.php rename to htdocs/core/lib/format_cards.lib.php index b291e3c2298..fb758aefb24 100644 --- a/htdocs/lib/format_cards.lib.php +++ b/htdocs/core/lib/format_cards.lib.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/lib/format_cards.lib.php + * \file htdocs/core/lib/format_cards.lib.php * \brief Set of functions used for cards generation * \ingroup core */ diff --git a/htdocs/lib/functions_ch.lib.php b/htdocs/core/lib/functions_ch.lib.php similarity index 98% rename from htdocs/lib/functions_ch.lib.php rename to htdocs/core/lib/functions_ch.lib.php index d49912ccfe6..41370fa77ac 100644 --- a/htdocs/lib/functions_ch.lib.php +++ b/htdocs/core/lib/functions_ch.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/functions_ch.lib.php + * \file htdocs/core/lib/functions_ch.lib.php * \brief A set of swiss functions for Dolibarr * This file contains rare functions. */ diff --git a/htdocs/lib/trip.lib.php b/htdocs/core/lib/trip.lib.php similarity index 97% rename from htdocs/lib/trip.lib.php rename to htdocs/core/lib/trip.lib.php index 726f1575b8e..d7918e98ea6 100644 --- a/htdocs/lib/trip.lib.php +++ b/htdocs/core/lib/trip.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/trip.lib.php + * \file htdocs/core/lib/trip.lib.php * \brief Ensemble de fonctions de base pour les deplacements */ diff --git a/htdocs/includes/modules/member/cards/pdf_standard.class.php b/htdocs/includes/modules/member/cards/pdf_standard.class.php index 9640abf5da4..c36a1ac05ed 100644 --- a/htdocs/includes/modules/member/cards/pdf_standard.class.php +++ b/htdocs/includes/modules/member/cards/pdf_standard.class.php @@ -63,7 +63,7 @@ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/format_cards.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'); /** diff --git a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php index f9d4733722b..f9256e545da 100644 --- a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php +++ b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php @@ -63,7 +63,7 @@ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/format_cards.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'); /** diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index cc6502d1924..b4e23e205b5 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -227,7 +227,7 @@ if (! empty($conf->file->main_force_https)) // Chargement des includes complementaires de presentation if (! defined('NOREQUIREMENU')) require_once(DOL_DOCUMENT_ROOT ."/core/class/menu.class.php"); // Need 10ko memory (11ko in 2.2) if (! defined('NOREQUIREHTML')) require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php"); // Need 660ko memory (800ko in 2.2) -if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once(DOL_DOCUMENT_ROOT.'/lib/ajax.lib.php'); // Need 22ko memory +if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once(DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'); // Need 22ko memory //dol_stopwithmem(); // If install or upgrade process not done or not completely finished, we call the install page. @@ -904,7 +904,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs if (! $disablejs && $conf->use_javascript_ajax) { // Other external js - require_once DOL_DOCUMENT_ROOT.'/lib/ajax.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; $ext='.js'; if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) { $ext='.jgz'; } // mini='_mini', ext='.gz' From dd963235cd18ac9edd103932e02ac1f3cea1b292 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Oct 2011 10:06:37 +0200 Subject: [PATCH 15/41] Move db classes in /htdocs/core/db --- htdocs/{lib/databases => core/db}/index.php | 0 htdocs/{lib/databases => core/db}/mssql.class.php | 0 htdocs/{lib/databases => core/db}/mysql.class.php | 0 htdocs/{lib/databases => core/db}/mysqli.class.php | 0 htdocs/{lib/databases => core/db}/pgsql.class.php | 0 htdocs/install/etape1.php | 4 ++-- htdocs/install/fileconf.php | 2 +- htdocs/install/inc.php | 2 +- htdocs/lib/functions.lib.php | 2 +- htdocs/support/inc.php | 2 +- 10 files changed, 6 insertions(+), 6 deletions(-) rename htdocs/{lib/databases => core/db}/index.php (100%) rename htdocs/{lib/databases => core/db}/mssql.class.php (100%) rename htdocs/{lib/databases => core/db}/mysql.class.php (100%) rename htdocs/{lib/databases => core/db}/mysqli.class.php (100%) rename htdocs/{lib/databases => core/db}/pgsql.class.php (100%) diff --git a/htdocs/lib/databases/index.php b/htdocs/core/db/index.php similarity index 100% rename from htdocs/lib/databases/index.php rename to htdocs/core/db/index.php diff --git a/htdocs/lib/databases/mssql.class.php b/htdocs/core/db/mssql.class.php similarity index 100% rename from htdocs/lib/databases/mssql.class.php rename to htdocs/core/db/mssql.class.php diff --git a/htdocs/lib/databases/mysql.class.php b/htdocs/core/db/mysql.class.php similarity index 100% rename from htdocs/lib/databases/mysql.class.php rename to htdocs/core/db/mysql.class.php diff --git a/htdocs/lib/databases/mysqli.class.php b/htdocs/core/db/mysqli.class.php similarity index 100% rename from htdocs/lib/databases/mysqli.class.php rename to htdocs/core/db/mysqli.class.php diff --git a/htdocs/lib/databases/pgsql.class.php b/htdocs/core/db/pgsql.class.php similarity index 100% rename from htdocs/lib/databases/pgsql.class.php rename to htdocs/core/db/pgsql.class.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index e403b6c94ff..0882e33cc6c 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -116,7 +116,7 @@ if (! $main_data_dir) { $main_data_dir="$main_dir/documents"; } // Test database connexion if (! $error) { - $result=@include_once($main_dir."/lib/databases/".$_POST["db_type"].".class.php"); + $result=@include_once($main_dir."/core/db/".$_POST["db_type"].".class.php"); if ($result) { // If we ask database or user creation we need to connect as root @@ -195,7 +195,7 @@ if (! $error) } else { - print "
\nFailed to include_once(\"".$main_dir."/lib/databases/".$_POST["db_type"].".class.php\")
\n"; + print "
\nFailed to include_once(\"".$main_dir."/core/db/".$_POST["db_type"].".class.php\")
\n"; print '
'.$langs->trans("ErrorWrongValueForParameter",$langs->transnoentities("WebPagesDirectory")).'
'; print $langs->trans("ErrorGoBackAndCorrectParameters"); $error++; diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 9c7141eb407..bac965cbfeb 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -259,7 +259,7 @@ if (! empty($force_install_message)) $option=''; // Scan les drivers - $dir=DOL_DOCUMENT_ROOT.'/lib/databases'; + $dir=DOL_DOCUMENT_ROOT.'/core/db'; $handle=opendir($dir); if (is_resource($handle)) { diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index e2bfa1307c9..72601c80903 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -111,7 +111,7 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile)) { if (! empty($dolibarr_main_document_root) && ! empty($dolibarr_main_db_type)) { - $result=include_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".class.php"); + $result=include_once($dolibarr_main_document_root . "/core/db/".$dolibarr_main_db_type.".class.php"); if (! $result) { $includeconferror='ErrorBadValueForDolibarrMainDBType'; diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 6ac60b15bd5..3828662d34f 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -44,7 +44,7 @@ */ function getDoliDBInstance($type, $host, $user, $pass, $name, $port) { - require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$type.".class.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/db/".$type.".class.php"); $class='DoliDB'.ucfirst($type); $dolidb=new $class($type, $host, $user, $pass, $name, $port); diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index ecacb1c691d..2bbea6c8764 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -105,7 +105,7 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile)) { if (! empty($dolibarr_main_document_root) && ! empty($dolibarr_main_db_type)) { - $result=include_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".class.php"); + $result=include_once($dolibarr_main_document_root . "/core/db/".$dolibarr_main_db_type.".class.php"); if (! $result) { $includeconferror='ErrorBadValueForDolibarrMainDBType'; From cf551f82e7947581d9183c14a552decb17144dc8 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Oct 2011 10:29:33 +0200 Subject: [PATCH 16/41] Move common files in core directory --- htdocs/{lib => core}/antispamimage.php | 2 +- htdocs/core/class/html.form.class.php | 2 +- htdocs/{lib => core}/datepicker.php | 14 +++++++------- htdocs/core/tpl/login.tpl.php | 2 +- htdocs/core/tpl/passwordforgotten.tpl.php | 2 +- htdocs/theme/bureau2crea/tpl/login.tpl.php | 2 +- .../bureau2crea/tpl/passwordforgotten.tpl.php | 2 +- htdocs/theme/phones/smartphone/tpl/login.tpl.php | 2 +- .../smartphone/tpl/passwordforgotten.tpl.php | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) rename htdocs/{lib => core}/antispamimage.php (97%) rename htdocs/{lib => core}/datepicker.php (86%) diff --git a/htdocs/lib/antispamimage.php b/htdocs/core/antispamimage.php similarity index 97% rename from htdocs/lib/antispamimage.php rename to htdocs/core/antispamimage.php index 3549b84360b..303413c0036 100644 --- a/htdocs/lib/antispamimage.php +++ b/htdocs/core/antispamimage.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/antispamimage.php + * \file htdocs/core/antispamimage.php * \brief Return antispam image */ diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index f031e575b67..6e7de839e06 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3048,7 +3048,7 @@ class Form if (! $disabled) { $retstring.=''; } diff --git a/htdocs/lib/datepicker.php b/htdocs/core/datepicker.php similarity index 86% rename from htdocs/lib/datepicker.php rename to htdocs/core/datepicker.php index a9073ca3a3b..be7dbf31bf6 100644 --- a/htdocs/lib/datepicker.php +++ b/htdocs/core/datepicker.php @@ -21,7 +21,7 @@ */ /** - * \file htdocs/lib/datepicker.php + * \file htdocs/core/datepicker.php * \brief Fichier de gestion de la popup de selection de date eldy */ @@ -47,7 +47,7 @@ $left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); //var_dump($langs->trans("FormatDateShortJava")); -// URL http://mydolibarr/lib/datepicker.php?mode=test&m=10&y=2038 can be used for tests +// URL http://mydolibarr/core/datepicker.php?mode=test&m=10&y=2038 can be used for tests print ''."\n"; print ''."\n"; print ''."\n"; @@ -157,15 +157,15 @@ function displayBox($selectedDate,$month,$year){
<< ','','','defaultlang ?>')">< ','','defaultlang ?>')"> ','','','defaultlang ?>')">> >>
trans("ShortSunday") ?>
- +
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index 49a68a6af6f..ca0159dc4bd 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -94,7 +94,7 @@ function donnefocus() { - +
diff --git a/htdocs/theme/bureau2crea/tpl/login.tpl.php b/htdocs/theme/bureau2crea/tpl/login.tpl.php index 231f331a831..63185dd8c26 100644 --- a/htdocs/theme/bureau2crea/tpl/login.tpl.php +++ b/htdocs/theme/bureau2crea/tpl/login.tpl.php @@ -103,7 +103,7 @@ jQuery(document).ready(function () {
- +
diff --git a/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php b/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php index 2aeb428b549..e2664af428c 100644 --- a/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php +++ b/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php @@ -65,7 +65,7 @@ function donnefocus() {
- +
diff --git a/htdocs/theme/phones/smartphone/tpl/login.tpl.php b/htdocs/theme/phones/smartphone/tpl/login.tpl.php index 5752d512765..cfc6fc531a0 100644 --- a/htdocs/theme/phones/smartphone/tpl/login.tpl.php +++ b/htdocs/theme/phones/smartphone/tpl/login.tpl.php @@ -63,7 +63,7 @@ jQuery(document).bind("mobileinit", function(){ -
+
diff --git a/htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php b/htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php index 4781d969e65..c49aeee5438 100644 --- a/htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php +++ b/htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php @@ -51,7 +51,7 @@ include('header.tpl.php'); -
+
From ed28394df8daba27895829e9fd048d94dcc589fa Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Oct 2011 10:33:55 +0200 Subject: [PATCH 17/41] Add empty index file --- htdocs/core/class/index.php | 1 + htdocs/core/js/index.php | 1 + htdocs/core/lib/index.php | 1 + 3 files changed, 3 insertions(+) create mode 100644 htdocs/core/class/index.php create mode 100644 htdocs/core/js/index.php create mode 100644 htdocs/core/lib/index.php diff --git a/htdocs/core/class/index.php b/htdocs/core/class/index.php new file mode 100644 index 00000000000..7db0dd9ebf9 --- /dev/null +++ b/htdocs/core/class/index.php @@ -0,0 +1 @@ +Url not available \ No newline at end of file diff --git a/htdocs/core/js/index.php b/htdocs/core/js/index.php new file mode 100644 index 00000000000..7db0dd9ebf9 --- /dev/null +++ b/htdocs/core/js/index.php @@ -0,0 +1 @@ +Url not available \ No newline at end of file diff --git a/htdocs/core/lib/index.php b/htdocs/core/lib/index.php new file mode 100644 index 00000000000..7db0dd9ebf9 --- /dev/null +++ b/htdocs/core/lib/index.php @@ -0,0 +1 @@ +Url not available \ No newline at end of file From 00fd96a8d26477ac3b172f0dc39e371515ca7276 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Oct 2011 10:36:53 +0200 Subject: [PATCH 18/41] [task #216] Move lib in core directory --- htdocs/adherents/ldap.php | 2 +- htdocs/admin/ldap.php | 2 +- htdocs/admin/ldap_contacts.php | 2 +- htdocs/admin/ldap_groups.php | 2 +- htdocs/admin/ldap_members.php | 2 +- htdocs/admin/ldap_users.php | 2 +- htdocs/contact/ldap.php | 2 +- htdocs/{ => core}/lib/ldap.lib.php | 2 +- htdocs/user/group/ldap.php | 2 +- htdocs/user/ldap.php | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename htdocs/{ => core}/lib/ldap.lib.php (98%) diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php index 3b8282c08e5..1f0d35d0b6e 100644 --- a/htdocs/adherents/ldap.php +++ b/htdocs/adherents/ldap.php @@ -24,7 +24,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index 0f2db88c512..e9346abc5d2 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -29,7 +29,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); $langs->load("admin"); diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index d4809e66452..b051abbce02 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -29,7 +29,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index 64f6635dbb7..615e172c80f 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); $langs->load("admin"); $langs->load("errors"); diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index ebc3fe9b653..57688b35b91 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.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."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); $langs->load("admin"); $langs->load("errors"); diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index e6521f5399c..c8b9946ba87 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); $langs->load("admin"); $langs->load("errors"); diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php index 9ed2575ab86..c7aa3ea5038 100644 --- a/htdocs/contact/ldap.php +++ b/htdocs/contact/ldap.php @@ -26,7 +26,7 @@ require("../main.inc.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/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); $langs->load("companies"); $langs->load("ldap"); diff --git a/htdocs/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php similarity index 98% rename from htdocs/lib/ldap.lib.php rename to htdocs/core/lib/ldap.lib.php index 3c07b8917c7..c17409e0956 100644 --- a/htdocs/lib/ldap.lib.php +++ b/htdocs/core/lib/ldap.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/ldap.lib.php + * \file htdocs/core/lib/ldap.lib.php * \brief Ensemble de fonctions de base pour le module LDAP * \ingroup ldap */ diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index 03a21c341b5..564ce79fb9e 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); $langs->load("companies"); $langs->load("ldap"); diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 45e15124204..e730d8f1979 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -25,7 +25,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); $langs->load("users"); $langs->load("admin"); From c65238b773b7a0b319122cf2b8c7f086d765c129 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Oct 2011 10:45:06 +0200 Subject: [PATCH 19/41] [task #216] Move lib in core directory --- htdocs/adherents/class/adherent.class.php | 2 +- htdocs/adherents/fiche.php | 6 +++--- htdocs/adherents/info.php | 2 +- htdocs/adherents/info_subscription.php | 2 +- htdocs/admin/company.php | 4 ++-- htdocs/admin/ihm.php | 2 +- htdocs/admin/menus/index.php | 2 +- htdocs/admin/pdf.php | 2 +- htdocs/admin/system/dolibarr.php | 2 +- htdocs/admin/system/index.php | 2 +- htdocs/admin/system/os.php | 2 +- htdocs/asterisk/wrapper.php | 2 +- htdocs/boxes.php | 2 +- htdocs/categories/class/categorie.class.php | 2 +- htdocs/categories/index.php | 2 +- htdocs/comm/action/info.php | 2 +- htdocs/comm/mailing/cibles.php | 2 +- htdocs/comm/mailing/fiche.php | 2 +- htdocs/comm/mailing/index.php | 2 +- htdocs/comm/mailing/info.php | 2 +- htdocs/comm/propal.php | 2 +- htdocs/comm/propal/info.php | 2 +- htdocs/commande/fiche.php | 2 +- htdocs/commande/info.php | 2 +- htdocs/compta/bank/info.php | 2 +- htdocs/compta/deplacement/info.php | 2 +- htdocs/compta/facture.php | 2 +- htdocs/compta/facture/info.php | 2 +- htdocs/compta/paiement/info.php | 2 +- htdocs/contact/canvas/actions_contactcard_common.class.php | 2 +- htdocs/contact/fiche.php | 2 +- htdocs/contact/info.php | 2 +- htdocs/contrat/info.php | 2 +- htdocs/core/ajaxfileupload.php | 2 +- htdocs/core/class/html.formfile.class.php | 2 +- htdocs/core/class/smtps.class.php | 2 +- htdocs/core/class/translate.class.php | 2 +- htdocs/{ => core}/lib/functions2.lib.php | 2 +- htdocs/{ => core}/lib/images.lib.php | 6 +++--- htdocs/{ => core}/lib/memory.lib.php | 2 +- htdocs/{ => core}/lib/security.lib.php | 2 +- htdocs/{ => core}/lib/treeview.lib.php | 2 +- htdocs/core/photos_resize.php | 2 +- htdocs/ecm/index.php | 2 +- htdocs/ecm/search.php | 2 +- htdocs/fichinter/info.php | 2 +- htdocs/filefunc.inc.php | 2 +- htdocs/fourn/commande/fiche.php | 2 +- htdocs/fourn/facture/info.php | 2 +- htdocs/fourn/paiement/info.php | 2 +- htdocs/ftp/index.php | 2 +- .../includes/modules/cheque/pdf/modules_chequereceipts.php | 2 +- htdocs/includes/modules/commande/mod_commande_saphir.php | 2 +- htdocs/includes/modules/commande/modules_commande.php | 2 +- htdocs/includes/modules/commande/pdf_einstein.modules.php | 2 +- htdocs/includes/modules/contract/mod_contract_magre.php | 2 +- htdocs/includes/modules/dons/modules_don.php | 2 +- .../modules/expedition/methode_expedition.modules.php | 2 +- .../includes/modules/expedition/mod_expedition_ribera.php | 2 +- .../modules/expedition/pdf/ModelePdfExpedition.class.php | 2 +- .../modules/facture/doc/doc_generic_invoice_odt.modules.php | 2 +- htdocs/includes/modules/facture/doc/pdf_crabe.modules.php | 2 +- htdocs/includes/modules/facture/mod_facture_mercure.php | 2 +- htdocs/includes/modules/facture/modules_facture.php | 2 +- htdocs/includes/modules/fichinter/mod_arctic.php | 2 +- htdocs/includes/modules/fichinter/modules_fichinter.php | 2 +- htdocs/includes/modules/livraison/mod_livraison_saphir.php | 2 +- htdocs/includes/modules/livraison/modules_livraison.php | 2 +- htdocs/includes/modules/mailings/peche.modules.php | 2 +- .../mailings/thirdparties_services_expired.modules.php | 2 +- htdocs/includes/modules/member/cards/modules_cards.php | 2 +- htdocs/includes/modules/member/labels/modules_labels.php | 2 +- htdocs/includes/modules/project/mod_project_universal.php | 2 +- htdocs/includes/modules/project/modules_project.php | 2 +- htdocs/includes/modules/propale/mod_propale_saphir.php | 2 +- htdocs/includes/modules/propale/modules_propale.php | 2 +- .../includes/modules/propale/pdf_propale_azur.modules.php | 2 +- .../includes/modules/propale/pdf_propale_jaune.modules.php | 2 +- htdocs/includes/modules/societe/mod_codeclient_elephant.php | 4 ++-- htdocs/includes/modules/societe/modules_societe.class.php | 2 +- .../modules/supplier_invoice/modules_facturefournisseur.php | 2 +- .../supplier_order/mod_commande_fournisseur_orchidee.php | 2 +- .../modules/supplier_order/modules_commandefournisseur.php | 2 +- htdocs/install/etape5.php | 2 +- htdocs/install/repair.php | 2 +- htdocs/install/upgrade.php | 2 +- htdocs/install/upgrade2.php | 2 +- htdocs/lib/pdf.lib.php | 4 ++-- htdocs/product/class/product.class.php | 4 ++-- htdocs/product/stock/info.php | 2 +- htdocs/product/traduction.php | 2 +- htdocs/public/donations/therm.php | 2 +- htdocs/public/paybox/newpayment.php | 2 +- htdocs/public/paypal/newpayment.php | 2 +- htdocs/societe/canvas/actions_card_common.class.php | 4 ++-- htdocs/societe/checkvat/checkVatPopup.php | 2 +- htdocs/societe/class/societe.class.php | 2 +- htdocs/societe/document.php | 2 +- htdocs/societe/info.php | 2 +- htdocs/societe/soc.php | 6 +++--- htdocs/user/class/user.class.php | 2 +- htdocs/user/fiche.php | 2 +- htdocs/user/info.php | 2 +- htdocs/user/param_ihm.php | 2 +- htdocs/webservices/server_other.php | 2 +- test/phpunit/SecurityTest.php | 2 +- 106 files changed, 117 insertions(+), 117 deletions(-) rename htdocs/{ => core}/lib/functions2.lib.php (99%) rename htdocs/{ => core}/lib/images.lib.php (99%) rename htdocs/{ => core}/lib/memory.lib.php (99%) rename htdocs/{ => core}/lib/security.lib.php (99%) rename htdocs/{ => core}/lib/treeview.lib.php (99%) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index b3728ddb9d4..abb0f0c2882 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index c234fa4a284..219a95d01a1 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -27,8 +27,8 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.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."/core/class/extrafields.class.php"); @@ -1078,7 +1078,7 @@ if ($rowid && $action != 'edit') if (empty($login)) { // Full firstname and name separated with a dot : firstname.name - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $login=dol_buildlogin($object->nom,$object->prenom); } if (empty($login)) $login=strtolower(substr($object->prenom, 0, 4)) . strtolower(substr($object->nom, 0, 4)); diff --git a/htdocs/adherents/info.php b/htdocs/adherents/info.php index 87c3abcb07f..7f14fccd751 100644 --- a/htdocs/adherents/info.php +++ b/htdocs/adherents/info.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); diff --git a/htdocs/adherents/info_subscription.php b/htdocs/adherents/info_subscription.php index a4ae0d6f33f..a9f28e7bdbd 100644 --- a/htdocs/adherents/info_subscription.php +++ b/htdocs/adherents/info_subscription.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 324cbdd8bea..76dd1dd6780 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -28,8 +28,8 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index ad2b89d0803..214aa7cafe1 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -25,7 +25,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index c21503b15d2..71531c2f4f7 100644 --- a/htdocs/admin/menus/index.php +++ b/htdocs/admin/menus/index.php @@ -25,7 +25,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); $langs->load("other"); $langs->load("admin"); diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index c83b8714bbe..2e5b758c109 100755 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -25,7 +25,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 8e3e5c82fc9..31bdfcaf388 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -22,7 +22,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/memory.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/memory.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); $langs->load("admin"); diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index f918caeab1f..98edcc5fc2b 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); $langs->load("admin"); $langs->load("user"); diff --git a/htdocs/admin/system/os.php b/htdocs/admin/system/os.php index 521d3f5f495..6d3366fe366 100644 --- a/htdocs/admin/system/os.php +++ b/htdocs/admin/system/os.php @@ -22,7 +22,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); $langs->load("admin"); diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php index 8332843f5e7..a4285e2357b 100644 --- a/htdocs/asterisk/wrapper.php +++ b/htdocs/asterisk/wrapper.php @@ -62,7 +62,7 @@ function llxFooter() require_once("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); // Security check diff --git a/htdocs/boxes.php b/htdocs/boxes.php index 4bce41812b1..24d0faf6683 100644 --- a/htdocs/boxes.php +++ b/htdocs/boxes.php @@ -323,7 +323,7 @@ class InfoBox { global $conf; - require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); dol_syslog("InfoBoxes::saveboxorder zone=".$zone." user=".$userid); diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index e1e68db7a58..a0dbbca0e7a 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -1236,7 +1236,7 @@ class Categorie */ function add_thumb($file, $maxWidth = 160, $maxHeight = 120) { - require_once(DOL_DOCUMENT_ROOT ."/lib/images.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/images.lib.php"); if (file_exists($file)) { diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index 29fa9decf7f..d6cb0166c96 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); $type=(GETPOST('type') ? GETPOST('type') : 0); diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php index 8024fa74495..78fa56ac4aa 100644 --- a/htdocs/comm/action/info.php +++ b/htdocs/comm/action/info.php @@ -24,7 +24,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/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."/comm/action/class/cactioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 8f6cfcefc55..2e25be7e3ea 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -27,7 +27,7 @@ require("../../main.inc.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/class/CMailFile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); $langs->load("mails"); diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 70b0e0503de..22556691b4b 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/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."/core/class/html.formother.class.php"); diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 04dd40a3bb4..34a45e23487 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -25,7 +25,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/class/mailing.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); $langs->load("commercial"); $langs->load("orders"); diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php index 5efbd584853..ecff22ad16a 100644 --- a/htdocs/comm/mailing/info.php +++ b/htdocs/comm/mailing/info.php @@ -24,7 +24,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/class/mailing.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php"); $langs->load("mails"); diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index e779858d8f0..cb8de4ddf23 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -35,7 +35,7 @@ require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); $langs->load('companies'); diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php index 25b24a0764c..1b95d4559c5 100644 --- a/htdocs/comm/propal/info.php +++ b/htdocs/comm/propal/info.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 1570609905a..0120bb75ae6 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/commande/modules_commande.php" require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'); require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.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.'/lib/project.lib.php'); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php index cc09dbeac21..03274702287 100644 --- a/htdocs/commande/info.php +++ b/htdocs/commande/info.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php index 94dfa43d8ad..4e01b6fcee0 100644 --- a/htdocs/compta/bank/info.php +++ b/htdocs/compta/bank/info.php @@ -22,7 +22,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("banks"); diff --git a/htdocs/compta/deplacement/info.php b/htdocs/compta/deplacement/info.php index cf01bcfc153..7dee9417339 100644 --- a/htdocs/compta/deplacement/info.php +++ b/htdocs/compta/deplacement/info.php @@ -24,7 +24,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/trip.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); $langs->load("trips"); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 013264d3385..e8a07835aa0 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.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.'/compta/paiement/class/paiement.class.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php index 5f04fda1944..0fe5dbc4e1d 100644 --- a/htdocs/compta/facture/info.php +++ b/htdocs/compta/facture/info.php @@ -25,7 +25,7 @@ require("../../main.inc.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."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); $langs->load("bills"); diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php index c32f9c3c107..609785976bd 100644 --- a/htdocs/compta/paiement/info.php +++ b/htdocs/compta/paiement/info.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("bills"); diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php index 4592072e9af..f65a6a500c0 100644 --- a/htdocs/contact/canvas/actions_contactcard_common.class.php +++ b/htdocs/contact/canvas/actions_contactcard_common.class.php @@ -394,7 +394,7 @@ abstract class ActionsContactCardCommon if ($action == 'create_user') { // Full firstname and name separated with a dot : firstname.name - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $login=dol_buildlogin($this->object->nom, $this->object->prenom); $generated_password=''; diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index f0b77eb66df..3a1d829a777 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -711,7 +711,7 @@ else if ($action == 'create_user') { // Full firstname and name separated with a dot : firstname.name - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $login=dol_buildlogin($object->nom,$object->prenom); $generated_password=''; diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php index 64d5c53be4f..242866b7a7e 100644 --- a/htdocs/contact/info.php +++ b/htdocs/contact/info.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/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."/lib/contact.lib.php"); diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php index f682ff46870..839e738f10b 100644 --- a/htdocs/contrat/info.php +++ b/htdocs/contrat/info.php @@ -22,7 +22,7 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/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."/contrat/class/contrat.class.php"); diff --git a/htdocs/core/ajaxfileupload.php b/htdocs/core/ajaxfileupload.php index 82067d69fa7..7c9ebe6a298 100644 --- a/htdocs/core/ajaxfileupload.php +++ b/htdocs/core/ajaxfileupload.php @@ -36,7 +36,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't nee require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); error_reporting(E_ALL | E_STRICT); diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 71d2023c777..3383a3ce8ca 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -562,7 +562,7 @@ class FormFile $nboffiles=count($filearray); - if ($nboffiles > 0) include_once(DOL_DOCUMENT_ROOT.'/lib/images.lib.php'); + if ($nboffiles > 0) include_once(DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'); $var=true; foreach($filearray as $key => $file) // filearray must be only files here diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php index 7407a7e6036..d51685d2f56 100755 --- a/htdocs/core/class/smtps.class.php +++ b/htdocs/core/class/smtps.class.php @@ -295,7 +295,7 @@ class SMTPs $host=preg_replace('@ssl://@i','',$host); // Remove prefix // DOL_CHANGE LDR - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); if ( (! is_ip($host)) && ((gethostbyname ( $host )) == $host) ) { diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 1ca8345cb23..7fff033ba57 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -227,7 +227,7 @@ class Translate { { //dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey); - require_once(DOL_DOCUMENT_ROOT ."/lib/memory.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/memory.lib.php"); $tmparray=dol_getcache($usecachekey); if (is_array($tmparray) && count($tmparray)) { diff --git a/htdocs/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php similarity index 99% rename from htdocs/lib/functions2.lib.php rename to htdocs/core/lib/functions2.lib.php index dd74c192347..db317b4a549 100644 --- a/htdocs/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/functions2.lib.php + * \file htdocs/core/lib/functions2.lib.php * \brief A set of functions for Dolibarr * This file contains all rare functions. */ diff --git a/htdocs/lib/images.lib.php b/htdocs/core/lib/images.lib.php similarity index 99% rename from htdocs/lib/images.lib.php rename to htdocs/core/lib/images.lib.php index 666c5297337..22b2997b5ca 100644 --- a/htdocs/lib/images.lib.php +++ b/htdocs/core/lib/images.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/images.lib.php + * \file htdocs/core/lib/images.lib.php * \brief Set of function for manipulating images */ @@ -94,7 +94,7 @@ function dol_getImageSize($file) */ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x=0, $src_y=0) { - require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); global $conf,$langs; @@ -297,7 +297,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x=0, $s */ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $quality=50, $outdir='thumbs', $targetformat=0) { - require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); global $conf,$langs; diff --git a/htdocs/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php similarity index 99% rename from htdocs/lib/memory.lib.php rename to htdocs/core/lib/memory.lib.php index c538c006462..7600d2db16e 100644 --- a/htdocs/lib/memory.lib.php +++ b/htdocs/core/lib/memory.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/memory.lib.php + * \file htdocs/core/lib/memory.lib.php * \brief Set of function for memory/cache management */ diff --git a/htdocs/lib/security.lib.php b/htdocs/core/lib/security.lib.php similarity index 99% rename from htdocs/lib/security.lib.php rename to htdocs/core/lib/security.lib.php index c238533ef94..9b24f98738e 100644 --- a/htdocs/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/security.lib.php + * \file htdocs/core/lib/security.lib.php * \ingroup core * \brief Set of function used for dolibarr security. * Warning, this file must not depends on other library files, except function.lib.php diff --git a/htdocs/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php similarity index 99% rename from htdocs/lib/treeview.lib.php rename to htdocs/core/lib/treeview.lib.php index cbb10193140..682aa15b4e6 100644 --- a/htdocs/lib/treeview.lib.php +++ b/htdocs/core/lib/treeview.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/treeview.lib.php + * \file htdocs/core/lib/treeview.lib.php * \ingroup core * \brief Libraries for tree views */ diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php index 884e5e0b97b..2b1a8202993 100644 --- a/htdocs/core/photos_resize.php +++ b/htdocs/core/photos_resize.php @@ -35,7 +35,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); $langs->load("products"); diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index a2adc93b229..83a283fde35 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -29,7 +29,7 @@ require("../main.inc.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."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); // Load traductions files diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php index 2536ba75aa5..7b1005493de 100644 --- a/htdocs/ecm/search.php +++ b/htdocs/ecm/search.php @@ -27,7 +27,7 @@ require("../main.inc.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."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); // Load traductions files diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php index 08d151f7031..baea3fa8ec5 100644 --- a/htdocs/fichinter/info.php +++ b/htdocs/fichinter/info.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/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."/lib/fichinter.lib.php"); diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 258839b2673..f91dc0003d9 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -213,7 +213,7 @@ if (! file_exists(DOL_DOCUMENT_ROOT ."/lib/functions.lib.php")) } include_once(DOL_DOCUMENT_ROOT ."/lib/functions.lib.php"); // Need 970ko memory (1.1 in 2.2) -include_once(DOL_DOCUMENT_ROOT ."/lib/security.lib.php"); // Include by default +include_once(DOL_DOCUMENT_ROOT ."/core/lib/security.lib.php"); // Include by default // If password is encoded, we decode it if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass)) diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index c2fa0cff8f1..486ee57581f 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"; require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php"; require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; require_once DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"; -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); $langs->load('orders'); diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php index 8b755976cb3..2efeb38f612 100644 --- a/htdocs/fourn/facture/info.php +++ b/htdocs/fourn/facture/info.php @@ -26,7 +26,7 @@ require("../../main.inc.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."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php'); $langs->load('bills'); diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php index 26242eddcef..95d1bc0a0ea 100644 --- a/htdocs/fourn/paiement/info.php +++ b/htdocs/fourn/paiement/info.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/paiementfourn.class.php"); $langs->load("bills"); diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index 63a0da727bf..1c45855c89f 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/index.php @@ -26,7 +26,7 @@ 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."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); // Load traductions files $langs->load("ftp"); diff --git a/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php b/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php index 0409d6af1a8..fd03de12b9d 100644 --- a/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php +++ b/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php @@ -49,7 +49,7 @@ abstract class ModeleChequeReceipts extends CommonDocGenerator $type='chequereceipt'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); // TODO Remove this to use getListOfModels only $liste = array('blochet'=>'blochet'); diff --git a/htdocs/includes/modules/commande/mod_commande_saphir.php b/htdocs/includes/modules/commande/mod_commande_saphir.php index b63e4459ccb..8d40c5644d2 100644 --- a/htdocs/includes/modules/commande/mod_commande_saphir.php +++ b/htdocs/includes/modules/commande/mod_commande_saphir.php @@ -105,7 +105,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); // We get cursor rule $mask=$conf->global->COMMANDE_SAPHIR_MASK; diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php index 9992255fbb2..744c9196b0c 100644 --- a/htdocs/includes/modules/commande/modules_commande.php +++ b/htdocs/includes/modules/commande/modules_commande.php @@ -52,7 +52,7 @@ abstract class ModelePDFCommandes extends CommonDocGenerator $type='order'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index 5fc3d598b4a..c0dc9e8668f 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/contract/mod_contract_magre.php b/htdocs/includes/modules/contract/mod_contract_magre.php index 8d4f3dea896..41e40b5597e 100755 --- a/htdocs/includes/modules/contract/mod_contract_magre.php +++ b/htdocs/includes/modules/contract/mod_contract_magre.php @@ -98,7 +98,7 @@ class mod_contract_magre extends ModelNumRefContracts { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); $mask=$conf->global->CONTRACT_MAGRE_MASK; diff --git a/htdocs/includes/modules/dons/modules_don.php b/htdocs/includes/modules/dons/modules_don.php index 3d7d93e93aa..528e5564766 100644 --- a/htdocs/includes/modules/dons/modules_don.php +++ b/htdocs/includes/modules/dons/modules_don.php @@ -48,7 +48,7 @@ abstract class ModeleDon extends CommonDocGenerator $type='donation'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; diff --git a/htdocs/includes/modules/expedition/methode_expedition.modules.php b/htdocs/includes/modules/expedition/methode_expedition.modules.php index 5cc284b90e2..509c5cc1219 100644 --- a/htdocs/includes/modules/expedition/methode_expedition.modules.php +++ b/htdocs/includes/modules/expedition/methode_expedition.modules.php @@ -52,7 +52,7 @@ class ModeleShippingMethod $type='???'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; diff --git a/htdocs/includes/modules/expedition/mod_expedition_ribera.php b/htdocs/includes/modules/expedition/mod_expedition_ribera.php index a1468c20840..2fd9c8ab175 100755 --- a/htdocs/includes/modules/expedition/mod_expedition_ribera.php +++ b/htdocs/includes/modules/expedition/mod_expedition_ribera.php @@ -98,7 +98,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); $mask=$conf->global->EXPEDITION_RIBERA_MASK; diff --git a/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php b/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php index ac0d8d378d9..24f9947f0b8 100644 --- a/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php +++ b/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php @@ -46,7 +46,7 @@ abstract class ModelePdfExpedition extends CommonDocGenerator $type='shipping'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; diff --git a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php index 969287835d0..1081fb13508 100644 --- a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -26,7 +26,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."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); diff --git a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php index 415d581f330..393dbdb3047 100755 --- a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php @@ -29,7 +29,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."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/facture/mod_facture_mercure.php b/htdocs/includes/modules/facture/mod_facture_mercure.php index abdcb71cab5..fba12d7727a 100644 --- a/htdocs/includes/modules/facture/mod_facture_mercure.php +++ b/htdocs/includes/modules/facture/mod_facture_mercure.php @@ -113,7 +113,7 @@ class mod_facture_mercure extends ModeleNumRefFactures { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); // Get Mask value $mask = ''; diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php index 7a12cb438ad..f0ec7568380 100644 --- a/htdocs/includes/modules/facture/modules_facture.php +++ b/htdocs/includes/modules/facture/modules_facture.php @@ -50,7 +50,7 @@ abstract class ModelePDFFactures extends CommonDocGenerator $type='invoice'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; diff --git a/htdocs/includes/modules/fichinter/mod_arctic.php b/htdocs/includes/modules/fichinter/mod_arctic.php index 85bbb4adba8..3312af5b9c0 100644 --- a/htdocs/includes/modules/fichinter/mod_arctic.php +++ b/htdocs/includes/modules/fichinter/mod_arctic.php @@ -109,7 +109,7 @@ class mod_arctic extends ModeleNumRefFicheinter { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); // On d�fini critere recherche compteur $mask=$conf->global->FICHINTER_ARTIC_MASK; diff --git a/htdocs/includes/modules/fichinter/modules_fichinter.php b/htdocs/includes/modules/fichinter/modules_fichinter.php index 337ed19a406..9dd588eccec 100644 --- a/htdocs/includes/modules/fichinter/modules_fichinter.php +++ b/htdocs/includes/modules/fichinter/modules_fichinter.php @@ -48,7 +48,7 @@ abstract class ModelePDFFicheinter extends CommonDocGenerator $type='ficheinter'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; diff --git a/htdocs/includes/modules/livraison/mod_livraison_saphir.php b/htdocs/includes/modules/livraison/mod_livraison_saphir.php index 636494ded07..4dd3a79f924 100644 --- a/htdocs/includes/modules/livraison/mod_livraison_saphir.php +++ b/htdocs/includes/modules/livraison/mod_livraison_saphir.php @@ -103,7 +103,7 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); // On d�fini critere recherche compteur $mask=$conf->global->LIVRAISON_SAPHIR_MASK; diff --git a/htdocs/includes/modules/livraison/modules_livraison.php b/htdocs/includes/modules/livraison/modules_livraison.php index 7c71be292ab..f2d4a06af40 100644 --- a/htdocs/includes/modules/livraison/modules_livraison.php +++ b/htdocs/includes/modules/livraison/modules_livraison.php @@ -48,7 +48,7 @@ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator $type='delivery'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; diff --git a/htdocs/includes/modules/mailings/peche.modules.php b/htdocs/includes/modules/mailings/peche.modules.php index d902a13c86a..c7c79d80928 100644 --- a/htdocs/includes/modules/mailings/peche.modules.php +++ b/htdocs/includes/modules/mailings/peche.modules.php @@ -22,7 +22,7 @@ * \brief File of class to offer a selector of emailing targets with Rule 'Peche'. */ include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); /** diff --git a/htdocs/includes/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/includes/modules/mailings/thirdparties_services_expired.modules.php index 478cfca9dd0..d3f04ef197d 100755 --- a/htdocs/includes/modules/mailings/thirdparties_services_expired.modules.php +++ b/htdocs/includes/modules/mailings/thirdparties_services_expired.modules.php @@ -14,7 +14,7 @@ * \brief File of class to offer a selector of emailing targets with Rule 'services expired'. */ include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); /** diff --git a/htdocs/includes/modules/member/cards/modules_cards.php b/htdocs/includes/modules/member/cards/modules_cards.php index 3c82740f53b..86f15e5b2ee 100644 --- a/htdocs/includes/modules/member/cards/modules_cards.php +++ b/htdocs/includes/modules/member/cards/modules_cards.php @@ -49,7 +49,7 @@ class ModelePDFCards $type='members_card'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; diff --git a/htdocs/includes/modules/member/labels/modules_labels.php b/htdocs/includes/modules/member/labels/modules_labels.php index 144619964ec..db4706dee85 100644 --- a/htdocs/includes/modules/member/labels/modules_labels.php +++ b/htdocs/includes/modules/member/labels/modules_labels.php @@ -50,7 +50,7 @@ class ModelePDFLabels $type='members_labels'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; diff --git a/htdocs/includes/modules/project/mod_project_universal.php b/htdocs/includes/modules/project/mod_project_universal.php index 77a155ef305..76cc85e604b 100644 --- a/htdocs/includes/modules/project/mod_project_universal.php +++ b/htdocs/includes/modules/project/mod_project_universal.php @@ -106,7 +106,7 @@ class mod_project_universal extends ModeleNumRefProjects { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); // On defini critere recherche compteur $mask=$conf->global->PROJECT_UNIVERSAL_MASK; diff --git a/htdocs/includes/modules/project/modules_project.php b/htdocs/includes/modules/project/modules_project.php index 3702c6333cb..c42449728c1 100644 --- a/htdocs/includes/modules/project/modules_project.php +++ b/htdocs/includes/modules/project/modules_project.php @@ -45,7 +45,7 @@ abstract class ModelePDFProjects extends CommonDocGenerator $type='project'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; diff --git a/htdocs/includes/modules/propale/mod_propale_saphir.php b/htdocs/includes/modules/propale/mod_propale_saphir.php index 5bc97f28988..0d0bd838c52 100644 --- a/htdocs/includes/modules/propale/mod_propale_saphir.php +++ b/htdocs/includes/modules/propale/mod_propale_saphir.php @@ -105,7 +105,7 @@ class mod_propale_saphir extends ModeleNumRefPropales { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); // On defini critere recherche compteur $mask=$conf->global->PROPALE_SAPHIR_MASK; diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php index 1abb4dfc622..f179cbb0400 100644 --- a/htdocs/includes/modules/propale/modules_propale.php +++ b/htdocs/includes/modules/propale/modules_propale.php @@ -49,7 +49,7 @@ abstract class ModelePDFPropales extends CommonDocGenerator $type='propal'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index f07b2b13dc2..1c8e7f38bb8 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index e03dffeae5d..c187a2757f5 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/societe/mod_codeclient_elephant.php b/htdocs/includes/modules/societe/mod_codeclient_elephant.php index f89e743fc15..cbb14945863 100644 --- a/htdocs/includes/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/includes/modules/societe/mod_codeclient_elephant.php @@ -158,7 +158,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); // Get Mask value $mask = ''; @@ -227,7 +227,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode { global $conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); $result=0; $code = strtoupper(trim($code)); diff --git a/htdocs/includes/modules/societe/modules_societe.class.php b/htdocs/includes/modules/societe/modules_societe.class.php index 847ce2be69f..bc6c56af196 100644 --- a/htdocs/includes/modules/societe/modules_societe.class.php +++ b/htdocs/includes/modules/societe/modules_societe.class.php @@ -47,7 +47,7 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator $type='company'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,$maxfilenamelength); return $liste; diff --git a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php index 387d4b3bb05..a84517bd1f1 100755 --- a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php +++ b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php @@ -45,7 +45,7 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator $type='invoice_supplier'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; diff --git a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php index 2ed2b3ebb5a..871e150224a 100644 --- a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php +++ b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php @@ -105,7 +105,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); // On defini critere recherche compteur $mask=$conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK; diff --git a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php index 001439747ee..7909c4497cc 100644 --- a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php @@ -51,7 +51,7 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator $type='order_supplier'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $liste=getListOfModels($db,$type,''); return $liste; diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 376d8fdf1a8..19387092ef8 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -117,7 +117,7 @@ if ($action == "set" || preg_match('/upgrade/i',$action)) // If password is encoded, we decode it if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass)) { - require_once($dolibarr_main_document_root."/lib/security.lib.php"); + require_once($dolibarr_main_document_root."/core/lib/security.lib.php"); if (preg_match('/crypted:/i',$dolibarr_main_db_pass)) { $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index cc9b87b9a3f..317515631ea 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -76,7 +76,7 @@ $error=0; // If password is encoded, we decode it if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass)) { - require_once($dolibarr_main_document_root."/lib/security.lib.php"); + require_once($dolibarr_main_document_root."/core/lib/security.lib.php"); if (preg_match('/crypted:/i',$dolibarr_main_db_pass)) { $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 2e1f99eedc0..4f865e86709 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -87,7 +87,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) // If password is encoded, we decode it if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass)) { - require_once($dolibarr_main_document_root."/lib/security.lib.php"); + require_once($dolibarr_main_document_root."/core/lib/security.lib.php"); if (preg_match('/crypted:/i',$dolibarr_main_db_pass)) { $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 9a629cfe06f..bee0e48e43e 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -87,7 +87,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) // If password is encoded, we decode it if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass)) { - require_once($dolibarr_main_document_root."/lib/security.lib.php"); + require_once($dolibarr_main_document_root."/core/lib/security.lib.php"); if (preg_match('/crypted:/i',$dolibarr_main_db_pass)) { $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index 2eb9d6dac13..cd3de50e42d 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -41,7 +41,7 @@ function pdf_getFormat() if (empty($conf->global->MAIN_PDF_FORMAT)) { - include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $pdfformat=dol_getDefaultFormat(); } else $pdfformat=$conf->global->MAIN_PDF_FORMAT; @@ -1077,7 +1077,7 @@ function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0,$hookm */ function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0,$hookmanager=false) { - include_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); + include_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); if ($object->lines[$i]->special_code != 3) { diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 792506f7ad9..08828d267c5 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2491,7 +2491,7 @@ class Product extends CommonObject */ function add_thumb($file, $maxWidth = 160, $maxHeight = 120) { - require_once(DOL_DOCUMENT_ROOT ."/lib/images.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/images.lib.php"); $file_osencoded=dol_osencode($file); if (file_exists($file_osencoded)) @@ -2586,7 +2586,7 @@ class Product extends CommonObject global $conf,$user,$langs; include_once(DOL_DOCUMENT_ROOT ."/lib/files.lib.php"); - include_once(DOL_DOCUMENT_ROOT ."/lib/images.lib.php"); + include_once(DOL_DOCUMENT_ROOT ."/core/lib/images.lib.php"); $pdir = get_exdir($this->id,2) . $this->id ."/photos/"; $dir = $sdir . '/'. $pdir; diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php index a62fec1d256..6065e4268b7 100644 --- a/htdocs/product/stock/info.php +++ b/htdocs/product/stock/info.php @@ -23,7 +23,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php"); $langs->load("stocks"); diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index a4b0ad522c0..ce21422bce3 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -26,7 +26,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); diff --git a/htdocs/public/donations/therm.php b/htdocs/public/donations/therm.php index 03cb3b6b72a..527586d6c82 100644 --- a/htdocs/public/donations/therm.php +++ b/htdocs/public/donations/therm.php @@ -26,7 +26,7 @@ define("NOLOGIN",1); // This means this output page does not require to be logg define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); // Security check diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index 808f1efa65c..b1293cdb73f 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -30,7 +30,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paybox/lib/paybox.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); // Security check diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index 7715b98fedf..38960e8db73 100755 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -31,7 +31,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypalfunctions.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); // Security check diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 902af90022c..afa4eb21a2d 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -119,7 +119,7 @@ abstract class ActionsCardCommon if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"]) && ($action == 'add' || $action == 'update')) { - require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); $error=0; if (GETPOST("private") == 1) @@ -572,7 +572,7 @@ abstract class ActionsCardCommon if ($conf->global->MAIN_MULTILANGS) { - require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); //$s=picto_from_langcode($this->default_lang); //print ($s?$s.' ':''); $langs->load("languages"); diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php index 0881b001d89..932f0cf48a7 100644 --- a/htdocs/societe/checkvat/checkVatPopup.php +++ b/htdocs/societe/checkvat/checkVatPopup.php @@ -61,7 +61,7 @@ else // Set the WebService URL dol_syslog("Create nusoap_client for URL=".$WS_DOL_URL." WSDL=".$WS_DOL_URL_WSDL); - require_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); $params=getSoapParams(); //ini_set('default_socket_timeout', $params['response_timeout']); //$soapclient = new SoapClient($WS_DOL_URL_WSDL,$params); diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 8bbb93c8c18..068b864bd64 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -376,7 +376,7 @@ class Societe extends CommonObject */ function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update') { - require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); global $langs,$conf; diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index 8f8d2e7581d..b7fcf2320ce 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load("companies"); diff --git a/htdocs/societe/info.php b/htdocs/societe/info.php index bf33f5fba9a..d299c86991c 100644 --- a/htdocs/societe/info.php +++ b/htdocs/societe/info.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index cd1f6eb26e7..1947ec779c1 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -29,7 +29,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); @@ -100,7 +100,7 @@ if (empty($reshook)) if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"]) && ($action == 'add' || $action == 'update') && $user->rights->societe->creer) { - require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); if ($action == 'update') $object->fetch($socid); else $object->canvas=$canvas; @@ -1700,7 +1700,7 @@ else // Default language if ($conf->global->MAIN_MULTILANGS) { - require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); print ''.$langs->trans("DefaultLang").''; //$s=picto_from_langcode($object->default_lang); //print ($s?$s.' ':''); diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 9f144f94570..97625b31622 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1229,7 +1229,7 @@ class User extends CommonObject function setPassword($user, $password='', $changelater=0, $notrigger=0, $nosyncmember=0) { global $conf, $langs; - require_once(DOL_DOCUMENT_ROOT ."/lib/security.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/security.lib.php"); $error=0; diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 43a64074586..cad5412cb7c 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -30,7 +30,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); if ($conf->ldap->enabled) require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); diff --git a/htdocs/user/info.php b/htdocs/user/info.php index dc5f9fc1644..934a54ee5e5 100644 --- a/htdocs/user/info.php +++ b/htdocs/user/info.php @@ -22,7 +22,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/usergroups.lib.php'); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 395224478e8..daf788b10c3 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -22,7 +22,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); diff --git a/htdocs/webservices/server_other.php b/htdocs/webservices/server_other.php index a12db69dcfd..187a4ff67be 100644 --- a/htdocs/webservices/server_other.php +++ b/htdocs/webservices/server_other.php @@ -28,7 +28,7 @@ require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); dol_syslog("Call Dolibarr webservices interfaces"); diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php index 3b9756c21fc..fcd4080239a 100755 --- a/test/phpunit/SecurityTest.php +++ b/test/phpunit/SecurityTest.php @@ -28,7 +28,7 @@ global $conf,$user,$langs,$db; require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/lib/functions.lib.php'; -require_once dirname(__FILE__).'/../../htdocs/lib/security.lib.php'; +require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php'; if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); From 5d516b6ffedb15a4c6cab7292ea5216c9ddc035f Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Oct 2011 10:48:36 +0200 Subject: [PATCH 20/41] [task #216] Move lib in core directory --- htdocs/adherents/card_subscriptions.php | 2 +- htdocs/adherents/class/adherent.class.php | 2 +- htdocs/admin/agenda_extsites.php | 2 +- htdocs/admin/company.php | 2 +- htdocs/admin/system/dolibarr.php | 2 +- htdocs/comm/action/class/actioncomm.class.php | 2 +- htdocs/comm/action/index.php | 2 +- htdocs/comm/action/listactions.php | 2 +- htdocs/comm/fiche.php | 2 +- htdocs/compta/charges/index.php | 2 +- htdocs/compta/facture.php | 2 +- htdocs/compta/facture/class/facturestats.class.php | 2 +- htdocs/compta/journal/purchasesjournal.php | 2 +- htdocs/compta/journal/sellsjournal.php | 2 +- htdocs/compta/resultat/clientfourn.php | 2 +- htdocs/compta/stats/cabyuser.php | 2 +- htdocs/compta/stats/casoc.php | 2 +- htdocs/compta/tva/clients.php | 2 +- htdocs/compta/tva/index.php | 2 +- htdocs/compta/tva/quadri_detail.php | 2 +- htdocs/contact/perso.php | 2 +- htdocs/contrat/fiche.php | 2 +- htdocs/core/class/html.form.class.php | 2 +- htdocs/core/class/html.formother.class.php | 2 +- htdocs/{ => core}/lib/accountancy.lib.php | 2 +- htdocs/{ => core}/lib/date.lib.php | 2 +- htdocs/fichinter/fiche.php | 2 +- htdocs/fichinter/list.php | 2 +- htdocs/fourn/facture/index.php | 2 +- htdocs/includes/modules/action/rapport.pdf.php | 2 +- htdocs/includes/modules/fichinter/pdf_soleil.modules.php | 2 +- htdocs/includes/modules/modAdherent.class.php | 2 +- htdocs/includes/modules/rapport/pdf_paiement.class.php | 2 +- htdocs/lib/xcal.lib.php | 2 +- htdocs/product/stock/mouvement.php | 2 +- htdocs/projet/activity/index.php | 2 +- htdocs/projet/activity/list.php | 2 +- htdocs/projet/ganttview.php | 2 +- htdocs/projet/tasks.php | 2 +- htdocs/projet/tasks/index.php | 2 +- htdocs/projet/tasks/time.php | 2 +- scripts/members/sync_members_ldap2dolibarr.php | 2 +- test/phpunit/DateLibTest.php | 2 +- test/phpunit/WebservicesTest.php | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) rename htdocs/{ => core}/lib/accountancy.lib.php (97%) rename htdocs/{ => core}/lib/date.lib.php (99%) diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index e9e065125b7..445c7d302c2 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -25,7 +25,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.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/cotisation.class.php"); diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index abb0f0c2882..5f2bee45e27 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); /** diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index 6426c4f6c7a..ef059cbf9a7 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'); require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 76dd1dd6780..bca3360c3e8 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 31bdfcaf388..5b577d19a7d 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -23,7 +23,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/memory.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("admin"); $langs->load("install"); diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index a6672adfa93..0b79eca3148 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -666,7 +666,7 @@ class ActionComm extends CommonObject global $conf,$langs,$dolibarr_main_url_root,$mysoc; require_once (DOL_DOCUMENT_ROOT ."/lib/xcal.lib.php"); - require_once (DOL_DOCUMENT_ROOT ."/lib/date.lib.php"); + require_once (DOL_DOCUMENT_ROOT ."/core/lib/date.lib.php"); dol_syslog(get_class($this)."::build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG); diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 700c5569916..04206aa10a3 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -29,7 +29,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.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."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 54aed0cbd15..d5f27126969 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -27,7 +27,7 @@ require("../../main.inc.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."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 67396ee432e..7f83244c5fb 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -29,7 +29,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 2c358e51edc..dd2f719f360 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/paymentsocialcontribution.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("compta"); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index e8a07835aa0..7926805d3bc 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -36,7 +36,7 @@ require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.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.'/lib/project.lib.php'); diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php index c4fc13c00a5..4335d21855f 100644 --- a/htdocs/compta/facture/class/facturestats.class.php +++ b/htdocs/compta/facture/class/facturestats.class.php @@ -25,7 +25,7 @@ include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; include_once DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php"; include_once DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.facture.class.php"; -include_once DOL_DOCUMENT_ROOT . "/lib/date.lib.php"; +include_once DOL_DOCUMENT_ROOT . "/core/lib/date.lib.php"; /** * \class FactureStats diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index 66964796dae..c9efde9acb6 100755 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); $langs->load("companies"); diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index 1ead0d71a72..602949ec724 100755 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 04557e00b8b..8b40189a080 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("bills"); diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index 7ad351bb118..4a123777bd4 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -25,7 +25,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); // Security check $socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index 5b26de3791b..edeea1495ec 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -26,7 +26,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("companies"); diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 46f2c91caf4..6f9f1ad981e 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -27,7 +27,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); $langs->load("bills"); diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index a84d800164a..f4819240fe1 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -26,7 +26,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("other"); diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 6a16a19ce73..d3348cfbf08 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -28,7 +28,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 7de2f333936..2c37327330b 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -199,7 +199,7 @@ else // Date To Birth if ($contact->birthday != '') { - include_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); print ''.$langs->trans("DateToBirth").''.dol_print_date($contact->birthday,"day"); diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 6710aa0f0bf..4f95788c0dc 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -26,7 +26,7 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/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."/includes/modules/contract/modules_contract.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 6e7de839e06..c7e2d98c8f1 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3238,7 +3238,7 @@ class Form { if ($iSecond) { - require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $hourSelected = ConvertSecondToTime($iSecond,'hour'); $minSelected = ConvertSecondToTime($iSecond,'min'); diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 4689ff37c2b..442559bb851 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -560,7 +560,7 @@ class FormOther */ function select_month($selected='',$htmlname='monthid',$useempty=0) { - require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $month = monthArrayOrSelected(-1); // Get array diff --git a/htdocs/lib/accountancy.lib.php b/htdocs/core/lib/accountancy.lib.php similarity index 97% rename from htdocs/lib/accountancy.lib.php rename to htdocs/core/lib/accountancy.lib.php index 248db7b5ed7..a1500797866 100644 --- a/htdocs/lib/accountancy.lib.php +++ b/htdocs/core/lib/accountancy.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/accountancy.lib.php + * \file htdocs/core/lib/accountancy.lib.php * \brief Library of accountancy functions */ diff --git a/htdocs/lib/date.lib.php b/htdocs/core/lib/date.lib.php similarity index 99% rename from htdocs/lib/date.lib.php rename to htdocs/core/lib/date.lib.php index 1ff08b2a32c..e368943cced 100644 --- a/htdocs/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/lib/date.lib.php + * \file htdocs/core/lib/date.lib.php * \brief Set of function to manipulate dates */ diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index c363ebe24df..5535aeaffba 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -29,7 +29,7 @@ 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."/includes/modules/fichinter/modules_fichinter.php"); require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); if ($conf->projet->enabled) { require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 1599895b62c..52d07817a06 100755 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("companies"); $langs->load("interventions"); diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index 74403679d83..0fe0af9422c 100644 --- a/htdocs/fourn/facture/index.php +++ b/htdocs/fourn/facture/index.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); if (!$user->rights->fournisseur->facture->lire) accessforbidden(); diff --git a/htdocs/includes/modules/action/rapport.pdf.php b/htdocs/includes/modules/action/rapport.pdf.php index b4dbcc02486..75fab77c5a3 100644 --- a/htdocs/includes/modules/action/rapport.pdf.php +++ b/htdocs/includes/modules/action/rapport.pdf.php @@ -25,7 +25,7 @@ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); /** diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index e7cb9256dcd..f254181b748 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); /** diff --git a/htdocs/includes/modules/modAdherent.class.php b/htdocs/includes/modules/modAdherent.class.php index b52c26b60ce..a9e3ccf0ace 100644 --- a/htdocs/includes/modules/modAdherent.class.php +++ b/htdocs/includes/modules/modAdherent.class.php @@ -205,7 +205,7 @@ class modAdherent extends DolibarrModules $r=0; $now=dol_now(); - require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $r++; $this->import_code[$r]=$this->rights_class.'_'.$r; diff --git a/htdocs/includes/modules/rapport/pdf_paiement.class.php b/htdocs/includes/modules/rapport/pdf_paiement.class.php index 8b05950d414..584cf0a0f30 100644 --- a/htdocs/includes/modules/rapport/pdf_paiement.class.php +++ b/htdocs/includes/modules/rapport/pdf_paiement.class.php @@ -74,7 +74,7 @@ class pdf_paiement */ function write_file($_dir, $month, $year, $outputlangs) { - include_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); global $user,$langs,$conf; diff --git a/htdocs/lib/xcal.lib.php b/htdocs/lib/xcal.lib.php index d40c0dfa723..e26f04bfa6d 100644 --- a/htdocs/lib/xcal.lib.php +++ b/htdocs/lib/xcal.lib.php @@ -44,7 +44,7 @@ function build_calfile($format,$title,$desc,$events_array,$outputfile) $calfileh=fopen($outputfile,'w'); if ($calfileh) { - include_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); $now=dol_now(); $encoding=''; diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 57ac3354853..cb7a9162f74 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("products"); $langs->load("stocks"); diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index d1252ed31cd..1bc200e92c5 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -27,7 +27,7 @@ require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $mine = $_REQUEST['mode']=='mine' ? 1 : 0; diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php index 83168a5435b..b109004ab83 100644 --- a/htdocs/projet/activity/list.php +++ b/htdocs/projet/activity/list.php @@ -28,7 +28,7 @@ require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load('projects'); diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 62aa7cf5b67..789dba883d4 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -27,7 +27,7 @@ require ("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); $projectid=isset($_REQUEST["id"])?$_REQUEST["id"]:$_POST["id"]; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index cd69514b32f..345c161c4d6 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -27,7 +27,7 @@ require ("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); $mine = $_REQUEST['mode']=='mine' ? 1 : 0; diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php index 7eeddae234c..335d8622869 100644 --- a/htdocs/projet/tasks/index.php +++ b/htdocs/projet/tasks/index.php @@ -27,7 +27,7 @@ require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load('projects'); $langs->load('users'); diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 55e249445ec..4aab61e1a62 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -28,7 +28,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load('projects'); diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php index 1a66df276ab..2f4b74ba291 100644 --- a/scripts/members/sync_members_ldap2dolibarr.php +++ b/scripts/members/sync_members_ldap2dolibarr.php @@ -42,7 +42,7 @@ $forcecommit=0; require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php index 9e99b77bd98..10eb4ce85e5 100644 --- a/test/phpunit/DateLibTest.php +++ b/test/phpunit/DateLibTest.php @@ -27,7 +27,7 @@ global $conf,$user,$langs,$db; //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; -require_once dirname(__FILE__).'/../../htdocs/lib/date.lib.php'; +require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; if (empty($user->id)) { diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php index cfc9b80d94c..6b459bc29a0 100755 --- a/test/phpunit/WebservicesTest.php +++ b/test/phpunit/WebservicesTest.php @@ -27,7 +27,7 @@ global $conf,$user,$langs,$db; //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; -require_once dirname(__FILE__).'/../../htdocs/lib/date.lib.php'; +require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP From 63d60a33fce15a9460bc27083a662203e999f7fb Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Oct 2011 11:25:54 +0200 Subject: [PATCH 21/41] [task #216] Move lib in core directory --- htdocs/adherents/admin/adherent.php | 2 +- htdocs/adherents/admin/adherent_extrafields.php | 2 +- htdocs/adherents/admin/public.php | 4 ++-- htdocs/adherents/card_subscriptions.php | 2 +- htdocs/adherents/class/adherent.class.php | 2 +- htdocs/adherents/fiche.php | 2 +- htdocs/admin/accounting.php | 2 +- htdocs/admin/agenda.php | 4 ++-- htdocs/admin/agenda_extsites.php | 6 +++--- htdocs/admin/agenda_xcal.php | 4 ++-- htdocs/admin/barcode.php | 2 +- htdocs/admin/boxes.php | 2 +- htdocs/admin/clicktodial.php | 2 +- htdocs/admin/commande.php | 2 +- htdocs/admin/company.php | 6 +++--- htdocs/admin/compta.php | 2 +- htdocs/admin/confexped.php | 2 +- htdocs/admin/const.php | 2 +- htdocs/admin/contract.php | 2 +- htdocs/admin/delais.php | 2 +- htdocs/admin/dict.php | 2 +- htdocs/admin/dons.php | 2 +- htdocs/admin/events.php | 4 ++-- htdocs/admin/expedition.php | 2 +- htdocs/admin/external_rss.php | 2 +- htdocs/admin/facture.php | 2 +- htdocs/admin/fckeditor.php | 2 +- htdocs/admin/fichinter.php | 2 +- htdocs/admin/fournisseur.php | 2 +- htdocs/admin/geoipmaxmind.php | 2 +- htdocs/admin/ihm.php | 2 +- htdocs/admin/ldap.php | 2 +- htdocs/admin/ldap_contacts.php | 2 +- htdocs/admin/ldap_groups.php | 2 +- htdocs/admin/ldap_members.php | 2 +- htdocs/admin/ldap_users.php | 2 +- htdocs/admin/limits.php | 2 +- htdocs/admin/livraison.php | 2 +- htdocs/admin/mailing.php | 2 +- htdocs/admin/mails.php | 2 +- htdocs/admin/menus.php | 4 ++-- htdocs/admin/menus/other.php | 2 +- htdocs/admin/modules.php | 2 +- htdocs/admin/notification.php | 2 +- htdocs/admin/pdf.php | 2 +- htdocs/admin/perms.php | 2 +- htdocs/admin/prelevement.php | 2 +- htdocs/admin/project.php | 2 +- htdocs/admin/propale.php | 2 +- htdocs/admin/proxy.php | 2 +- htdocs/admin/security.php | 2 +- htdocs/admin/security_other.php | 2 +- htdocs/admin/sms.php | 2 +- htdocs/admin/stock.php | 2 +- htdocs/admin/syslog.php | 2 +- htdocs/admin/system/dolibarr.php | 2 +- htdocs/admin/taxes.php | 2 +- htdocs/admin/tools/export.php | 2 +- htdocs/admin/tools/listsessions.php | 2 +- htdocs/admin/user.php | 2 +- htdocs/admin/workflow.php | 2 +- htdocs/bookmarks/admin/bookmark.php | 2 +- htdocs/boutique/admin/boutique.php | 2 +- htdocs/cashdesk/admin/cashdesk.php | 2 +- htdocs/categories/categorie.php | 2 +- htdocs/categories/photos.php | 2 +- htdocs/categories/viewcat.php | 2 +- htdocs/comm/action/class/actioncomm.class.php | 2 +- htdocs/comm/action/document.php | 2 +- htdocs/comm/action/fiche.php | 2 +- htdocs/comm/action/index.php | 4 ++-- htdocs/comm/action/info.php | 2 +- htdocs/comm/action/listactions.php | 4 ++-- htdocs/comm/address.php | 2 +- htdocs/comm/fiche.php | 4 ++-- htdocs/comm/index.php | 2 +- htdocs/comm/multiprix.php | 2 +- htdocs/comm/prospect/fiche.php | 2 +- htdocs/comm/prospect/index.php | 2 +- htdocs/comm/prospect/recap-prospect.php | 2 +- htdocs/comm/recap-client.php | 2 +- htdocs/comm/remise.php | 2 +- htdocs/comm/remx.php | 2 +- htdocs/compta/bank/account.php | 2 +- htdocs/compta/bank/admin/bank.php | 2 +- htdocs/compta/bank/annuel.php | 2 +- htdocs/compta/bank/bankid_fr.php | 4 ++-- htdocs/compta/bank/class/account.class.php | 6 +++--- htdocs/compta/bank/fiche.php | 4 ++-- htdocs/compta/bank/graph.php | 2 +- htdocs/compta/bank/index.php | 2 +- htdocs/compta/bank/rappro.php | 2 +- htdocs/compta/bank/releve.php | 2 +- htdocs/compta/bank/search.php | 2 +- htdocs/compta/bank/treso.php | 2 +- htdocs/compta/bank/virement.php | 2 +- htdocs/compta/charges/index.php | 2 +- htdocs/compta/facture.php | 2 +- htdocs/compta/facture/class/facturestats.class.php | 2 +- htdocs/compta/journal/purchasesjournal.php | 2 +- htdocs/compta/journal/sellsjournal.php | 2 +- htdocs/compta/prelevement/create.php | 2 +- htdocs/compta/recap-compta.php | 2 +- htdocs/compta/resultat/clientfourn.php | 2 +- htdocs/compta/stats/cabyuser.php | 2 +- htdocs/compta/stats/casoc.php | 2 +- htdocs/compta/tva/clients.php | 2 +- htdocs/compta/tva/index.php | 2 +- htdocs/compta/tva/quadri_detail.php | 2 +- htdocs/contact/fiche.php | 2 +- htdocs/contact/perso.php | 2 +- htdocs/contrat/fiche.php | 2 +- htdocs/{lib => core}/admin_extrafields.inc.php | 2 +- htdocs/core/ajaxconstantonoff.php | 2 +- htdocs/core/class/html.form.class.php | 2 +- htdocs/core/class/html.formother.class.php | 2 +- htdocs/{ => core}/lib/accountancy.lib.php | 2 +- htdocs/{ => core}/lib/admin.lib.php | 2 +- htdocs/{ => core}/lib/agenda.lib.php | 2 +- htdocs/{ => core}/lib/bank.lib.php | 2 +- htdocs/{ => core}/lib/bookmark.lib.php | 2 +- htdocs/{ => core}/lib/categories.lib.php | 2 +- htdocs/{ => core}/lib/company.lib.php | 2 +- htdocs/{ => core}/lib/date.lib.php | 2 +- htdocs/externalsite/admin/externalsite.php | 2 +- htdocs/fichinter/fiche.php | 2 +- htdocs/fichinter/list.php | 2 +- htdocs/fourn/facture/index.php | 2 +- htdocs/fourn/fiche.php | 2 +- htdocs/fourn/recap-fourn.php | 2 +- htdocs/ftp/admin/ftpclient.php | 2 +- htdocs/includes/modules/DolibarrModules.class.php | 2 +- htdocs/includes/modules/action/rapport.pdf.php | 4 ++-- htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php | 2 +- htdocs/includes/modules/commande/pdf_edison.modules.php | 2 +- htdocs/includes/modules/commande/pdf_einstein.modules.php | 2 +- htdocs/includes/modules/dons/html_cerfafr.modules.php | 2 +- .../modules/expedition/pdf/pdf_expedition_merou.modules.php | 2 +- .../expedition/pdf/pdf_expedition_rouget.modules.php | 2 +- .../modules/facture/doc/doc_generic_invoice_odt.modules.php | 2 +- htdocs/includes/modules/facture/doc/pdf_crabe.modules.php | 2 +- htdocs/includes/modules/facture/doc/pdf_oursin.modules.php | 2 +- htdocs/includes/modules/fichinter/pdf_soleil.modules.php | 4 ++-- .../includes/modules/livraison/pdf/pdf_sirocco.modules.php | 2 +- .../includes/modules/livraison/pdf/pdf_typhon.modules.php | 2 +- htdocs/includes/modules/modAdherent.class.php | 2 +- htdocs/includes/modules/project/pdf/pdf_baleine.modules.php | 2 +- .../includes/modules/propale/pdf_propale_azur.modules.php | 2 +- .../includes/modules/propale/pdf_propale_jaune.modules.php | 2 +- htdocs/includes/modules/rapport/pdf_paiement.class.php | 4 ++-- .../modules/societe/doc/doc_generic_odt.modules.php | 2 +- .../modules/supplier_invoice/pdf/pdf_canelle.modules.php | 2 +- .../modules/supplier_order/pdf/pdf_muscadet.modules.php | 2 +- htdocs/install/check.php | 4 ++-- htdocs/install/etape2.php | 2 +- htdocs/install/etape4.php | 2 +- htdocs/install/etape5.php | 2 +- htdocs/install/inc.php | 2 +- htdocs/install/repair.php | 2 +- htdocs/install/upgrade.php | 2 +- htdocs/lib/xcal.lib.php | 2 +- htdocs/main.inc.php | 2 +- htdocs/master.inc.php | 2 +- htdocs/paybox/admin/paybox.php | 2 +- htdocs/paypal/admin/paypal.php | 2 +- htdocs/product/admin/produit.php | 2 +- htdocs/product/class/product.class.php | 2 +- htdocs/product/fiche.php | 2 +- htdocs/product/stock/mouvement.php | 2 +- htdocs/projet/activity/index.php | 2 +- htdocs/projet/activity/list.php | 2 +- htdocs/projet/ganttview.php | 2 +- htdocs/projet/tasks.php | 2 +- htdocs/projet/tasks/index.php | 2 +- htdocs/projet/tasks/time.php | 2 +- htdocs/public/members/new.php | 2 +- htdocs/public/paybox/newpayment.php | 2 +- htdocs/public/paybox/paymentko.php | 2 +- htdocs/public/paybox/paymentok.php | 2 +- htdocs/public/paypal/newpayment.php | 2 +- htdocs/public/paypal/paymentko.php | 2 +- htdocs/public/paypal/paymentok.php | 2 +- htdocs/societe/admin/societe.php | 4 ++-- htdocs/societe/admin/societe_extrafields.php | 4 ++-- htdocs/societe/agenda.php | 2 +- htdocs/societe/checkvat/checkVatPopup.php | 2 +- htdocs/societe/commerciaux.php | 2 +- htdocs/societe/document.php | 2 +- htdocs/societe/info.php | 2 +- htdocs/societe/lien.php | 2 +- htdocs/societe/notify/fiche.php | 2 +- htdocs/societe/rib.php | 4 ++-- htdocs/societe/soc.php | 2 +- htdocs/societe/socnote.php | 2 +- htdocs/support/inc.php | 2 +- htdocs/webservices/admin/webservices.php | 2 +- htdocs/webservices/server_productorservice.php | 2 +- scripts/members/sync_members_ldap2dolibarr.php | 2 +- test/phpunit/DateLibTest.php | 2 +- test/phpunit/WebservicesTest.php | 2 +- 200 files changed, 223 insertions(+), 223 deletions(-) rename htdocs/{lib => core}/admin_extrafields.inc.php (98%) rename htdocs/{ => core}/lib/accountancy.lib.php (97%) rename htdocs/{ => core}/lib/admin.lib.php (99%) rename htdocs/{ => core}/lib/agenda.lib.php (99%) rename htdocs/{ => core}/lib/bank.lib.php (99%) rename htdocs/{ => core}/lib/bookmark.lib.php (97%) rename htdocs/{ => core}/lib/categories.lib.php (97%) rename htdocs/{ => core}/lib/company.lib.php (99%) rename htdocs/{ => core}/lib/date.lib.php (99%) diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index 8d2ac7a9d70..0d2da719ae8 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -28,7 +28,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); $langs->load("admin"); diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index 8615877fefb..6086021f0cd 100755 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -52,7 +52,7 @@ if (!$user->admin) accessforbidden(); * Actions */ -require(DOL_DOCUMENT_ROOT."/lib/admin_extrafields.inc.php"); +require(DOL_DOCUMENT_ROOT."/core/admin_extrafields.inc.php"); diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php index 69e038492c6..6f4bafd5139 100755 --- a/htdocs/adherents/admin/public.php +++ b/htdocs/adherents/admin/public.php @@ -25,8 +25,8 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); $langs->load("members"); diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index e9e065125b7..445c7d302c2 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -25,7 +25,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.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/cotisation.class.php"); diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index abb0f0c2882..5f2bee45e27 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); /** diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 219a95d01a1..96adf248ab4 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -26,7 +26,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); diff --git a/htdocs/admin/accounting.php b/htdocs/admin/accounting.php index c860747533e..64c011622d6 100644 --- a/htdocs/admin/accounting.php +++ b/htdocs/admin/accounting.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load('admin'); $langs->load('compta'); diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php index 0a13ad70362..3d175a27d86 100644 --- a/htdocs/admin/agenda.php +++ b/htdocs/admin/agenda.php @@ -24,8 +24,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index 6426c4f6c7a..95c561e82af 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -23,11 +23,11 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index 06d52f46065..3d370927fe9 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -22,8 +22,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/agenda.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'); if (!$user->admin) diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 6db0f3bf8ad..db838c9b7f7 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 83c6091e53b..3a6ad26b40c 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -24,7 +24,7 @@ require("../main.inc.php"); include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); -include_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +include_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php index 909a7978024..c2d5590413b 100644 --- a/htdocs/admin/clicktodial.php +++ b/htdocs/admin/clicktodial.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index a4ba25d7d1a..2ad6ec754da 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -29,7 +29,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); $langs->load("admin"); diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 76dd1dd6780..e26f56e088b 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -25,9 +25,9 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index af9f54ee7dc..ac4a620a9e6 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load('admin'); $langs->load('compta'); diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php index 8920fee2885..ec3415f339f 100644 --- a/htdocs/admin/confexped.php +++ b/htdocs/admin/confexped.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("sendings"); diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 38ed35e425b..86fc8eaa77c 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 4d23e5bb371..285887d15ba 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -22,7 +22,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'); $langs->load("admin"); diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php index 01c1687d310..14b16f69f49 100644 --- a/htdocs/admin/delais.php +++ b/htdocs/admin/delais.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("orders"); diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 71a4c7169ab..8999bfd13e9 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -30,7 +30,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("other"); $langs->load("admin"); diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php index 8daeb4cb2c2..632f4a9ac5b 100644 --- a/htdocs/admin/dons.php +++ b/htdocs/admin/dons.php @@ -21,7 +21,7 @@ * \brief Page d'administration/configuration du module Dons */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index de37e973886..df875865a85 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -22,8 +22,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/events.class.php"); diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index c6423d0832b..245a4ea1146 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -28,7 +28,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'); $langs->load("admin"); diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php index a7ee6e67a56..8869aee5e08 100644 --- a/htdocs/admin/external_rss.php +++ b/htdocs/admin/external_rss.php @@ -28,7 +28,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/rssparser.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 11027a0ccda..4530485501a 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -26,7 +26,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); $langs->load("admin"); diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php index a062d686e15..4dda6f392dd 100644 --- a/htdocs/admin/fckeditor.php +++ b/htdocs/admin/fckeditor.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index fad66ceae73..5b454bfcb0d 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -28,7 +28,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'); $langs->load("admin"); diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php index 9d3da300fa9..d62024293bc 100644 --- a/htdocs/admin/fournisseur.php +++ b/htdocs/admin/fournisseur.php @@ -28,7 +28,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php index 48a61111cde..f2a4e3c7fba 100644 --- a/htdocs/admin/geoipmaxmind.php +++ b/htdocs/admin/geoipmaxmind.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgeoip.class.php"); // Security check diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 214aa7cafe1..11b8261b2ee 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -24,7 +24,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index e9346abc5d2..c770c432b2f 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index b051abbce02..5c1b747af73 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.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."/contact/class/contact.class.php"); diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index 615e172c80f..3120d780c36 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index 57688b35b91..1f70702df13 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.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."/core/class/ldap.class.php"); diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index c8b9946ba87..cef4be73072 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index b7a50ac0406..4244a56be9d 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/price.lib.php"); $langs->load("companies"); diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 3d2d4ef62e9..6a5a6819bf0 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -27,7 +27,7 @@ * \brief Page d'administration/configuration du module Livraison */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php index 9b5d6319e27..c86c5d1e02e 100644 --- a/htdocs/admin/mailing.php +++ b/htdocs/admin/mailing.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("mails"); diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index f1513907cda..5231c0c6235 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -22,7 +22,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); $langs->load("companies"); diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index e4ff9c16906..54542b98095 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -24,9 +24,9 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("companies"); diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php index 1e54ee2f2fa..0d200a99f85 100644 --- a/htdocs/admin/menus/other.php +++ b/htdocs/admin/menus/other.php @@ -22,7 +22,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("users"); $langs->load("admin"); diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 82c110aecbe..c51b14859dc 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -26,7 +26,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("errors"); $langs->load("admin"); diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index 73db19d4d61..6f5eec72b5b 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/includes/triggers/interface_modNotification_Notification.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 2e5b758c109..7ec878ce5a7 100755 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -24,7 +24,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index c9ed93052fe..67a1792142e 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("users"); diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 5ef95680a74..aea33be39a3 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -26,7 +26,7 @@ require('../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/project.php b/htdocs/admin/project.php index e837687884f..321bb024b42 100644 --- a/htdocs/admin/project.php +++ b/htdocs/admin/project.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); require_once(DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'); diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php index ab2c42c46d3..63ba2e37ca7 100644 --- a/htdocs/admin/propale.php +++ b/htdocs/admin/propale.php @@ -29,7 +29,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); $langs->load("admin"); diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 09a412cf082..e5d36d3e2fa 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -22,7 +22,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load("users"); diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index 01f1f7b714c..142bb63e919 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("users"); $langs->load("admin"); diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index f79af4b7e06..7ec5d5ef5d8 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load("users"); diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index 4d58e3f5756..efdcde116f6 100755 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -22,7 +22,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("companies"); $langs->load("products"); diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 079937d980d..3afe13683b8 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -23,7 +23,7 @@ * \brief Page d'administration/configuration du module gestion de stock */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("stocks"); diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 04950a51eb0..41388960bea 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 31bdfcaf388..5b577d19a7d 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -23,7 +23,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/memory.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("admin"); $langs->load("install"); diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php index 995186ce6a7..64faead5fc2 100644 --- a/htdocs/admin/taxes.php +++ b/htdocs/admin/taxes.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load('admin'); diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index 23a0b436d81..aa3c0260424 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -21,7 +21,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/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/class/html.formfile.class.php"); diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php index 4898e0ff578..9c61f6bc278 100644 --- a/htdocs/admin/tools/listsessions.php +++ b/htdocs/admin/tools/listsessions.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/admin.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'); $langs->load("install"); diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php index 1985ae219a7..c23310571e9 100644 --- a/htdocs/admin/user.php +++ b/htdocs/admin/user.php @@ -27,7 +27,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("members"); diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php index 0344c2c033c..2f9b43c57db 100755 --- a/htdocs/admin/workflow.php +++ b/htdocs/admin/workflow.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("workflow"); diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php index e5ed939779a..acb7689d80b 100644 --- a/htdocs/bookmarks/admin/bookmark.php +++ b/htdocs/bookmarks/admin/bookmark.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); diff --git a/htdocs/boutique/admin/boutique.php b/htdocs/boutique/admin/boutique.php index a02a1ca145f..ce5e070b402 100644 --- a/htdocs/boutique/admin/boutique.php +++ b/htdocs/boutique/admin/boutique.php @@ -26,7 +26,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("oscommerce"); diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php index 4580e01e959..c879523ec27 100644 --- a/htdocs/cashdesk/admin/cashdesk.php +++ b/htdocs/cashdesk/admin/cashdesk.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); // If socid provided by ajax company selector diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index c5ead2e504d..9e822d2b465 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -175,7 +175,7 @@ $html = new Form($db); */ if ($socid) { - require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); $langs->load("companies"); diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index 56d2d844204..82f7b742bb3 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/categories.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/categories.lib.php"); $langs->load("categories"); $langs->load("bills"); diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index c1bb3b9739d..80c9cac9e06 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -26,7 +26,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/categories.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/categories.lib.php"); $langs->load("categories"); diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index a6672adfa93..0b79eca3148 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -666,7 +666,7 @@ class ActionComm extends CommonObject global $conf,$langs,$dolibarr_main_url_root,$mysoc; require_once (DOL_DOCUMENT_ROOT ."/lib/xcal.lib.php"); - require_once (DOL_DOCUMENT_ROOT ."/lib/date.lib.php"); + require_once (DOL_DOCUMENT_ROOT ."/core/lib/date.lib.php"); dol_syslog(get_class($this)."::build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG); diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 96185f80627..4e5ebb4003d 100755 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -26,7 +26,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +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."/comm/action/class/cactioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index a89e146499c..1b4ff95ec73 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -26,7 +26,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +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."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php"); diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 700c5569916..b37f2d91ce6 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -29,8 +29,8 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.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."/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $filter=GETPOST("filter"); diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php index 78fa56ac4aa..fe2781fcdf5 100644 --- a/htdocs/comm/action/info.php +++ b/htdocs/comm/action/info.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.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."/comm/action/class/cactioncomm.class.php"); diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 54aed0cbd15..adfa2577238 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -27,8 +27,8 @@ require("../../main.inc.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."/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $langs->load("companies"); diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index 0ef8b32d49b..f3a04d23eb2 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/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."/societe/class/address.class.php"); diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 67396ee432e..40314836c4b 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -28,8 +28,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 1d8320fcfe3..234ffddbfcd 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/client.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index a42babb571e..3d9ed3de3b6 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); $langs->load("orders"); diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 47463460abe..3e99e1addef 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -24,7 +24,7 @@ */ require_once("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/prospect/class/prospect.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 278e25a20c7..b93c0706b4a 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); $langs->load("propal"); diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php index 57fb8e5e338..32347362e09 100644 --- a/htdocs/comm/prospect/recap-prospect.php +++ b/htdocs/comm/prospect/recap-prospect.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); $langs->load("companies"); diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php index 270499378f4..9ef8ffceb89 100644 --- a/htdocs/comm/recap-client.php +++ b/htdocs/comm/recap-client.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); $langs->load("companies"); diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index 2722ae7b426..abfb5005972 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); $langs->load("companies"); diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index e6b79bc44bc..977f9000ff2 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/discount.class.php"); diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 2d56d33b3d8..e0bf60b204a 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -27,7 +27,7 @@ */ require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); diff --git a/htdocs/compta/bank/admin/bank.php b/htdocs/compta/bank/admin/bank.php index 4d1608b7bd2..0802a931d70 100644 --- a/htdocs/compta/bank/admin/bank.php +++ b/htdocs/compta/bank/admin/bank.php @@ -24,7 +24,7 @@ */ require("../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); $langs->load("admin"); diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index 154760a139c..77f188eb5c7 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // Security check diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 5c27ce120bd..346887d312d 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -25,8 +25,8 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); $langs->load("banks"); $langs->load("bills"); diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 40362bb5f70..602da307cc0 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -354,7 +354,7 @@ class Account extends CommonObject } // Chargement librairie pour acces fonction controle RIB - require_once DOL_DOCUMENT_ROOT.'/lib/bank.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; $now=dol_now(); @@ -510,7 +510,7 @@ class Account extends CommonObject global $conf,$langs; // Chargement librairie pour acces fonction controle RIB - require_once(DOL_DOCUMENT_ROOT.'/lib/bank.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'); dol_syslog("Account::update_bban $this->code_banque,$this->code_guichet,$this->number,$this->cle_rib,$this->iban"); @@ -915,7 +915,7 @@ class Account extends CommonObject */ function verif() { - require_once DOL_DOCUMENT_ROOT . '/lib/bank.lib.php'; + require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php'; // Call function to check BAN if (! checkBanForAccount($this)) diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 6b52b903aee..888f9c584b0 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -25,8 +25,8 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); $langs->load("banks"); diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index df4e557f6fa..df4f4f951c9 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index 4c04e7ecc7b..08aaad1c78d 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index fb8f2d98e69..301362dda1e 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 1affb418c16..0db2c4ec816 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); $langs->load("companies"); $langs->load("banks"); diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 0031fb2dae2..528111982e0 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/bankcateg.class.php"); diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 103b8bde928..6a6a1580f64 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index 4ec9e206e2a..8c6fc905e30 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); $langs->load("banks"); diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 2c358e51edc..dd2f719f360 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/paymentsocialcontribution.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("compta"); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index e8a07835aa0..7926805d3bc 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -36,7 +36,7 @@ require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.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.'/lib/project.lib.php'); diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php index c4fc13c00a5..4335d21855f 100644 --- a/htdocs/compta/facture/class/facturestats.class.php +++ b/htdocs/compta/facture/class/facturestats.class.php @@ -25,7 +25,7 @@ include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; include_once DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php"; include_once DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.facture.class.php"; -include_once DOL_DOCUMENT_ROOT . "/lib/date.lib.php"; +include_once DOL_DOCUMENT_ROOT . "/core/lib/date.lib.php"; /** * \class FactureStats diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index 66964796dae..c9efde9acb6 100755 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); $langs->load("companies"); diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index 1ead0d71a72..602949ec724 100755 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index e7a9098369b..fbf7535becf 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -27,7 +27,7 @@ require("../bank/pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("widthdrawals"); $langs->load("companies"); diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index 6cf731dfaa8..72771a20c8b 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -23,7 +23,7 @@ */ require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); $langs->load("companies"); diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 04557e00b8b..8b40189a080 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("bills"); diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index 7ad351bb118..4a123777bd4 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -25,7 +25,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); // Security check $socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index 5b26de3791b..edeea1495ec 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -26,7 +26,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("companies"); diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 46f2c91caf4..6f9f1ad981e 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -27,7 +27,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); $langs->load("bills"); diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index a84d800164a..f4819240fe1 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -26,7 +26,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("other"); diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 6a16a19ce73..d3348cfbf08 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -28,7 +28,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 3a1d829a777..9e30170a702 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -29,7 +29,7 @@ require("../main.inc.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."/lib/contact.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/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"); $langs->load("companies"); diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 7de2f333936..2c37327330b 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -199,7 +199,7 @@ else // Date To Birth if ($contact->birthday != '') { - include_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); print ''.$langs->trans("DateToBirth").''.dol_print_date($contact->birthday,"day"); diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 6710aa0f0bf..4f95788c0dc 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -26,7 +26,7 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/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."/includes/modules/contract/modules_contract.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); diff --git a/htdocs/lib/admin_extrafields.inc.php b/htdocs/core/admin_extrafields.inc.php similarity index 98% rename from htdocs/lib/admin_extrafields.inc.php rename to htdocs/core/admin_extrafields.inc.php index 1854d635b48..00d4e4cfa48 100644 --- a/htdocs/lib/admin_extrafields.inc.php +++ b/htdocs/core/admin_extrafields.inc.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/admin_extrafields.inc.php + * \file htdocs/core/admin_extrafields.inc.php * \brief Code for actions on extrafields admin pages */ diff --git a/htdocs/core/ajaxconstantonoff.php b/htdocs/core/ajaxconstantonoff.php index b7fcde0b2e7..65db9fb3ff8 100644 --- a/htdocs/core/ajaxconstantonoff.php +++ b/htdocs/core/ajaxconstantonoff.php @@ -28,7 +28,7 @@ if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); /* diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 6e7de839e06..c7e2d98c8f1 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3238,7 +3238,7 @@ class Form { if ($iSecond) { - require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $hourSelected = ConvertSecondToTime($iSecond,'hour'); $minSelected = ConvertSecondToTime($iSecond,'min'); diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 4689ff37c2b..442559bb851 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -560,7 +560,7 @@ class FormOther */ function select_month($selected='',$htmlname='monthid',$useempty=0) { - require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $month = monthArrayOrSelected(-1); // Get array diff --git a/htdocs/lib/accountancy.lib.php b/htdocs/core/lib/accountancy.lib.php similarity index 97% rename from htdocs/lib/accountancy.lib.php rename to htdocs/core/lib/accountancy.lib.php index 248db7b5ed7..a1500797866 100644 --- a/htdocs/lib/accountancy.lib.php +++ b/htdocs/core/lib/accountancy.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/accountancy.lib.php + * \file htdocs/core/lib/accountancy.lib.php * \brief Library of accountancy functions */ diff --git a/htdocs/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php similarity index 99% rename from htdocs/lib/admin.lib.php rename to htdocs/core/lib/admin.lib.php index 5f0fa2d4813..fcb88ee0ede 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/admin.lib.php + * \file htdocs/core/lib/admin.lib.php * \brief Library of admin functions */ diff --git a/htdocs/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php similarity index 99% rename from htdocs/lib/agenda.lib.php rename to htdocs/core/lib/agenda.lib.php index 8aa17c77c08..9be34529832 100644 --- a/htdocs/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/lib/agenda.lib.php + * \file htdocs/core/lib/agenda.lib.php * \brief Set of function for the agenda module */ diff --git a/htdocs/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php similarity index 99% rename from htdocs/lib/bank.lib.php rename to htdocs/core/lib/bank.lib.php index ccd931659e8..0ac206dea1f 100644 --- a/htdocs/lib/bank.lib.php +++ b/htdocs/core/lib/bank.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/bank.lib.php + * \file htdocs/core/lib/bank.lib.php * \brief Ensemble de fonctions de base pour le module banque * \ingroup banque */ diff --git a/htdocs/lib/bookmark.lib.php b/htdocs/core/lib/bookmark.lib.php similarity index 97% rename from htdocs/lib/bookmark.lib.php rename to htdocs/core/lib/bookmark.lib.php index ea87b9957c9..33bcfb97c50 100644 --- a/htdocs/lib/bookmark.lib.php +++ b/htdocs/core/lib/bookmark.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/bookmark.lib.php + * \file htdocs/core/lib/bookmark.lib.php * \brief List of functions for bookmark module */ diff --git a/htdocs/lib/categories.lib.php b/htdocs/core/lib/categories.lib.php similarity index 97% rename from htdocs/lib/categories.lib.php rename to htdocs/core/lib/categories.lib.php index 6d28390aaea..b2db2f04d3a 100644 --- a/htdocs/lib/categories.lib.php +++ b/htdocs/core/lib/categories.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/categories.lib.php + * \file htdocs/core/lib/categories.lib.php * \brief Ensemble de fonctions de base pour le module categorie * \ingroup categorie */ diff --git a/htdocs/lib/company.lib.php b/htdocs/core/lib/company.lib.php similarity index 99% rename from htdocs/lib/company.lib.php rename to htdocs/core/lib/company.lib.php index 602c6026bb2..16059e6fbe3 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/lib/company.lib.php + * \file htdocs/core/lib/company.lib.php * \brief Ensemble de fonctions de base pour le module societe * \ingroup societe */ diff --git a/htdocs/lib/date.lib.php b/htdocs/core/lib/date.lib.php similarity index 99% rename from htdocs/lib/date.lib.php rename to htdocs/core/lib/date.lib.php index 1ff08b2a32c..e368943cced 100644 --- a/htdocs/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/lib/date.lib.php + * \file htdocs/core/lib/date.lib.php * \brief Set of function to manipulate dates */ diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php index ea6a948f0e4..45fdf290314 100644 --- a/htdocs/externalsite/admin/externalsite.php +++ b/htdocs/externalsite/admin/externalsite.php @@ -27,7 +27,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); if (!$user->admin) diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index c363ebe24df..5535aeaffba 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -29,7 +29,7 @@ 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."/includes/modules/fichinter/modules_fichinter.php"); require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); if ($conf->projet->enabled) { require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 1599895b62c..52d07817a06 100755 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -27,7 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("companies"); $langs->load("interventions"); diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index 74403679d83..0fe0af9422c 100644 --- a/htdocs/fourn/facture/index.php +++ b/htdocs/fourn/facture/index.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); if (!$user->rights->fournisseur->facture->lire) accessforbidden(); diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index a8b19441f90..a9a45f3c432 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -29,7 +29,7 @@ require("../main.inc.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."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); $langs->load('suppliers'); diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php index 8d63eaa3f18..78b9f4fa290 100644 --- a/htdocs/fourn/recap-fourn.php +++ b/htdocs/fourn/recap-fourn.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); $langs->load("companies"); diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php index ce26f3f3ab2..353714bc5bb 100644 --- a/htdocs/ftp/admin/ftpclient.php +++ b/htdocs/ftp/admin/ftpclient.php @@ -23,7 +23,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); $langs->load("ftp"); diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index bb5e7745995..e2a667d07b8 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -492,7 +492,7 @@ abstract class DolibarrModules $error=0; - include_once(DOL_DOCUMENT_ROOT ."/lib/admin.lib.php"); + include_once(DOL_DOCUMENT_ROOT ."/core/lib/admin.lib.php"); $ok = 1; foreach($conf->file->dol_document_root as $dirroot) diff --git a/htdocs/includes/modules/action/rapport.pdf.php b/htdocs/includes/modules/action/rapport.pdf.php index b4dbcc02486..fd19bca4b20 100644 --- a/htdocs/includes/modules/action/rapport.pdf.php +++ b/htdocs/includes/modules/action/rapport.pdf.php @@ -25,8 +25,8 @@ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); /** * \class CommActionRapport diff --git a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php index 3acd5771307..ab1fee40f44 100644 --- a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php +++ b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php @@ -24,7 +24,7 @@ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/cheque/pdf/modules_chequereceipts.php"); diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index 587c5eb490f..688081802a3 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -26,7 +26,7 @@ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index c0dc9e8668f..4c79ca7a720 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/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.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/dons/html_cerfafr.modules.php b/htdocs/includes/modules/dons/html_cerfafr.modules.php index 64b8a301101..c4577c9a217 100644 --- a/htdocs/includes/modules/dons/html_cerfafr.modules.php +++ b/htdocs/includes/modules/dons/html_cerfafr.modules.php @@ -23,7 +23,7 @@ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/dons/modules_don.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); /** diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php index 24192d52c20..0591e8b8524 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"; require_once DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"; -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php index b3e33b9fedd..9e59b31d7a8 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php @@ -25,7 +25,7 @@ */ require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"; -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php index 1081fb13508..bf83dd74d1a 100644 --- a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -25,7 +25,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."/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."/lib/files.lib.php"); diff --git a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php index 393dbdb3047..a6bae3cfcaa 100755 --- a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php @@ -28,7 +28,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."/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.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php b/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php index f54fb724b64..699ad259d2e 100755 --- a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index e7cb9256dcd..67c8e7c5e7f 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -25,9 +25,9 @@ * \brief Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); /** diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php index 8c469e0c147..1d68409a95c 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php @@ -26,7 +26,7 @@ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php index 9cf0110f305..67613fa5fef 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php"); require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/modAdherent.class.php b/htdocs/includes/modules/modAdherent.class.php index b52c26b60ce..a9e3ccf0ace 100644 --- a/htdocs/includes/modules/modAdherent.class.php +++ b/htdocs/includes/modules/modAdherent.class.php @@ -205,7 +205,7 @@ class modAdherent extends DolibarrModules $r=0; $now=dol_now(); - require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $r++; $this->import_code[$r]=$this->rights_class.'_'.$r; diff --git a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php index a5ef42508a5..a233662a042 100644 --- a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php +++ b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php @@ -26,7 +26,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 1c8e7f38bb8..ec4fcde4cfb 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -27,7 +27,7 @@ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/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.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index c187a2757f5..1fd06d31b0b 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -27,7 +27,7 @@ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/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.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/rapport/pdf_paiement.class.php b/htdocs/includes/modules/rapport/pdf_paiement.class.php index 8b05950d414..716974270eb 100644 --- a/htdocs/includes/modules/rapport/pdf_paiement.class.php +++ b/htdocs/includes/modules/rapport/pdf_paiement.class.php @@ -23,7 +23,7 @@ * \brief File to build payment reports */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); /** @@ -74,7 +74,7 @@ class pdf_paiement */ function write_file($_dir, $month, $year, $outputlangs) { - include_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); global $user,$langs,$conf; diff --git a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php index d5445f970c9..a336fd0c1ca 100644 --- a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php @@ -25,7 +25,7 @@ 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."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); diff --git a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 73ea0760690..80fe0c7a626 100755 --- a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -26,7 +26,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_invoice/modules_facturefournisseur.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php index 108acd8e506..e338475274a 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_order/modules_commandefournisseur.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/install/check.php b/htdocs/install/check.php index df105d458e9..ab473201867 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -272,14 +272,14 @@ else include_once($conffile); if (! empty($dolibarr_main_db_type) && ! empty($dolibarr_main_document_root)) { - if (! file_exists($dolibarr_main_document_root."/lib/admin.lib.php")) + if (! file_exists($dolibarr_main_document_root."/core/lib/admin.lib.php")) { print 'A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.
'."\n"; dol_syslog("A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.", LOG_WARNING); } else { - require_once($dolibarr_main_document_root."/lib/admin.lib.php"); + require_once($dolibarr_main_document_root."/core/lib/admin.lib.php"); // $conf is already instancied inside inc.php $conf->db->type = $dolibarr_main_db_type; diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index cbaa34e7e52..865989f9e61 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -24,7 +24,7 @@ include("./inc.php"); require_once($dolibarr_main_document_root."/core/class/conf.class.php"); -require_once($dolibarr_main_document_root."/lib/admin.lib.php"); +require_once($dolibarr_main_document_root."/core/lib/admin.lib.php"); $etape = 2; $ok = 0; diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index d022fcba77a..d9f27fe4e32 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -27,7 +27,7 @@ include_once("./inc.php"); require_once($dolibarr_main_document_root."/core/class/conf.class.php"); -require_once($dolibarr_main_document_root."/lib/admin.lib.php"); +require_once($dolibarr_main_document_root."/core/lib/admin.lib.php"); $setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto'); diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 19387092ef8..539ad68e0bd 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -27,7 +27,7 @@ include_once("./inc.php"); if (file_exists($conffile)) include_once($conffile); -require_once($dolibarr_main_document_root . "/lib/admin.lib.php"); +require_once($dolibarr_main_document_root . "/core/lib/admin.lib.php"); $setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto'); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 72601c80903..e4c5a8d79a9 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -36,7 +36,7 @@ if (! defined('ADODB_PATH')) require_once('../core/class/translate.class.php'); require_once('../lib/functions.lib.php'); -require_once('../lib/admin.lib.php'); +require_once('../core/lib/admin.lib.php'); require_once('../lib/files.lib.php'); require_once(ADODB_PATH.'adodb-time.inc.php'); diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index 317515631ea..2524d66395f 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -24,7 +24,7 @@ include_once("./inc.php"); if (file_exists($conffile)) include_once($conffile); -require_once($dolibarr_main_document_root."/lib/admin.lib.php"); +require_once($dolibarr_main_document_root."/core/lib/admin.lib.php"); $grant_query=''; diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 4f865e86709..08d00535bdf 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -28,7 +28,7 @@ if (! file_exists($conffile)) print 'Error: Dolibarr config file was not found. This may means that Dolibarr is not installed yet. Please call the page "/install/index.php" instead of "/install/upgrade.php").'; } require_once($conffile); if (! isset($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility -require_once($dolibarr_main_document_root."/lib/admin.lib.php"); +require_once($dolibarr_main_document_root."/core/lib/admin.lib.php"); $grant_query=''; $etape = 2; diff --git a/htdocs/lib/xcal.lib.php b/htdocs/lib/xcal.lib.php index d40c0dfa723..e26f04bfa6d 100644 --- a/htdocs/lib/xcal.lib.php +++ b/htdocs/lib/xcal.lib.php @@ -44,7 +44,7 @@ function build_calfile($format,$title,$desc,$events_array,$outputfile) $calfileh=fopen($outputfile,'w'); if ($calfileh) { - include_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); $now=dol_now(); $encoding=''; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index b4e23e205b5..9a616773075 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -242,7 +242,7 @@ if ((! empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_V || (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ! empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION))) { $versiontocompare=empty($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_INSTALL:$conf->global->MAIN_VERSION_LAST_UPGRADE; - require_once(DOL_DOCUMENT_ROOT ."/lib/admin.lib.php"); + require_once(DOL_DOCUMENT_ROOT ."/core/lib/admin.lib.php"); $dolibarrversionlastupgrade=preg_split('/[.-]/',$versiontocompare); $dolibarrversionprogram=preg_split('/[.-]/',DOL_VERSION); $rescomp=versioncompare($dolibarrversionprogram,$dolibarrversionlastupgrade); diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index b1293ff87c9..4f6c1568522 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -230,7 +230,7 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC')) else // For backward compatibility { dol_syslog("Your country setup use an old syntax. Reedit it in setup area.", LOG_WARNING); - include_once(DOL_DOCUMENT_ROOT.'/lib/company.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'); $country_code=getCountry($country_id,2,$db); // This need a SQL request, but it's the old feature $country_label=getCountry($country_id,0,$db); // This need a SQL request, but it's the old feature } diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php index d25c26e1ae2..c6f0966ed66 100644 --- a/htdocs/paybox/admin/paybox.php +++ b/htdocs/paybox/admin/paybox.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $servicename='PayBox'; diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php index 568c0a56d75..f9ad8560629 100644 --- a/htdocs/paypal/admin/paypal.php +++ b/htdocs/paypal/admin/paypal.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); $servicename='PayPal'; diff --git a/htdocs/product/admin/produit.php b/htdocs/product/admin/produit.php index 1f39bc3981f..dc0b77299cc 100644 --- a/htdocs/product/admin/produit.php +++ b/htdocs/product/admin/produit.php @@ -27,7 +27,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php"); $langs->load("admin"); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 08828d267c5..d8b33fb3c1f 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1009,7 +1009,7 @@ class Product extends CommonObject */ function fetch($id='',$ref='',$ref_ext='') { - include_once(DOL_DOCUMENT_ROOT.'/lib/company.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'); global $langs, $conf; diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index e4df1b3e2d8..bfb377c58cf 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 57ac3354853..cb7a9162f74 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("products"); $langs->load("stocks"); diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index d1252ed31cd..1bc200e92c5 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -27,7 +27,7 @@ require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $mine = $_REQUEST['mode']=='mine' ? 1 : 0; diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php index 83168a5435b..b109004ab83 100644 --- a/htdocs/projet/activity/list.php +++ b/htdocs/projet/activity/list.php @@ -28,7 +28,7 @@ require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load('projects'); diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 62aa7cf5b67..789dba883d4 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -27,7 +27,7 @@ require ("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); $projectid=isset($_REQUEST["id"])?$_REQUEST["id"]:$_POST["id"]; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index cd69514b32f..345c161c4d6 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -27,7 +27,7 @@ require ("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); $mine = $_REQUEST['mode']=='mine' ? 1 : 0; diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php index 7eeddae234c..335d8622869 100644 --- a/htdocs/projet/tasks/index.php +++ b/htdocs/projet/tasks/index.php @@ -27,7 +27,7 @@ require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load('projects'); $langs->load('users'); diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 55e249445ec..4aab61e1a62 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -28,7 +28,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load('projects'); diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index dbbbd4f0ab6..2a2a5fe79cf 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -41,7 +41,7 @@ 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."/core/class/extrafields.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); // Init vars $errmsg=''; diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index b1293cdb73f..880b69151fe 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -29,7 +29,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paybox/lib/paybox.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/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."/product/class/product.class.php"); diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php index 1d93a90910f..d7c62a7e384 100644 --- a/htdocs/public/paybox/paymentko.php +++ b/htdocs/public/paybox/paymentko.php @@ -28,7 +28,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paybox/lib/paybox.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); // Security check if (empty($conf->paybox->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php index 5bad03905bc..0bd19318340 100644 --- a/htdocs/public/paybox/paymentok.php +++ b/htdocs/public/paybox/paymentok.php @@ -28,7 +28,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paybox/lib/paybox.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); // Security check if (empty($conf->paybox->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index 38960e8db73..c5809df4cc4 100755 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -30,7 +30,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypalfunctions.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/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."/product/class/product.class.php"); diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php index 1d01782cda3..57382f4309c 100755 --- a/htdocs/public/paypal/paymentko.php +++ b/htdocs/public/paypal/paymentko.php @@ -31,7 +31,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypalfunctions.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); // Security check if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php index 15530f82624..426d2539966 100755 --- a/htdocs/public/paypal/paymentok.php +++ b/htdocs/public/paypal/paymentok.php @@ -31,7 +31,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php"); require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypalfunctions.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); // Security check if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index 3a8070e3c52..b1e9e8efded 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -26,8 +26,8 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); $langs->load("admin"); diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php index 7f092bf3781..3975d10d458 100755 --- a/htdocs/societe/admin/societe_extrafields.php +++ b/htdocs/societe/admin/societe_extrafields.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); $langs->load("companies"); @@ -52,7 +52,7 @@ if (!$user->admin) accessforbidden(); * Actions */ -require(DOL_DOCUMENT_ROOT."/lib/admin_extrafields.inc.php"); +require(DOL_DOCUMENT_ROOT."/core/admin_extrafields.inc.php"); diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index f1e98823efa..02283d0e8fb 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -61,7 +61,7 @@ $html = new Form($db); */ if ($_GET["socid"]) { - require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); $langs->load("companies"); diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php index 932f0cf48a7..7ebdf7c2f7e 100644 --- a/htdocs/societe/checkvat/checkVatPopup.php +++ b/htdocs/societe/checkvat/checkVatPopup.php @@ -22,7 +22,7 @@ */ require ("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/includes/nusoap/lib/nusoap.php"); $langs->load("companies"); diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php index cc5c55f0810..c9998acc84b 100644 --- a/htdocs/societe/commerciaux.php +++ b/htdocs/societe/commerciaux.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); $langs->load("companies"); $langs->load("commercial"); diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index b7fcf2320ce..57c57637dca 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/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/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); diff --git a/htdocs/societe/info.php b/htdocs/societe/info.php index d299c86991c..ab129074400 100644 --- a/htdocs/societe/info.php +++ b/htdocs/societe/info.php @@ -24,7 +24,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); $langs->load("companies"); diff --git a/htdocs/societe/lien.php b/htdocs/societe/lien.php index 8b8ff065331..ee9cd90fb74 100644 --- a/htdocs/societe/lien.php +++ b/htdocs/societe/lien.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/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"); $langs->load("companies"); diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php index 0b4870d91f2..bc9af371403 100644 --- a/htdocs/societe/notify/fiche.php +++ b/htdocs/societe/notify/fiche.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/triggers/interface_modNotification_Notification.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index d10353e2be5..616bf860abf 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -25,8 +25,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); require_once DOL_DOCUMENT_ROOT."/societe/class/companybankaccount.class.php"; $langs->load("companies"); diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 1947ec779c1..821901460d2 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -28,7 +28,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); diff --git a/htdocs/societe/socnote.php b/htdocs/societe/socnote.php index 9395c90d93e..80cefe84987 100644 --- a/htdocs/societe/socnote.php +++ b/htdocs/societe/socnote.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); $action = isset($_GET["action"])?$_GET["action"]:$_POST["action"]; diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 2bbea6c8764..c1118c35cd3 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -36,7 +36,7 @@ if (! defined('ADODB_PATH')) require_once('../core/class/translate.class.php'); require_once('../lib/functions.lib.php'); -require_once('../lib/admin.lib.php'); +require_once('../core/lib/admin.lib.php'); require_once('../lib/files.lib.php'); require_once(ADODB_PATH.'adodb-time.inc.php'); diff --git a/htdocs/webservices/admin/webservices.php b/htdocs/webservices/admin/webservices.php index b70281734b8..1d83f7a0514 100644 --- a/htdocs/webservices/admin/webservices.php +++ b/htdocs/webservices/admin/webservices.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); $langs->load("admin"); diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index 614257ff1e1..509b0383c3a 100755 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -283,7 +283,7 @@ function createProductOrService($authentication,$product) if (! $error) { - include_once(DOL_DOCUMENT_ROOT.'/lib/company.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'); $newobject=new Product($db); $newobject->ref=$product['ref']; diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php index 1a66df276ab..2f4b74ba291 100644 --- a/scripts/members/sync_members_ldap2dolibarr.php +++ b/scripts/members/sync_members_ldap2dolibarr.php @@ -42,7 +42,7 @@ $forcecommit=0; require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php index 9e99b77bd98..10eb4ce85e5 100644 --- a/test/phpunit/DateLibTest.php +++ b/test/phpunit/DateLibTest.php @@ -27,7 +27,7 @@ global $conf,$user,$langs,$db; //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; -require_once dirname(__FILE__).'/../../htdocs/lib/date.lib.php'; +require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; if (empty($user->id)) { diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php index cfc9b80d94c..6b459bc29a0 100755 --- a/test/phpunit/WebservicesTest.php +++ b/test/phpunit/WebservicesTest.php @@ -27,7 +27,7 @@ global $conf,$user,$langs,$db; //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; -require_once dirname(__FILE__).'/../../htdocs/lib/date.lib.php'; +require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP From 82f5d8278ec6b043a10ed8d57a0180e287ff7e6a Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Oct 2011 11:43:55 +0200 Subject: [PATCH 22/41] [task #216] Move lib in core directory --- dev/translation/autotranslator.php | 2 +- htdocs/adherents/cartes/carte.php | 2 +- htdocs/adherents/document.php | 4 ++-- htdocs/adherents/fiche.php | 2 +- htdocs/admin/company.php | 4 ++-- htdocs/admin/mails.php | 4 ++-- htdocs/admin/security_other.php | 2 +- htdocs/admin/tools/export.php | 2 +- htdocs/admin/tools/purge.php | 2 +- htdocs/admin/tools/update.php | 2 +- htdocs/categories/class/categorie.class.php | 4 ++-- htdocs/comm/action/class/actioncomm.class.php | 2 +- htdocs/comm/action/document.php | 4 ++-- htdocs/comm/action/rapport/index.php | 2 +- htdocs/comm/mailing/cibles.php | 2 +- htdocs/comm/mailing/fiche.php | 6 +++--- htdocs/comm/mailing/info.php | 2 +- htdocs/comm/propal.php | 4 ++-- htdocs/comm/propal/apercu.php | 2 +- htdocs/comm/propal/class/propal.class.php | 2 +- htdocs/comm/propal/document.php | 2 +- htdocs/commande/apercu.php | 2 +- htdocs/commande/class/commande.class.php | 4 ++-- htdocs/commande/document.php | 2 +- htdocs/commande/fiche.php | 6 +++--- htdocs/compta/facture.php | 4 ++-- htdocs/compta/facture/apercu.php | 2 +- htdocs/compta/facture/class/facture.class.php | 2 +- htdocs/compta/facture/document.php | 2 +- htdocs/compta/facture/impayees.php | 2 +- htdocs/compta/paiement/rapport.php | 2 +- htdocs/compta/prelevement/bon.php | 2 +- htdocs/compta/prelevement/fiche.php | 2 +- htdocs/contact/exportimport.php | 2 +- htdocs/contact/fiche.php | 2 +- htdocs/contact/info.php | 2 +- htdocs/contact/ldap.php | 2 +- htdocs/contact/perso.php | 2 +- htdocs/contrat/contact.php | 2 +- htdocs/contrat/document.php | 6 +++--- htdocs/contrat/fiche.php | 2 +- htdocs/contrat/info.php | 2 +- htdocs/contrat/note.php | 2 +- htdocs/core/ajaxfileupload.php | 2 +- htdocs/core/class/html.formfile.class.php | 2 +- htdocs/core/class/html.formmail.class.php | 2 +- htdocs/core/class/notify.class.php | 2 +- htdocs/core/class/rssparser.class.php | 2 +- htdocs/{lib => core}/doxygen.php | 0 htdocs/{ => core}/lib/contact.lib.php | 2 +- htdocs/{ => core}/lib/contract.lib.php | 2 +- htdocs/{ => core}/lib/ecm.lib.php | 2 +- htdocs/{ => core}/lib/emailing.lib.php | 2 +- htdocs/{ => core}/lib/fichinter.lib.php | 2 +- htdocs/{ => core}/lib/files.lib.php | 4 ++-- htdocs/core/lib/functions2.lib.php | 2 +- htdocs/document.php | 2 +- htdocs/ecm/class/ecmdirectory.class.php | 4 ++-- htdocs/ecm/docfile.php | 4 ++-- htdocs/ecm/docmine.php | 6 +++--- htdocs/ecm/docother.php | 4 ++-- htdocs/ecm/index.php | 4 ++-- htdocs/ecm/search.php | 4 ++-- htdocs/expedition/class/expedition.class.php | 4 ++-- htdocs/expedition/fiche.php | 4 ++-- htdocs/fichinter/apercu.php | 4 ++-- htdocs/fichinter/class/fichinter.class.php | 2 +- htdocs/fichinter/contact.php | 2 +- htdocs/fichinter/document.php | 6 +++--- htdocs/fichinter/fiche.php | 6 +++--- htdocs/fichinter/info.php | 2 +- htdocs/fichinter/note.php | 2 +- htdocs/fourn/class/fournisseur.commande.class.php | 2 +- htdocs/fourn/commande/document.php | 4 ++-- htdocs/fourn/commande/fiche.php | 6 +++--- htdocs/fourn/facture/document.php | 4 ++-- htdocs/fourn/facture/fiche.php | 6 +++--- htdocs/ftp/index.php | 4 ++-- htdocs/imports/emptyexample.php | 2 +- htdocs/imports/import.php | 4 ++-- htdocs/includes/modules/commande/modules_commande.php | 2 +- .../facture/doc/doc_generic_invoice_odt.modules.php | 2 +- htdocs/includes/modules/facture/modules_facture.php | 2 +- .../includes/modules/fichinter/modules_fichinter.php | 2 +- .../includes/modules/livraison/modules_livraison.php | 2 +- htdocs/includes/modules/mailings/peche.modules.php | 2 +- htdocs/includes/modules/modFacture.class.php | 2 +- htdocs/includes/modules/modSociete.class.php | 2 +- htdocs/includes/modules/project/modules_project.php | 2 +- htdocs/includes/modules/propale/modules_propale.php | 2 +- .../modules/societe/doc/doc_generic_odt.modules.php | 2 +- .../supplier_invoice/modules_facturefournisseur.php | 2 +- .../supplier_order/modules_commandefournisseur.php | 2 +- htdocs/install/inc.php | 2 +- htdocs/install/upgrade2.php | 2 +- htdocs/lib/fourn.lib.php | 4 ++-- htdocs/lib/functions.lib.php | 4 ++-- htdocs/lib/invoice.lib.php | 2 +- htdocs/lib/order.lib.php | 2 +- htdocs/lib/project.lib.php | 4 ++-- htdocs/lib/propal.lib.php | 2 +- htdocs/livraison/class/livraison.class.php | 4 ++-- htdocs/product/class/product.class.php | 10 +++++----- htdocs/product/document.php | 4 ++-- htdocs/projet/class/project.class.php | 2 +- htdocs/projet/document.php | 4 ++-- htdocs/projet/tasks/document.php | 4 ++-- htdocs/societe/class/societe.class.php | 2 +- htdocs/societe/document.php | 2 +- htdocs/societe/soc.php | 2 +- htdocs/support/inc.php | 2 +- htdocs/user/fiche.php | 2 +- htdocs/viewimage.php | 2 +- 113 files changed, 160 insertions(+), 160 deletions(-) rename htdocs/{lib => core}/doxygen.php (100%) rename htdocs/{ => core}/lib/contact.lib.php (97%) rename htdocs/{ => core}/lib/contract.lib.php (97%) rename htdocs/{ => core}/lib/ecm.lib.php (97%) rename htdocs/{ => core}/lib/emailing.lib.php (96%) rename htdocs/{ => core}/lib/fichinter.lib.php (98%) rename htdocs/{ => core}/lib/files.lib.php (99%) diff --git a/dev/translation/autotranslator.php b/dev/translation/autotranslator.php index 17ec9feb824..78d89b691a9 100644 --- a/dev/translation/autotranslator.php +++ b/dev/translation/autotranslator.php @@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Include Dolibarr environment 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. // Load main language strings diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index b5602c26ce1..b3bc6a9a68f 100755 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -23,7 +23,7 @@ * \brief Page to output members business cards */ 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."/includes/modules/member/cards/modules_cards.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/labels/modules_labels.php"); diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php index 4111d66e0ff..6aa62243a85 100644 --- a/htdocs/adherents/document.php +++ b/htdocs/adherents/document.php @@ -26,7 +26,7 @@ require("../main.inc.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."/adherents/class/adherent.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 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) { diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 96adf248ab4..1b8a3876d7e 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -206,7 +206,7 @@ if ($_REQUEST["action"] == 'confirm_sendinfo' && $_REQUEST["confirm"] == 'yes') 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=''; if (isset($_POST["naissday"]) && $_POST["naissday"] diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index e26f56e088b..41da98b8ac9 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -47,7 +47,7 @@ accessforbidden(); if ( (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["cancel"])) || (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_code=getCountry($new_pays_id,2); @@ -201,7 +201,7 @@ if ($_GET["action"] == 'addthumb') 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; dol_delete_file($logofile); diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 5231c0c6235..66e41488edc 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -23,7 +23,7 @@ require("../main.inc.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("products"); @@ -74,7 +74,7 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["can */ 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 $vardir=$conf->user->dir_output."/".$user->id; diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index 7ec5d5ef5d8..28a59e6c57e 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -41,7 +41,7 @@ $upload_dir=$conf->admin->dir_temp; 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 if ($result >= 0) diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index aa3c0260424..fd3fee5a12d 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -22,7 +22,7 @@ require("../../main.inc.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"); $what=$_REQUEST["what"]; diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php index de654b71832..62f536bcba7 100644 --- a/htdocs/admin/tools/purge.php +++ b/htdocs/admin/tools/purge.php @@ -21,7 +21,7 @@ */ 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"); diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index e9cdbbfb423..17eadcaa563 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -22,7 +22,7 @@ */ 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("other"); diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index a0dbbca0e7a..ab58b71972c 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -1201,7 +1201,7 @@ class Categorie */ 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 .= "photos/"; @@ -1306,7 +1306,7 @@ class Categorie */ 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 $dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 0b79eca3148..673724ea157 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -695,7 +695,7 @@ class ActionComm extends CommonObject if ($cachedelay) { $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)) { dol_syslog(get_class($this)."::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled"); diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 4e5ebb4003d..542aac2679a 100755 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -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."/comm/action/class/cactioncomm.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"); 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)) { - 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 $upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($objectid); diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index 840442f99b4..6ecc759472b 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -25,7 +25,7 @@ */ 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."/comm/action/class/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/action/rapport.pdf.php"); diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 2e25be7e3ea..543537efe41 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -25,7 +25,7 @@ require("../../main.inc.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/lib/functions2.lib.php"); diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 22556691b4b..6fbade0ac8c 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -23,8 +23,8 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.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/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php"); @@ -450,7 +450,7 @@ if (! empty($_POST["removedfileid"])) // Action update emailing 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->fetch($_POST["id"]); diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php index ecff22ad16a..632120ac5ec 100644 --- a/htdocs/comm/mailing/info.php +++ b/htdocs/comm/mailing/info.php @@ -25,7 +25,7 @@ require("../../main.inc.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."/lib/emailing.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php"); $langs->load("mails"); diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index cb8de4ddf23..162154e8a2f 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -399,7 +399,7 @@ if (GETPOST('action') == 'setstatut' && $user->rights->propale->cloturer) */ 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 $vardir=$conf->user->dir_output."/".$user->id; @@ -416,7 +416,7 @@ if ($_POST['addfile']) */ 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 $vardir=$conf->user->dir_output."/".$user->id; diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index a7556454a3c..0143761af27 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -27,7 +27,7 @@ require("../../main.inc.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/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"); $langs->load('propal'); diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 4731f0343da..840e94658cd 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1734,7 +1734,7 @@ class Propal extends CommonObject function delete($user, $notrigger=0) { global $conf,$langs; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index 3a3d41b2fcb..8686b5a8491 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -27,7 +27,7 @@ require("../../main.inc.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/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load('compta'); diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index 348e0000ba7..cf9a67efc77 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -26,7 +26,7 @@ require("../main.inc.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'); 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"); diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index ba39d848325..3175f3d753b 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -174,7 +174,7 @@ class Commande extends CommonObject function valid($user) { global $conf,$langs; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; @@ -2290,7 +2290,7 @@ class Commande extends CommonObject function delete($user) { global $conf, $langs; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $err = 0; diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index bc5feec9fc7..1742b72d913 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -26,7 +26,7 @@ require("../main.inc.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 ."/commande/class/commande.class.php"); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 0120bb75ae6..b3616574156 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -892,7 +892,7 @@ if ($action == 'remove_file') { 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; $file = $upload_dir . '/' . $_GET['file']; @@ -906,7 +906,7 @@ if ($action == 'remove_file') */ 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 $vardir=$conf->user->dir_output."/".$user->id; @@ -922,7 +922,7 @@ if ($_POST['addfile']) */ 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 $vardir=$conf->user->dir_output."/".$user->id; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 7926805d3bc..d2269bf4013 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1177,7 +1177,7 @@ if ($action == 'down' && $user->rights->facture->creer) */ 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 $vardir=$conf->user->dir_output."/".$user->id; @@ -1193,7 +1193,7 @@ if ($_POST['addfile']) */ 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 $vardir=$conf->user->dir_output."/".$user->id; diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 1a33f00cde2..3ca545162aa 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -28,7 +28,7 @@ require("../../main.inc.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/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"); $langs->load("bills"); diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index aa1f4b48816..b500e9cecc2 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1488,7 +1488,7 @@ class Facture extends CommonObject function validate($user, $force_number='') { global $conf,$langs; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index a2df7ced07e..d276287a6fc 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -28,7 +28,7 @@ require("../../main.inc.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."/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"); $langs->load('propal'); diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 9b49f27c7e1..1d0c0f96023 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -28,7 +28,7 @@ require("../../main.inc.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/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'); diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index cb72c923efb..18309fd1713 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -24,7 +24,7 @@ require("../../main.inc.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 if (! $user->rights->facture->lire) diff --git a/htdocs/compta/prelevement/bon.php b/htdocs/compta/prelevement/bon.php index f23b09fdfb2..548e88a3bc8 100644 --- a/htdocs/compta/prelevement/bon.php +++ b/htdocs/compta/prelevement/bon.php @@ -25,7 +25,7 @@ require("../bank/pre.inc.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"; $langs->load("bills"); diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php index 8ccde5bf97d..f939a9a356c 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -58,7 +58,7 @@ if ( $action == 'confirm_credite' && GETPOST("confirm") == 'yes') 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->fetch($id); diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php index 6a93b254d11..e75b099a861 100644 --- a/htdocs/contact/exportimport.php +++ b/htdocs/contact/exportimport.php @@ -24,7 +24,7 @@ require("../main.inc.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"); diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 9e30170a702..514ca3a29a3 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -28,7 +28,7 @@ require("../main.inc.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."/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/class/html.formcompany.class.php"); diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php index 242866b7a7e..ad802afa59f 100644 --- a/htdocs/contact/info.php +++ b/htdocs/contact/info.php @@ -25,7 +25,7 @@ require("../main.inc.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."/lib/contact.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php"); $langs->load("companies"); diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php index c7aa3ea5038..3daa1b3b0de 100644 --- a/htdocs/contact/ldap.php +++ b/htdocs/contact/ldap.php @@ -24,7 +24,7 @@ require("../main.inc.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/lib/ldap.lib.php"); diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 2c37327330b..9b6481b309b 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -24,7 +24,7 @@ require("../main.inc.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("other"); diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index 858d531cbf6..bee4163db93 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -23,7 +23,7 @@ */ 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."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index b9e7686a0ec..c8a7e6b6b0c 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -26,9 +26,9 @@ */ 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."/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"); $langs->load("other"); @@ -69,7 +69,7 @@ $modulepart='contract'; */ 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) { diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 4f95788c0dc..ad1ce4afc29 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -27,7 +27,7 @@ require ("../main.inc.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"); 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"); diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php index 839e738f10b..315dc569432 100644 --- a/htdocs/contrat/info.php +++ b/htdocs/contrat/info.php @@ -23,7 +23,7 @@ require ("../main.inc.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"); $langs->load("contracts"); diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index 748b309286d..8c4cc75f721 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/note.php @@ -23,7 +23,7 @@ */ 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"); $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:""; diff --git a/htdocs/core/ajaxfileupload.php b/htdocs/core/ajaxfileupload.php index 7c9ebe6a298..5a066d8b783 100644 --- a/htdocs/core/ajaxfileupload.php +++ b/htdocs/core/ajaxfileupload.php @@ -35,7 +35,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't nee 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"); error_reporting(E_ALL | E_STRICT); diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 3383a3ce8ca..52580882ccc 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -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) { // 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; diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index fd98f27f37d..590282a5358 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -107,7 +107,7 @@ class FormMail function clear_attached_files() { 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 $vardir=$conf->user->dir_output."/".$user->id; diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index c1ea9e4a6b1..6735e9c91c2 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -161,7 +161,7 @@ class Notify 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'); $subject = '['.$application.'] '.$langs->transnoentitiesnoconv("DolibarrNotification"); diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php index 75dc5ce5eff..cdcbcbd7282 100755 --- a/htdocs/core/class/rssparser.class.php +++ b/htdocs/core/class/rssparser.class.php @@ -80,7 +80,7 @@ class RssParser */ 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 diff --git a/htdocs/lib/doxygen.php b/htdocs/core/doxygen.php similarity index 100% rename from htdocs/lib/doxygen.php rename to htdocs/core/doxygen.php diff --git a/htdocs/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php similarity index 97% rename from htdocs/lib/contact.lib.php rename to htdocs/core/lib/contact.lib.php index 87e25f70550..de6db84af94 100644 --- a/htdocs/lib/contact.lib.php +++ b/htdocs/core/lib/contact.lib.php @@ -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 */ diff --git a/htdocs/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php similarity index 97% rename from htdocs/lib/contract.lib.php rename to htdocs/core/lib/contract.lib.php index 0c0027a2bc1..00b34678f93 100644 --- a/htdocs/lib/contract.lib.php +++ b/htdocs/core/lib/contract.lib.php @@ -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 */ diff --git a/htdocs/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php similarity index 97% rename from htdocs/lib/ecm.lib.php rename to htdocs/core/lib/ecm.lib.php index e425fc9f686..f7c267c8d3c 100644 --- a/htdocs/lib/ecm.lib.php +++ b/htdocs/core/lib/ecm.lib.php @@ -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 * \ingroup ecm */ diff --git a/htdocs/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php similarity index 96% rename from htdocs/lib/emailing.lib.php rename to htdocs/core/lib/emailing.lib.php index 1780e0a2eed..b847d2c512e 100644 --- a/htdocs/lib/emailing.lib.php +++ b/htdocs/core/lib/emailing.lib.php @@ -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 */ diff --git a/htdocs/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php similarity index 98% rename from htdocs/lib/fichinter.lib.php rename to htdocs/core/lib/fichinter.lib.php index ab6d36cf286..53ac8662738 100644 --- a/htdocs/lib/fichinter.lib.php +++ b/htdocs/core/lib/fichinter.lib.php @@ -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 * \ingroup fichinter */ diff --git a/htdocs/lib/files.lib.php b/htdocs/core/lib/files.lib.php similarity index 99% rename from htdocs/lib/files.lib.php rename to htdocs/core/lib/files.lib.php index ee08274abc8..717a6ba4ec4 100644 --- a/htdocs/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/files.lib.php + * \file htdocs/core/lib/files.lib.php * \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) { 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 (empty($dir)) return 'ErrorObjectNoSupportedByFunction'; diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index db317b4a549..7483cbd8e0f 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -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, ...). 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; $dirtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const)); diff --git a/htdocs/document.php b/htdocs/document.php index 8c06ea3078c..6a96f4c97e5 100644 --- a/htdocs/document.php +++ b/htdocs/document.php @@ -47,7 +47,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); function llxHeader() { } 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 = ''; $action = GETPOST("action"); diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index ac8429d0c0d..31adb1bca7c 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.class.php @@ -322,7 +322,7 @@ class EcmDirectory // extends CommonObject function delete($user) { 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 @@ -643,7 +643,7 @@ class EcmDirectory // extends CommonObject function refreshcachenboffile($all=0) { 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(); $filelist=dol_dir_list($dir,'files',0,'','\.meta$'); diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php index feb37ef27f7..ec851c6e2fa 100644 --- a/htdocs/ecm/docfile.php +++ b/htdocs/ecm/docfile.php @@ -25,8 +25,8 @@ require("../main.inc.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."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php"); // Load traductions files $langs->load("ecm"); diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php index 2fd20a9ed26..c0ffe1aa7dd 100644 --- a/htdocs/ecm/docmine.php +++ b/htdocs/ecm/docmine.php @@ -26,8 +26,8 @@ require("../main.inc.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."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php"); // Load traductions files @@ -83,7 +83,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$relativepath; // Upload file 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) { diff --git a/htdocs/ecm/docother.php b/htdocs/ecm/docother.php index 1d98e484af1..973ee2a4e4a 100644 --- a/htdocs/ecm/docother.php +++ b/htdocs/ecm/docother.php @@ -11,7 +11,7 @@ require("../main.inc.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 $langs->load("ecm"); @@ -46,7 +46,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$section; // Envoie fichier 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) { diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index 83a283fde35..2609e5eb723 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -27,8 +27,8 @@ if (! defined('REQUIRE_JQUERY_LAYOUT')) define('REQUIRE_JQUERY_LAYOUT','1'); require("../main.inc.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."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.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."/ecm/class/ecmdirectory.class.php"); diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php index 7b1005493de..f3e0016ee9d 100644 --- a/htdocs/ecm/search.php +++ b/htdocs/ecm/search.php @@ -25,8 +25,8 @@ require("../main.inc.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."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.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."/ecm/class/ecmdirectory.class.php"); diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index cb9da1f7989..30a50678796 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -421,7 +421,7 @@ class Expedition extends CommonObject { 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"); @@ -770,7 +770,7 @@ class Expedition extends CommonObject { 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(); $sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet"; diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index d049528d8e4..4468bde7944 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -287,7 +287,7 @@ if ($action == 'builddoc') // En get ou en post */ 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 $vardir=$conf->user->dir_output."/".$user->id; @@ -303,7 +303,7 @@ if ($_POST['addfile']) */ 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 $vardir=$conf->user->dir_output."/".$user->id; diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php index b58b40c9e3e..7fe564aa948 100644 --- a/htdocs/fichinter/apercu.php +++ b/htdocs/fichinter/apercu.php @@ -24,8 +24,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.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"); diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 6d240bfb31d..cac377c7b35 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -555,7 +555,7 @@ class Fichinter extends CommonObject function delete($user) { global $conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php index 77c2aa75d98..a5893d6f419 100644 --- a/htdocs/fichinter/contact.php +++ b/htdocs/fichinter/contact.php @@ -25,7 +25,7 @@ require("../main.inc.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."/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'); $langs->load("interventions"); diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index d55461e5fc2..872d191cd1f 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.php @@ -28,8 +28,8 @@ require("../main.inc.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."/lib/fichinter.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load("other"); @@ -69,7 +69,7 @@ $modulepart='fichinter'; */ 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) { diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 5535aeaffba..a6e4aab328a 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -28,7 +28,7 @@ require("../main.inc.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."/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"); if ($conf->projet->enabled) { @@ -458,7 +458,7 @@ if ($action == 'down' && $user->rights->ficheinter->creer) */ 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 $vardir=$conf->user->dir_output."/".$user->id; @@ -474,7 +474,7 @@ if ($_POST['addfile']) */ 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 $vardir=$conf->user->dir_output."/".$user->id; diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php index baea3fa8ec5..05c74544d24 100644 --- a/htdocs/fichinter/info.php +++ b/htdocs/fichinter/info.php @@ -26,7 +26,7 @@ require("../main.inc.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."/lib/fichinter.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); $langs->load('companies'); $langs->load("interventions"); diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php index 65a6b9c6e47..764e02bba0b 100644 --- a/htdocs/fichinter/note.php +++ b/htdocs/fichinter/note.php @@ -24,7 +24,7 @@ require("../main.inc.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("interventions"); diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index f92cd5b2f00..1ec2d969e15 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -272,7 +272,7 @@ class CommandeFournisseur extends Commande function valid($user) { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php index d28530f1348..18e8d46c366 100644 --- a/htdocs/fourn/commande/document.php +++ b/htdocs/fourn/commande/document.php @@ -26,7 +26,7 @@ require("../../main.inc.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."/core/class/html.formfile.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 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); diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 486ee57581f..8e72bf98f25 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -524,7 +524,7 @@ if ($action == 'builddoc') // En get ou en post // Delete file in doc form if ($action=='remove_file') { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if ($object->fetch($id)) { @@ -574,7 +574,7 @@ if ($action == 'create') */ 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 $vardir=$conf->user->dir_output."/".$user->id; @@ -590,7 +590,7 @@ if ($_POST['addfile']) */ 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 $vardir=$conf->user->dir_output."/".$user->id; diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index fd7b4de18c5..3eb02e7578d 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -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.facture.class.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"); $langs->load('bills'); @@ -62,7 +62,7 @@ if (! $sortfield) $sortfield="name"; // Envoi fichier 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); if ($facture->fetch($facid)) diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 8b3be30dc79..2494c6fdcad 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -620,7 +620,7 @@ if ($action == 'reopen' && $user->rights->fournisseur->facture->creer) */ 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 $vardir=$conf->user->dir_output."/".$user->id; @@ -636,7 +636,7 @@ if ($_POST['addfile']) */ 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 $vardir=$conf->user->dir_output."/".$user->id; @@ -838,7 +838,7 @@ if ($action == 'builddoc') // Delete file in doc form 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)) { diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index 1c45855c89f..0ea5c62a2d7 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/index.php @@ -25,7 +25,7 @@ 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."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); // Load traductions files @@ -82,7 +82,7 @@ $conn_id=0; // FTP connection ID // Envoie fichier 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"]); if (! $result > 0) diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php index 1421d116343..a730fd23a5d 100644 --- a/htdocs/imports/emptyexample.php +++ b/htdocs/imports/emptyexample.php @@ -33,7 +33,7 @@ function llxHeader() { print 'Build an import example file< function llxFooter() { print ''; } 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.'/includes/modules/import/modules_import.php'); diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 25d1e087bd1..db9847090c1 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -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."/imports/class/import.class.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"); $langs->load("exports"); @@ -191,7 +191,7 @@ if ($action == 'add_import_model') 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)) { diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php index 744c9196b0c..cb8e4259721 100644 --- a/htdocs/includes/modules/commande/modules_commande.php +++ b/htdocs/includes/modules/commande/modules_commande.php @@ -203,7 +203,7 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0 $outputlangs->charset_output=$sav_charset_output; // 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); // Appel des triggers diff --git a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php index bf83dd74d1a..84336a0fe05 100644 --- a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -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."/core/lib/company.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"); /** diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php index f0ec7568380..8cda5e5dd36 100644 --- a/htdocs/includes/modules/facture/modules_facture.php +++ b/htdocs/includes/modules/facture/modules_facture.php @@ -306,7 +306,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"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $fac = new Facture($db); $fac->fetch($facid); diff --git a/htdocs/includes/modules/fichinter/modules_fichinter.php b/htdocs/includes/modules/fichinter/modules_fichinter.php index 9dd588eccec..cd735982099 100644 --- a/htdocs/includes/modules/fichinter/modules_fichinter.php +++ b/htdocs/includes/modules/fichinter/modules_fichinter.php @@ -206,7 +206,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"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if (!$fichinterref) { diff --git a/htdocs/includes/modules/livraison/modules_livraison.php b/htdocs/includes/modules/livraison/modules_livraison.php index f2d4a06af40..a748ae7fa6e 100644 --- a/htdocs/includes/modules/livraison/modules_livraison.php +++ b/htdocs/includes/modules/livraison/modules_livraison.php @@ -197,7 +197,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"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $delivery = new Livraison($db,"",$deliveryid); $delivery->fetch($deliveryid); diff --git a/htdocs/includes/modules/mailings/peche.modules.php b/htdocs/includes/modules/mailings/peche.modules.php index c7c79d80928..1a9ca96c6a5 100644 --- a/htdocs/includes/modules/mailings/peche.modules.php +++ b/htdocs/includes/modules/mailings/peche.modules.php @@ -104,7 +104,7 @@ class mailing_peche extends MailingTargets { 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 ini_set('auto_detect_line_endings', true); diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/includes/modules/modFacture.class.php index 48a27f933f4..7ac03cf74b1 100644 --- a/htdocs/includes/modules/modFacture.class.php +++ b/htdocs/includes/modules/modFacture.class.php @@ -214,7 +214,7 @@ class modFacture extends DolibarrModules // Remove permissions and default values $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'; create_exdir($dirodt); dol_copy(DOL_DOCUMENT_ROOT.'/install/doctemplates/invoices/template_invoice.odt',$dirodt.'/template_invoice.odt',0,0); diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/includes/modules/modSociete.class.php index d02511f7cdf..4aa343a1f03 100644 --- a/htdocs/includes/modules/modSociete.class.php +++ b/htdocs/includes/modules/modSociete.class.php @@ -305,7 +305,7 @@ class modSociete extends DolibarrModules // We disable this to prevent pb of modules not correctly disabled //$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'; create_exdir($dirodt); dol_copy(DOL_DOCUMENT_ROOT.'/install/doctemplates/thirdparties/template_thirdparty.odt',$dirodt.'/template_thirdparty.odt',0,0); diff --git a/htdocs/includes/modules/project/modules_project.php b/htdocs/includes/modules/project/modules_project.php index c42449728c1..2c67de1c2c0 100644 --- a/htdocs/includes/modules/project/modules_project.php +++ b/htdocs/includes/modules/project/modules_project.php @@ -205,7 +205,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"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $project = new Project($db); $project->fetch($objectid); diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php index f179cbb0400..773d47697b0 100644 --- a/htdocs/includes/modules/propale/modules_propale.php +++ b/htdocs/includes/modules/propale/modules_propale.php @@ -248,7 +248,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, function propale_delete_preview($db, $propalid, $propalref='') { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if (!$propalref) { diff --git a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php index a336fd0c1ca..708b601895d 100644 --- a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php @@ -26,7 +26,7 @@ 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."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); /** diff --git a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php index a84517bd1f1..32de721358f 100755 --- a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php +++ b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php @@ -128,7 +128,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"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $comfourn = new FactureFournisseur($db); $comfourn->fetch($objectid); diff --git a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php index 7909c4497cc..9d55e32c6ce 100644 --- a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php @@ -235,7 +235,7 @@ function supplier_order_pdf_create($db, $object, $model, $outputlangs, $hidedeta function supplier_order_delete_preview($db, $comfournid, $comfournref='') { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if (!$comfournref) { diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index e4c5a8d79a9..3885dc324df 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -37,7 +37,7 @@ if (! defined('ADODB_PATH')) require_once('../core/class/translate.class.php'); require_once('../lib/functions.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'); error_reporting(E_ALL); // To have all errors without disabled E_STRICT diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index bee0e48e43e..3e00044961e 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -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 . '/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'); +require_once($dolibarr_main_document_root . '/core/lib/files.lib.php'); $grant_query=''; $etape = 2; diff --git a/htdocs/lib/fourn.lib.php b/htdocs/lib/fourn.lib.php index 9987d260112..0e1130afe03 100644 --- a/htdocs/lib/fourn.lib.php +++ b/htdocs/lib/fourn.lib.php @@ -58,7 +58,7 @@ function facturefourn_prepare_head($object) $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; - 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); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$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; /*$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); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 3828662d34f..aa0d4c183a7 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -2081,7 +2081,7 @@ function img_allow($allow,$alt='default') */ 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); $mimeimg=dol_mimetype($file,'',2); @@ -3812,7 +3812,7 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object=' { 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 // We look files into the includes/modules/substitutions directory diff --git a/htdocs/lib/invoice.lib.php b/htdocs/lib/invoice.lib.php index 22b0b276571..c53d96cb711 100644 --- a/htdocs/lib/invoice.lib.php +++ b/htdocs/lib/invoice.lib.php @@ -74,7 +74,7 @@ function facture_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id; /*$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); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/lib/order.lib.php b/htdocs/lib/order.lib.php index f6bb5d33aa9..e42bafce734 100644 --- a/htdocs/lib/order.lib.php +++ b/htdocs/lib/order.lib.php @@ -75,7 +75,7 @@ function commande_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id; /*$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); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/lib/project.lib.php b/htdocs/lib/project.lib.php index 4f9eb49b112..937568cc4f3 100644 --- a/htdocs/lib/project.lib.php +++ b/htdocs/lib/project.lib.php @@ -59,7 +59,7 @@ function project_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id; /*$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); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$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; /*$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); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/lib/propal.lib.php b/htdocs/lib/propal.lib.php index fc82d7df4cd..f50f71e7311 100644 --- a/htdocs/lib/propal.lib.php +++ b/htdocs/lib/propal.lib.php @@ -81,7 +81,7 @@ function propal_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id; /*$filesdir = $conf->propale->dir_output . "/" . dol_sanitizeFileName($propal->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); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index 97c3a72d4b2..3d0fa964e6f 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -314,7 +314,7 @@ class Livraison extends CommonObject function valid($user) { global $conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); dol_syslog("livraison.class.php::valid begin"); @@ -526,7 +526,7 @@ class Livraison extends CommonObject */ function delete() { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $this->db->begin(); $sql = "DELETE FROM ".MAIN_DB_PREFIX."livraisondet"; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index d8b33fb3c1f..6fb35027c98 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2459,7 +2459,7 @@ class Product extends CommonObject */ 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 ."/photos"; @@ -2544,7 +2544,7 @@ class Product extends CommonObject */ function is_photo_available($sdir) { - include_once(DOL_DOCUMENT_ROOT ."/lib/files.lib.php"); + include_once(DOL_DOCUMENT_ROOT ."/core/lib/files.lib.php"); $pdir = get_exdir($this->id,2) . $this->id ."/photos/"; $dir = $sdir . '/'. $pdir; @@ -2585,7 +2585,7 @@ class Product extends CommonObject { global $conf,$user,$langs; - include_once(DOL_DOCUMENT_ROOT ."/lib/files.lib.php"); + include_once(DOL_DOCUMENT_ROOT ."/core/lib/files.lib.php"); include_once(DOL_DOCUMENT_ROOT ."/core/lib/images.lib.php"); $pdir = get_exdir($this->id,2) . $this->id ."/photos/"; @@ -2745,7 +2745,7 @@ class Product extends CommonObject */ function liste_photos($dir,$nbmax=0) { - include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); $nbphoto=0; $tabobj=array(); @@ -2797,7 +2797,7 @@ class Product extends CommonObject */ 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 $dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette diff --git a/htdocs/product/document.php b/htdocs/product/document.php index 855f641b906..99905a75082 100755 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -28,7 +28,7 @@ require('../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.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"); $langs->load("other"); @@ -74,7 +74,7 @@ $modulepart='produit'; 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) { diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 4583e20a4a5..11fe01ace16 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -383,7 +383,7 @@ class Project extends CommonObject function delete($user, $notrigger=0) { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php index 5aea22728a1..60bc60a116e 100644 --- a/htdocs/projet/document.php +++ b/htdocs/projet/document.php @@ -24,7 +24,7 @@ require('../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/project.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"); $langs->load('projects'); @@ -69,7 +69,7 @@ if (! $project->fetch($_GET['id'],$_GET['ref']) > 0) // Envoi fichier 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->projet->dir_output . "/" . dol_sanitizeFileName($project->ref); diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index 68c08ae6e71..acb9a7a3fdd 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -25,7 +25,7 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/project.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"); @@ -84,7 +84,7 @@ else // Envoi fichier 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) { diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 068b864bd64..25d5a378562 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -866,7 +866,7 @@ class Societe extends CommonObject function delete($id) { global $user,$langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); dol_syslog(get_class($this)."::delete", LOG_DEBUG); $error = 0; diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index 57c57637dca..9058601728d 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -26,7 +26,7 @@ require("../main.inc.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"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 821901460d2..fc9a466e337 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -30,7 +30,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.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.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index c1118c35cd3..52b85356cb3 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -37,7 +37,7 @@ if (! defined('ADODB_PATH')) require_once('../core/class/translate.class.php'); require_once('../lib/functions.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'); diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index cad5412cb7c..89c410fc5f1 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -267,7 +267,7 @@ if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield) if ($action == 'update' && ! $_POST["cancel"]) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if ($caneditfield) // Case we can edit all field { diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index c42ff64e79a..03f4847fb08 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -51,7 +51,7 @@ function llxHeader() { } require("./main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); // Security check if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart'); From 56d6cbe56f81aadf376db24c17da8b7381effaf8 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Oct 2011 12:59:44 +0200 Subject: [PATCH 23/41] [task #216] Move lib in core directory --- dev/skeletons/skeleton_webservice_server.php | 2 +- dev/translation/autotranslator.php | 2 +- htdocs/adherents/admin/adherent.php | 2 +- htdocs/adherents/admin/adherent_extrafields.php | 2 +- htdocs/adherents/admin/public.php | 2 +- htdocs/adherents/card_subscriptions.php | 4 ++-- htdocs/adherents/cartes/carte.php | 2 +- htdocs/adherents/document.php | 6 +++--- htdocs/adherents/fiche.php | 4 ++-- htdocs/adherents/fiche_subscription.php | 2 +- htdocs/adherents/info.php | 2 +- htdocs/adherents/info_subscription.php | 2 +- htdocs/adherents/ldap.php | 2 +- htdocs/adherents/note.php | 2 +- htdocs/adherents/stats/geo.php | 2 +- htdocs/adherents/stats/index.php | 2 +- htdocs/admin/company.php | 4 ++-- htdocs/admin/ihm.php | 2 +- htdocs/admin/limits.php | 2 +- htdocs/admin/mails.php | 4 ++-- htdocs/admin/menus/menu.js.php | 2 +- htdocs/admin/pdf.php | 2 +- htdocs/admin/security_other.php | 2 +- htdocs/admin/tools/export.php | 2 +- htdocs/admin/tools/purge.php | 2 +- htdocs/admin/tools/update.php | 2 +- htdocs/asterisk/wrapper.php | 2 +- htdocs/cache.manifest | 2 +- htdocs/cashdesk/class/Facturation.class.php | 2 +- htdocs/categories/categorie.php | 4 ++-- htdocs/categories/class/categorie.class.php | 4 ++-- htdocs/comm/action/class/actioncomm.class.php | 4 ++-- htdocs/comm/action/document.php | 4 ++-- htdocs/comm/action/fiche.php | 2 +- htdocs/comm/action/index.php | 2 +- htdocs/comm/action/listactions.php | 2 +- htdocs/comm/action/rapport/index.php | 2 +- htdocs/comm/addpropal.php | 2 +- htdocs/comm/mailing/cibles.php | 2 +- htdocs/comm/mailing/fiche.php | 6 +++--- htdocs/comm/mailing/info.php | 2 +- htdocs/comm/propal.php | 6 +++--- htdocs/comm/propal/apercu.php | 4 ++-- htdocs/comm/propal/class/propal.class.php | 8 ++++---- htdocs/comm/propal/contact.php | 2 +- htdocs/comm/propal/document.php | 4 ++-- htdocs/comm/propal/info.php | 2 +- htdocs/comm/propal/note.php | 2 +- htdocs/commande/apercu.php | 4 ++-- htdocs/commande/class/commande.class.php | 10 +++++----- htdocs/commande/contact.php | 2 +- htdocs/commande/document.php | 4 ++-- htdocs/commande/fiche.php | 10 +++++----- htdocs/commande/info.php | 2 +- htdocs/commande/note.php | 2 +- htdocs/compta/deplacement/fiche.php | 2 +- htdocs/compta/dons/fiche.php | 2 +- htdocs/compta/facture.php | 8 ++++---- htdocs/compta/facture/apercu.php | 4 ++-- htdocs/compta/facture/class/facture-rec.class.php | 2 +- htdocs/compta/facture/class/facture.class.php | 8 ++++---- htdocs/compta/facture/contact.php | 2 +- htdocs/compta/facture/document.php | 4 ++-- htdocs/compta/facture/impayees.php | 4 ++-- htdocs/compta/facture/info.php | 2 +- htdocs/compta/facture/note.php | 2 +- htdocs/compta/facture/prelevement.php | 2 +- htdocs/compta/journal/purchasesjournal.php | 2 +- htdocs/compta/journal/sellsjournal.php | 2 +- htdocs/compta/paiement/rapport.php | 2 +- htdocs/compta/prelevement/bon.php | 4 ++-- htdocs/compta/prelevement/create.php | 2 +- htdocs/compta/prelevement/factures.php | 2 +- htdocs/compta/prelevement/fiche-rejet.php | 2 +- htdocs/compta/prelevement/fiche-stat.php | 2 +- htdocs/compta/prelevement/fiche.php | 4 ++-- htdocs/compta/prelevement/index.php | 2 +- htdocs/compta/prelevement/lignes.php | 2 +- htdocs/compta/propal.php | 2 +- htdocs/compta/resultat/clientfourn.php | 4 ++-- htdocs/compta/resultat/index.php | 2 +- htdocs/compta/stats/cabyuser.php | 4 ++-- htdocs/compta/stats/casoc.php | 4 ++-- htdocs/compta/stats/index.php | 2 +- htdocs/compta/tva/clients.php | 4 ++-- htdocs/compta/tva/index.php | 2 +- htdocs/compta/tva/quadri_detail.php | 4 ++-- htdocs/contact/exportimport.php | 2 +- htdocs/contact/fiche.php | 2 +- htdocs/contact/info.php | 2 +- htdocs/contact/ldap.php | 2 +- htdocs/contact/perso.php | 2 +- htdocs/contrat/class/contrat.class.php | 2 +- htdocs/contrat/contact.php | 2 +- htdocs/contrat/document.php | 6 +++--- htdocs/contrat/fiche.php | 4 ++-- htdocs/contrat/info.php | 2 +- htdocs/contrat/note.php | 2 +- htdocs/core/ajaxfileupload.php | 2 +- htdocs/core/class/commonobject.class.php | 2 +- htdocs/core/class/html.form.class.php | 2 +- htdocs/core/class/html.formfile.class.php | 2 +- htdocs/core/class/html.formmail.class.php | 2 +- htdocs/core/class/notify.class.php | 2 +- htdocs/core/class/rssparser.class.php | 2 +- htdocs/{lib => core}/doxygen.php | 0 htdocs/{ => core}/lib/contact.lib.php | 2 +- htdocs/{ => core}/lib/contract.lib.php | 2 +- htdocs/{ => core}/lib/ecm.lib.php | 2 +- htdocs/{ => core}/lib/emailing.lib.php | 2 +- htdocs/{ => core}/lib/fichinter.lib.php | 2 +- htdocs/{ => core}/lib/files.lib.php | 4 ++-- htdocs/{ => core}/lib/fourn.lib.php | 6 +++--- htdocs/{ => core}/lib/functions.lib.php | 6 +++--- htdocs/core/lib/functions2.lib.php | 2 +- htdocs/{ => core}/lib/import.lib.php | 2 +- htdocs/{ => core}/lib/invoice.lib.php | 4 ++-- htdocs/{ => core}/lib/member.lib.php | 2 +- htdocs/{ => core}/lib/order.lib.php | 4 ++-- htdocs/{ => core}/lib/pdf.lib.php | 2 +- htdocs/{ => core}/lib/prelevement.lib.php | 2 +- htdocs/{ => core}/lib/price.lib.php | 2 +- htdocs/{ => core}/lib/product.lib.php | 2 +- htdocs/{ => core}/lib/project.lib.php | 8 ++++---- htdocs/{ => core}/lib/propal.lib.php | 4 ++-- htdocs/{ => core}/lib/report.lib.php | 2 +- htdocs/{ => core}/lib/sendings.lib.php | 2 +- htdocs/{ => core}/lib/stock.lib.php | 2 +- htdocs/{ => core}/lib/tax.lib.php | 2 +- htdocs/{ => core}/lib/usergroups.lib.php | 2 +- htdocs/{ => core}/lib/ws.lib.php | 2 +- htdocs/{ => core}/lib/xcal.lib.php | 2 +- htdocs/core/photos_resize.php | 2 +- htdocs/document.php | 2 +- htdocs/ecm/class/ecmdirectory.class.php | 4 ++-- htdocs/ecm/docfile.php | 4 ++-- htdocs/ecm/docmine.php | 6 +++--- htdocs/ecm/docother.php | 4 ++-- htdocs/ecm/index.php | 4 ++-- htdocs/ecm/search.php | 4 ++-- htdocs/expedition/class/expedition.class.php | 4 ++-- htdocs/expedition/fiche.php | 8 ++++---- htdocs/expedition/shipment.php | 4 ++-- htdocs/fichinter/apercu.php | 4 ++-- htdocs/fichinter/class/fichinter.class.php | 2 +- htdocs/fichinter/contact.php | 2 +- htdocs/fichinter/document.php | 6 +++--- htdocs/fichinter/fiche.php | 8 ++++---- htdocs/fichinter/info.php | 2 +- htdocs/fichinter/note.php | 2 +- htdocs/filefunc.inc.php | 4 ++-- htdocs/fourn/class/fournisseur.commande.class.php | 6 +++--- htdocs/fourn/class/fournisseur.facture.class.php | 4 ++-- htdocs/fourn/commande/contact.php | 2 +- htdocs/fourn/commande/dispatch.php | 2 +- htdocs/fourn/commande/document.php | 8 ++++---- htdocs/fourn/commande/fiche.php | 8 ++++---- htdocs/fourn/commande/history.php | 2 +- htdocs/fourn/commande/note.php | 2 +- htdocs/fourn/facture/contact.php | 2 +- htdocs/fourn/facture/document.php | 6 +++--- htdocs/fourn/facture/fiche.php | 8 ++++---- htdocs/fourn/facture/info.php | 2 +- htdocs/fourn/facture/note.php | 2 +- htdocs/ftp/index.php | 4 ++-- htdocs/imports/emptyexample.php | 2 +- htdocs/imports/import.php | 6 +++--- htdocs/includes/modules/action/rapport.pdf.php | 2 +- htdocs/includes/modules/barcode/modules_barcode.php | 2 +- .../includes/modules/cheque/pdf/pdf_blochet.class.php | 2 +- htdocs/includes/modules/commande/modules_commande.php | 2 +- .../includes/modules/commande/pdf_edison.modules.php | 2 +- .../includes/modules/commande/pdf_einstein.modules.php | 2 +- .../modules/expedition/methode_expedition.modules.php | 2 +- .../expedition/pdf/pdf_expedition_merou.modules.php | 2 +- .../expedition/pdf/pdf_expedition_rouget.modules.php | 2 +- .../facture/doc/doc_generic_invoice_odt.modules.php | 2 +- .../includes/modules/facture/doc/pdf_crabe.modules.php | 2 +- .../modules/facture/doc/pdf_oursin.modules.php | 2 +- htdocs/includes/modules/facture/modules_facture.php | 2 +- .../includes/modules/fichinter/modules_fichinter.php | 2 +- .../includes/modules/fichinter/pdf_soleil.modules.php | 2 +- htdocs/includes/modules/import/modules_import.php | 2 +- .../includes/modules/livraison/modules_livraison.php | 2 +- .../modules/livraison/pdf/pdf_sirocco.modules.php | 2 +- .../modules/livraison/pdf/pdf_typhon.modules.php | 2 +- htdocs/includes/modules/mailings/modules_mailings.php | 2 +- htdocs/includes/modules/mailings/peche.modules.php | 2 +- htdocs/includes/modules/member/cards/modules_cards.php | 2 +- .../modules/member/cards/pdf_standard.class.php | 2 +- .../includes/modules/member/labels/modules_labels.php | 2 +- .../modules/member/labels/pdf_standardlabel.class.php | 2 +- htdocs/includes/modules/modFacture.class.php | 2 +- htdocs/includes/modules/modSociete.class.php | 2 +- htdocs/includes/modules/project/modules_project.php | 2 +- .../modules/project/pdf/pdf_baleine.modules.php | 2 +- htdocs/includes/modules/propale/modules_propale.php | 2 +- .../modules/propale/pdf_propale_azur.modules.php | 2 +- .../modules/propale/pdf_propale_jaune.modules.php | 2 +- htdocs/includes/modules/rapport/pdf_paiement.class.php | 2 +- .../modules/security/generate/modules_genpassword.php | 2 +- .../modules/societe/doc/doc_generic_odt.modules.php | 2 +- .../supplier_invoice/modules_facturefournisseur.php | 2 +- .../supplier_invoice/pdf/pdf_canelle.modules.php | 2 +- .../supplier_order/modules_commandefournisseur.php | 2 +- .../supplier_order/pdf/pdf_muscadet.modules.php | 2 +- htdocs/install/inc.php | 4 ++-- htdocs/install/upgrade2.php | 4 ++-- htdocs/lib/.cvsignore | 1 - htdocs/lib/index.php | 1 - htdocs/livraison/class/livraison.class.php | 4 ++-- htdocs/livraison/fiche.php | 2 +- htdocs/product/barcode.php | 2 +- htdocs/product/class/product.class.php | 10 +++++----- htdocs/product/composition/fiche.php | 2 +- htdocs/product/document.php | 6 +++--- htdocs/product/fiche.php | 2 +- htdocs/product/fournisseurs.php | 2 +- htdocs/product/photos.php | 2 +- htdocs/product/price.php | 2 +- htdocs/product/stats/commande.php | 2 +- htdocs/product/stats/commande_fournisseur.php | 2 +- htdocs/product/stats/contrat.php | 2 +- htdocs/product/stats/facture.php | 2 +- htdocs/product/stats/facture_fournisseur.php | 2 +- htdocs/product/stats/fiche.php | 2 +- htdocs/product/stats/propal.php | 2 +- htdocs/product/stock/fiche-valo.php | 2 +- htdocs/product/stock/fiche.php | 4 ++-- htdocs/product/stock/info.php | 2 +- htdocs/product/stock/mouvement.php | 4 ++-- htdocs/product/stock/product.php | 2 +- htdocs/product/stock/user.php | 2 +- htdocs/product/traduction.php | 2 +- htdocs/projet/activity/index.php | 2 +- htdocs/projet/activity/list.php | 2 +- htdocs/projet/class/project.class.php | 2 +- htdocs/projet/contact.php | 2 +- htdocs/projet/document.php | 6 +++--- htdocs/projet/element.php | 2 +- htdocs/projet/fiche.php | 2 +- htdocs/projet/ganttview.php | 2 +- htdocs/projet/index.php | 2 +- htdocs/projet/note.php | 2 +- htdocs/projet/tasks.php | 2 +- htdocs/projet/tasks/contact.php | 2 +- htdocs/projet/tasks/document.php | 6 +++--- htdocs/projet/tasks/index.php | 2 +- htdocs/projet/tasks/note.php | 2 +- htdocs/projet/tasks/task.php | 2 +- htdocs/projet/tasks/time.php | 2 +- htdocs/societe/class/societe.class.php | 2 +- htdocs/societe/document.php | 2 +- htdocs/societe/soc.php | 2 +- htdocs/support/inc.php | 4 ++-- htdocs/theme/auguria/style.css.php | 2 +- htdocs/theme/bureau2crea/style.css.php | 2 +- htdocs/theme/cameleo/style.css.php | 2 +- htdocs/theme/eldy/style.css.php | 2 +- .../phones/smartphone/theme/default/default.css.php | 2 +- htdocs/user/clicktodial.php | 2 +- htdocs/user/fiche.php | 4 ++-- htdocs/user/group/fiche.php | 2 +- htdocs/user/group/ldap.php | 2 +- htdocs/user/group/perms.php | 2 +- htdocs/user/info.php | 2 +- htdocs/user/ldap.php | 2 +- htdocs/user/note.php | 2 +- htdocs/user/param_ihm.php | 2 +- htdocs/user/passwordforgotten.php | 2 +- htdocs/user/perms.php | 2 +- htdocs/viewimage.php | 2 +- htdocs/webservices/server_invoice.php | 2 +- htdocs/webservices/server_other.php | 2 +- htdocs/webservices/server_productorservice.php | 2 +- htdocs/webservices/server_supplier_invoice.php | 2 +- htdocs/webservices/server_thirdparty.php | 2 +- htdocs/webservices/server_user.php | 2 +- scripts/invoices/rebuild_merge_pdf.php | 2 +- test/phpunit/BuildDocTest.php | 2 +- test/phpunit/SecurityTest.php | 2 +- 281 files changed, 390 insertions(+), 392 deletions(-) rename htdocs/{lib => core}/doxygen.php (100%) rename htdocs/{ => core}/lib/contact.lib.php (97%) rename htdocs/{ => core}/lib/contract.lib.php (97%) rename htdocs/{ => core}/lib/ecm.lib.php (97%) rename htdocs/{ => core}/lib/emailing.lib.php (96%) rename htdocs/{ => core}/lib/fichinter.lib.php (98%) rename htdocs/{ => core}/lib/files.lib.php (99%) rename htdocs/{ => core}/lib/fourn.lib.php (96%) rename htdocs/{ => core}/lib/functions.lib.php (99%) rename htdocs/{ => core}/lib/import.lib.php (97%) rename htdocs/{ => core}/lib/invoice.lib.php (96%) rename htdocs/{ => core}/lib/member.lib.php (99%) rename htdocs/{ => core}/lib/order.lib.php (97%) rename htdocs/{ => core}/lib/pdf.lib.php (99%) rename htdocs/{ => core}/lib/prelevement.lib.php (98%) rename htdocs/{ => core}/lib/price.lib.php (99%) rename htdocs/{ => core}/lib/product.lib.php (99%) rename htdocs/{ => core}/lib/project.lib.php (98%) rename htdocs/{ => core}/lib/propal.lib.php (96%) rename htdocs/{ => core}/lib/report.lib.php (98%) rename htdocs/{ => core}/lib/sendings.lib.php (99%) rename htdocs/{ => core}/lib/stock.lib.php (98%) rename htdocs/{ => core}/lib/tax.lib.php (99%) rename htdocs/{ => core}/lib/usergroups.lib.php (99%) rename htdocs/{ => core}/lib/ws.lib.php (98%) rename htdocs/{ => core}/lib/xcal.lib.php (99%) delete mode 100644 htdocs/lib/.cvsignore delete mode 100644 htdocs/lib/index.php diff --git a/dev/skeletons/skeleton_webservice_server.php b/dev/skeletons/skeleton_webservice_server.php index 6980c1322ec..3306d28a9f8 100644 --- a/dev/skeletons/skeleton_webservice_server.php +++ b/dev/skeletons/skeleton_webservice_server.php @@ -26,7 +26,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); require_once("../master.inc.php"); require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php"); require_once(DOL_DOCUMENT_ROOT."/skeleton/class/skeleton.class.php"); diff --git a/dev/translation/autotranslator.php b/dev/translation/autotranslator.php index 17ec9feb824..78d89b691a9 100644 --- a/dev/translation/autotranslator.php +++ b/dev/translation/autotranslator.php @@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Include Dolibarr environment 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. // Load main language strings diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index 0d2da719ae8..fe8dc327f41 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -29,7 +29,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); $langs->load("admin"); $langs->load("members"); diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index 6086021f0cd..7f9d3fe1ca5 100755 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); $langs->load("members"); diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php index 6f4bafd5139..d40e075e46e 100755 --- a/htdocs/adherents/admin/public.php +++ b/htdocs/adherents/admin/public.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); $langs->load("members"); $langs->load("admin"); diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 445c7d302c2..43f75f7e122 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); @@ -372,7 +372,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $ { require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); - require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); // Creation de la ligne paiement $amounts[$invoice->id] = price2num($cotisation); diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index b5602c26ce1..b3bc6a9a68f 100755 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -23,7 +23,7 @@ * \brief Page to output members business cards */ 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."/includes/modules/member/cards/modules_cards.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/labels/modules_labels.php"); diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php index 4111d66e0ff..c6c4a9e0c4f 100644 --- a/htdocs/adherents/document.php +++ b/htdocs/adherents/document.php @@ -25,8 +25,8 @@ */ require("../main.inc.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/member.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."/adherents/class/adherent.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 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) { diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 96adf248ab4..1f28bf85ae0 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); @@ -206,7 +206,7 @@ if ($_REQUEST["action"] == 'confirm_sendinfo' && $_REQUEST["confirm"] == 'yes') 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=''; if (isset($_POST["naissday"]) && $_POST["naissday"] diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php index 58a19fdf0e7..d7b86d7202d 100644 --- a/htdocs/adherents/fiche_subscription.php +++ b/htdocs/adherents/fiche_subscription.php @@ -22,7 +22,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); diff --git a/htdocs/adherents/info.php b/htdocs/adherents/info.php index 7f14fccd751..7fc5b055798 100644 --- a/htdocs/adherents/info.php +++ b/htdocs/adherents/info.php @@ -25,7 +25,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/adherents/info_subscription.php b/htdocs/adherents/info_subscription.php index a9f28e7bdbd..4634bc4a7d0 100644 --- a/htdocs/adherents/info_subscription.php +++ b/htdocs/adherents/info_subscription.php @@ -25,7 +25,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); $langs->load("companies"); diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php index 1f0d35d0b6e..d202a411271 100644 --- a/htdocs/adherents/ldap.php +++ b/htdocs/adherents/ldap.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 0a5820c2dc4..49bafc349f4 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/member.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index 5ac68ded510..d805316dae6 100755 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -23,7 +23,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); $graphwidth = 700; $mapratio = 0.5; diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php index 90fcf1f840c..33829124cc0 100644 --- a/htdocs/adherents/stats/index.php +++ b/htdocs/adherents/stats/index.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherentstats.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); $WIDTH=500; $HEIGHT=200; diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index e26f56e088b..41da98b8ac9 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -47,7 +47,7 @@ accessforbidden(); if ( (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["cancel"])) || (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_code=getCountry($new_pays_id,2); @@ -201,7 +201,7 @@ if ($_GET["action"] == 'addthumb') 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; dol_delete_file($logofile); diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 11b8261b2ee..a3d09caff99 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index 4244a56be9d..fb9fce66af8 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -24,7 +24,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/price.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/price.lib.php"); $langs->load("companies"); $langs->load("products"); diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 5231c0c6235..66e41488edc 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -23,7 +23,7 @@ require("../main.inc.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("products"); @@ -74,7 +74,7 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["can */ 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 $vardir=$conf->user->dir_output."/".$user->id; diff --git a/htdocs/admin/menus/menu.js.php b/htdocs/admin/menus/menu.js.php index 8526569f1fc..0401e57186d 100644 --- a/htdocs/admin/menus/menu.js.php +++ b/htdocs/admin/menus/menu.js.php @@ -35,7 +35,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); session_cache_limiter(FALSE); require_once("../../master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php"); // Define css type header('Content-type: application/javascript'); diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 7ec878ce5a7..0bbf3e2ec55 100755 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index 7ec5d5ef5d8..28a59e6c57e 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -41,7 +41,7 @@ $upload_dir=$conf->admin->dir_temp; 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 if ($result >= 0) diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index aa3c0260424..fd3fee5a12d 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -22,7 +22,7 @@ require("../../main.inc.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"); $what=$_REQUEST["what"]; diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php index de654b71832..62f536bcba7 100644 --- a/htdocs/admin/tools/purge.php +++ b/htdocs/admin/tools/purge.php @@ -21,7 +21,7 @@ */ 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"); diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index e9cdbbfb423..17eadcaa563 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -22,7 +22,7 @@ */ 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("other"); diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php index a4285e2357b..80d394fa452 100644 --- a/htdocs/asterisk/wrapper.php +++ b/htdocs/asterisk/wrapper.php @@ -61,7 +61,7 @@ function llxFooter() } require_once("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); diff --git a/htdocs/cache.manifest b/htdocs/cache.manifest index 9d7b4f8d58c..f0ea032ea16 100644 --- a/htdocs/cache.manifest +++ b/htdocs/cache.manifest @@ -12,7 +12,7 @@ index.php main.inc.php master.inc.php filefunc.inc.php -lib/functions.lib.php +core/lib/functions.lib.php # The NETWORK section contains the path to a folder to ensure that requests # to load resources contained under /api will bypass the cache and always fetch the resource from the server. diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index 87a46c7eee2..9f2ea75cc00 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); +include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); /** diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 9e822d2b465..d1203ec5674 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -284,7 +284,7 @@ else if ($id || $ref) /* * Fiche categorie de produit */ - require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); // Produit @@ -339,7 +339,7 @@ else if ($id || $ref) /* * Fiche categorie d'adherent */ - require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index a0dbbca0e7a..ab58b71972c 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -1201,7 +1201,7 @@ class Categorie */ 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 .= "photos/"; @@ -1306,7 +1306,7 @@ class Categorie */ 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 $dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 0b79eca3148..c712ce38e8b 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -665,7 +665,7 @@ class ActionComm extends CommonObject { global $conf,$langs,$dolibarr_main_url_root,$mysoc; - require_once (DOL_DOCUMENT_ROOT ."/lib/xcal.lib.php"); + require_once (DOL_DOCUMENT_ROOT ."/core/lib/xcal.lib.php"); require_once (DOL_DOCUMENT_ROOT ."/core/lib/date.lib.php"); dol_syslog(get_class($this)."::build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG); @@ -695,7 +695,7 @@ class ActionComm extends CommonObject if ($cachedelay) { $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)) { dol_syslog(get_class($this)."::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled"); diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 4e5ebb4003d..542aac2679a 100755 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -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."/comm/action/class/cactioncomm.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"); 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)) { - 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 $upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($objectid); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 1b4ff95ec73..b8ebf2b0911 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -33,7 +33,7 @@ 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."/core/class/html.formactions.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); $langs->load("companies"); $langs->load("commercial"); diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index b37f2d91ce6..29bc44f5d4c 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -31,7 +31,7 @@ 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."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); $filter=GETPOST("filter"); $filtera = GETPOST("userasked","int")?GETPOST("userasked","int"):GETPOST("filtera","int"); diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index adfa2577238..b754aef6035 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -29,7 +29,7 @@ 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."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); $langs->load("companies"); $langs->load("agenda"); diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index 840442f99b4..6ecc759472b 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -25,7 +25,7 @@ */ 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."/comm/action/class/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/action/rapport.pdf.php"); diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 8e7526410f9..0b844539bca 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php'); if ($conf->projet->enabled) { require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); - require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); } $langs->load("propal"); diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 2e25be7e3ea..543537efe41 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -25,7 +25,7 @@ require("../../main.inc.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/lib/functions2.lib.php"); diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 22556691b4b..6fbade0ac8c 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -23,8 +23,8 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.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/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php"); @@ -450,7 +450,7 @@ if (! empty($_POST["removedfileid"])) // Action update emailing 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->fetch($_POST["id"]); diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php index ecff22ad16a..632120ac5ec 100644 --- a/htdocs/comm/mailing/info.php +++ b/htdocs/comm/mailing/info.php @@ -25,7 +25,7 @@ require("../../main.inc.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."/lib/emailing.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php"); $langs->load("mails"); diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index cb8de4ddf23..10b5e9ef4a5 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); @@ -399,7 +399,7 @@ if (GETPOST('action') == 'setstatut' && $user->rights->propale->cloturer) */ 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 $vardir=$conf->user->dir_output."/".$user->id; @@ -416,7 +416,7 @@ if ($_POST['addfile']) */ 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 $vardir=$conf->user->dir_output."/".$user->id; diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index a7556454a3c..dd64f66e865 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -26,8 +26,8 @@ require("../../main.inc.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/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.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"); $langs->load('propal'); diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 4731f0343da..b025757364e 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -209,7 +209,7 @@ class Propal extends CommonObject { global $langs; - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); $this->db->begin(); @@ -306,7 +306,7 @@ class Propal extends CommonObject global $conf; dol_syslog("Propal::Addline propalid=$propalid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type"); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); // Clean parameters if (empty($remise_percent)) $remise_percent=0; @@ -453,7 +453,7 @@ class Propal extends CommonObject global $conf,$user,$langs; dol_syslog("Propal::UpdateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits"); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); // Clean parameters $remise_percent=price2num($remise_percent); @@ -1734,7 +1734,7 @@ class Propal extends CommonObject function delete($user, $notrigger=0) { global $conf,$langs; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index e4dfe3299a7..9ba449fee5c 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -25,7 +25,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); $langs->load("facture"); diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index 3a3d41b2fcb..05860909553 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -26,8 +26,8 @@ require("../../main.inc.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/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load('compta'); diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php index 1b95d4559c5..4758df0f0b7 100644 --- a/htdocs/comm/propal/info.php +++ b/htdocs/comm/propal/info.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.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."/core/lib/propal.lib.php"); $langs->load('propal'); $langs->load('compta'); diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index 3277f9cb812..18fb187033d 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -26,7 +26,7 @@ require("../../main.inc.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."/core/lib/propal.lib.php"); $langs->load('propal'); $langs->load('compta'); diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index 348e0000ba7..991718fe291 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -25,8 +25,8 @@ */ require("../main.inc.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/order.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.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->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index ba39d848325..3cbe3d57927 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -174,7 +174,7 @@ class Commande extends CommonObject function valid($user) { global $conf,$langs; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; @@ -975,7 +975,7 @@ class Commande extends CommonObject { dol_syslog("Commande::addline commandeid=$commandeid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type", LOG_DEBUG); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); // Clean parameters if (empty($remise_percent)) $remise_percent=0; @@ -1320,7 +1320,7 @@ class Commande extends CommonObject { global $langs; - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); $this->db->begin(); @@ -2173,7 +2173,7 @@ class Commande extends CommonObject global $conf; dol_syslog("CustomerOrder::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $date_start, $date_end, $type"); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); if ($this->brouillon) { @@ -2290,7 +2290,7 @@ class Commande extends CommonObject function delete($user) { global $conf, $langs; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $err = 0; diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index 0502fea62a4..ebfb90552e7 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -26,7 +26,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); $langs->load("orders"); diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index bc5feec9fc7..5c2e43f0431 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -25,8 +25,8 @@ */ require("../main.inc.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/order.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 ."/commande/class/commande.class.php"); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 0120bb75ae6..4139763c5a1 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -33,10 +33,10 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formorder.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/commande/modules_commande.php"); require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.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.'/lib/project.lib.php'); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); if (!$user->rights->commande->lire) accessforbidden(); @@ -892,7 +892,7 @@ if ($action == 'remove_file') { 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; $file = $upload_dir . '/' . $_GET['file']; @@ -906,7 +906,7 @@ if ($action == 'remove_file') */ 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 $vardir=$conf->user->dir_output."/".$user->id; @@ -922,7 +922,7 @@ if ($_POST['addfile']) */ 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 $vardir=$conf->user->dir_output."/".$user->id; diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php index 03274702287..cad4ee3e70c 100644 --- a/htdocs/commande/info.php +++ b/htdocs/commande/info.php @@ -25,7 +25,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php"); if (!$user->rights->commande->lire) accessforbidden(); diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php index 343b5d38e2b..dfd1be92018 100644 --- a/htdocs/commande/note.php +++ b/htdocs/commande/note.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'); require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php"); $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:""; diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index 18e4ff0292d..9142f3dc28e 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php" require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); if ($conf->projet->enabled) { - require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); } diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index 750cd936988..e688274d4ee 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php'); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); $langs->load("companies"); $langs->load("donations"); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 7926805d3bc..0d43862bc08 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -35,10 +35,10 @@ 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.'/compta/paiement/class/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.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.'/lib/project.lib.php'); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); $langs->load('bills'); //print 'ee'.$langs->trans('BillsCustomer');exit; @@ -1177,7 +1177,7 @@ if ($action == 'down' && $user->rights->facture->creer) */ 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 $vardir=$conf->user->dir_output."/".$user->id; @@ -1193,7 +1193,7 @@ if ($_POST['addfile']) */ 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 $vardir=$conf->user->dir_output."/".$user->id; diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 1a33f00cde2..cac85592238 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -27,8 +27,8 @@ require("../../main.inc.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/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.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"); $langs->load("bills"); diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index f9baebbe540..0ac3b4da79b 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -409,7 +409,7 @@ class FactureRec extends Facture function addline($facid, $desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0) { dol_syslog("FactureRec::addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva,fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type", LOG_DEBUG); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); // Check parameters if ($type < 0) return -1; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index aa1f4b48816..31da3914858 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1044,7 +1044,7 @@ class Facture extends CommonObject { global $langs; - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); $this->db->begin(); @@ -1488,7 +1488,7 @@ class Facture extends CommonObject function validate($user, $force_number='') { global $conf,$langs; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; @@ -1790,7 +1790,7 @@ class Facture extends CommonObject function addline($facid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0) { dol_syslog("Facture::Addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type", LOG_DEBUG); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); // Clean parameters if (empty($remise_percent)) $remise_percent=0; @@ -1947,7 +1947,7 @@ class Facture extends CommonObject */ function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0,$price_base_type='HT', $info_bits=0, $type=0, $fk_parent_line=0, $skip_update_total=0) { - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); dol_syslog("Facture::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type", LOG_DEBUG); diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index 2aae1a917c2..f826d454858 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.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.'/core/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); $langs->load("bills"); diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index a2df7ced07e..14a47995a1b 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -27,8 +27,8 @@ require("../../main.inc.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."/lib/invoice.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/invoice.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load('propal'); diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 9b49f27c7e1..8bfa5d75072 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -28,8 +28,8 @@ require("../../main.inc.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/paiement/class/paiement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); $langs->load("bills"); diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php index 0fe5dbc4e1d..4bcf7acea5c 100644 --- a/htdocs/compta/facture/info.php +++ b/htdocs/compta/facture/info.php @@ -26,7 +26,7 @@ require("../../main.inc.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/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); $langs->load("bills"); diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index 6fbb1b18049..90b338b8ce6 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -25,7 +25,7 @@ require("../../main.inc.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.'/lib/invoice.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:""; diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index a67ecd2bbc9..a6b603d6d7b 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -25,7 +25,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index c9efde9acb6..f48dda6de05 100755 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -23,7 +23,7 @@ * \brief Page with purchases journal */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index 602949ec724..6d42ecbe133 100755 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -23,7 +23,7 @@ * \brief Page with sells journal */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index cb72c923efb..18309fd1713 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -24,7 +24,7 @@ require("../../main.inc.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 if (! $user->rights->facture->lire) diff --git a/htdocs/compta/prelevement/bon.php b/htdocs/compta/prelevement/bon.php index f23b09fdfb2..8266381265a 100644 --- a/htdocs/compta/prelevement/bon.php +++ b/htdocs/compta/prelevement/bon.php @@ -24,8 +24,8 @@ */ require("../bank/pre.inc.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/prelevement.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"; $langs->load("bills"); diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index fbf7535becf..606bc3600f2 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -80,7 +80,7 @@ $bprev = new BonPrelevement($db); llxHeader('', $langs->trans("NewStandingOrder")); -require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); if (prelevement_check_config() < 0) { $langs->load("errors"); diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 0d813e09876..58fe3761db9 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -25,7 +25,7 @@ */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index 1fd40679a25..0fb5e55cf77 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -24,7 +24,7 @@ */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 2fdc98fb3e7..9d8261cf209 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -23,7 +23,7 @@ */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php"); diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php index 8ccde5bf97d..abe3798fc6a 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -24,7 +24,7 @@ */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); if (!$user->rights->prelevement->bons->lire) @@ -58,7 +58,7 @@ if ( $action == 'confirm_credite' && GETPOST("confirm") == 'yes') 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->fetch($id); diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index 80c54c315ab..7c9a1347d9b 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -49,7 +49,7 @@ $result = restrictedArea($user, 'prelevement','',''); llxHeader('',$langs->trans("CustomersStandingOrdersArea")); -require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); if (prelevement_check_config() < 0) { $langs->load("errors"); diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index c741bb04dbe..6333000b8ad 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -24,7 +24,7 @@ */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index 7660cf99a1e..519ae0960d5 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -30,7 +30,7 @@ require('../main.inc.php'); 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."/comm/propal/class/propal.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 8b40189a080..a5c566391e9 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -25,8 +25,8 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index d8dce74a3cc..2af686bdec7 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -23,7 +23,7 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); $year_start=isset($_GET["year_start"])?$_GET["year_start"]:$_POST["year_start"]; diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index 4a123777bd4..4b02a954fac 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -23,8 +23,8 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); // Security check diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index edeea1495ec..7962b3f1059 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -24,8 +24,8 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("companies"); diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index 338a47a5d85..2942b62c912 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -23,7 +23,7 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); $year_start=isset($_GET["year_start"])?$_GET["year_start"]:$_POST["year_start"]; diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 6f9f1ad981e..2a407140eb8 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -25,8 +25,8 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index f4819240fe1..b8a532399ea 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -24,7 +24,7 @@ * \brief Index page of VAT reports */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index d3348cfbf08..c45a609d5a3 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -26,8 +26,8 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php index 6a93b254d11..e75b099a861 100644 --- a/htdocs/contact/exportimport.php +++ b/htdocs/contact/exportimport.php @@ -24,7 +24,7 @@ require("../main.inc.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"); diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 9e30170a702..514ca3a29a3 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -28,7 +28,7 @@ require("../main.inc.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."/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/class/html.formcompany.class.php"); diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php index 242866b7a7e..ad802afa59f 100644 --- a/htdocs/contact/info.php +++ b/htdocs/contact/info.php @@ -25,7 +25,7 @@ require("../main.inc.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."/lib/contact.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php"); $langs->load("companies"); diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php index c7aa3ea5038..3daa1b3b0de 100644 --- a/htdocs/contact/ldap.php +++ b/htdocs/contact/ldap.php @@ -24,7 +24,7 @@ require("../main.inc.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/lib/ldap.lib.php"); diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 2c37327330b..9b6481b309b 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -24,7 +24,7 @@ require("../main.inc.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("other"); diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index cefaf94c63e..560941a64e3 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/price.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/price.lib.php"); /** diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index 858d531cbf6..bee4163db93 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -23,7 +23,7 @@ */ 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."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index b9e7686a0ec..c8a7e6b6b0c 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -26,9 +26,9 @@ */ 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."/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"); $langs->load("other"); @@ -69,7 +69,7 @@ $modulepart='contract'; */ 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) { diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 4f95788c0dc..f32998c3c4d 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -27,12 +27,12 @@ require ("../main.inc.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"); 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->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); $langs->load("contracts"); $langs->load("orders"); diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php index 839e738f10b..315dc569432 100644 --- a/htdocs/contrat/info.php +++ b/htdocs/contrat/info.php @@ -23,7 +23,7 @@ require ("../main.inc.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"); $langs->load("contracts"); diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index 748b309286d..8c4cc75f721 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/note.php @@ -23,7 +23,7 @@ */ 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"); $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:""; diff --git a/htdocs/core/ajaxfileupload.php b/htdocs/core/ajaxfileupload.php index 7c9ebe6a298..5a066d8b783 100644 --- a/htdocs/core/ajaxfileupload.php +++ b/htdocs/core/ajaxfileupload.php @@ -35,7 +35,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't nee 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"); error_reporting(E_ALL | E_STRICT); diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 1b20860c6c8..46a70f250dc 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1122,7 +1122,7 @@ abstract class CommonObject */ function update_price($exclspec=0,$roundingadjust=-1) { - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); if ($roundingadjust < 0 && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $roundingadjust=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND; if ($roundingadjust < 0) $roundingadjust=0; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index c7e2d98c8f1..5d36d245abb 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2253,7 +2253,7 @@ class Form { global $langs; - require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); $langs->load("project"); if ($htmlname != "none") diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 3383a3ce8ca..52580882ccc 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -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) { // 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; diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index fd98f27f37d..590282a5358 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -107,7 +107,7 @@ class FormMail function clear_attached_files() { 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 $vardir=$conf->user->dir_output."/".$user->id; diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index c1ea9e4a6b1..6735e9c91c2 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -161,7 +161,7 @@ class Notify 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'); $subject = '['.$application.'] '.$langs->transnoentitiesnoconv("DolibarrNotification"); diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php index 75dc5ce5eff..cdcbcbd7282 100755 --- a/htdocs/core/class/rssparser.class.php +++ b/htdocs/core/class/rssparser.class.php @@ -80,7 +80,7 @@ class RssParser */ 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 diff --git a/htdocs/lib/doxygen.php b/htdocs/core/doxygen.php similarity index 100% rename from htdocs/lib/doxygen.php rename to htdocs/core/doxygen.php diff --git a/htdocs/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php similarity index 97% rename from htdocs/lib/contact.lib.php rename to htdocs/core/lib/contact.lib.php index 87e25f70550..de6db84af94 100644 --- a/htdocs/lib/contact.lib.php +++ b/htdocs/core/lib/contact.lib.php @@ -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 */ diff --git a/htdocs/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php similarity index 97% rename from htdocs/lib/contract.lib.php rename to htdocs/core/lib/contract.lib.php index 0c0027a2bc1..00b34678f93 100644 --- a/htdocs/lib/contract.lib.php +++ b/htdocs/core/lib/contract.lib.php @@ -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 */ diff --git a/htdocs/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php similarity index 97% rename from htdocs/lib/ecm.lib.php rename to htdocs/core/lib/ecm.lib.php index e425fc9f686..f7c267c8d3c 100644 --- a/htdocs/lib/ecm.lib.php +++ b/htdocs/core/lib/ecm.lib.php @@ -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 * \ingroup ecm */ diff --git a/htdocs/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php similarity index 96% rename from htdocs/lib/emailing.lib.php rename to htdocs/core/lib/emailing.lib.php index 1780e0a2eed..b847d2c512e 100644 --- a/htdocs/lib/emailing.lib.php +++ b/htdocs/core/lib/emailing.lib.php @@ -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 */ diff --git a/htdocs/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php similarity index 98% rename from htdocs/lib/fichinter.lib.php rename to htdocs/core/lib/fichinter.lib.php index ab6d36cf286..53ac8662738 100644 --- a/htdocs/lib/fichinter.lib.php +++ b/htdocs/core/lib/fichinter.lib.php @@ -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 * \ingroup fichinter */ diff --git a/htdocs/lib/files.lib.php b/htdocs/core/lib/files.lib.php similarity index 99% rename from htdocs/lib/files.lib.php rename to htdocs/core/lib/files.lib.php index ee08274abc8..717a6ba4ec4 100644 --- a/htdocs/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/files.lib.php + * \file htdocs/core/lib/files.lib.php * \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) { 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 (empty($dir)) return 'ErrorObjectNoSupportedByFunction'; diff --git a/htdocs/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php similarity index 96% rename from htdocs/lib/fourn.lib.php rename to htdocs/core/lib/fourn.lib.php index 9987d260112..4fc5114b256 100644 --- a/htdocs/lib/fourn.lib.php +++ b/htdocs/core/lib/fourn.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/fourn.lib.php + * \file htdocs/core/lib/fourn.lib.php * \brief Functions used by supplier invoice module * \ingroup supplier */ @@ -58,7 +58,7 @@ function facturefourn_prepare_head($object) $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; - 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); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$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; /*$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); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php similarity index 99% rename from htdocs/lib/functions.lib.php rename to htdocs/core/lib/functions.lib.php index 3828662d34f..81e0f50b182 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -25,7 +25,7 @@ */ /** - * \file htdocs/lib/functions.lib.php + * \file htdocs/core/lib/functions.lib.php * \brief A set of functions for Dolibarr * This file contains all frequently used functions. */ @@ -2081,7 +2081,7 @@ function img_allow($allow,$alt='default') */ 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); $mimeimg=dol_mimetype($file,'',2); @@ -3812,7 +3812,7 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object=' { 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 // We look files into the includes/modules/substitutions directory diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index db317b4a549..7483cbd8e0f 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -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, ...). 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; $dirtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const)); diff --git a/htdocs/lib/import.lib.php b/htdocs/core/lib/import.lib.php similarity index 97% rename from htdocs/lib/import.lib.php rename to htdocs/core/lib/import.lib.php index 23e7f30f73a..4e2f8224b00 100755 --- a/htdocs/lib/import.lib.php +++ b/htdocs/core/lib/import.lib.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/lib/order.lib.php + * \file htdocs/core/lib/order.lib.php * \brief Ensemble de fonctions de base pour le module commande * \ingroup commande */ diff --git a/htdocs/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php similarity index 96% rename from htdocs/lib/invoice.lib.php rename to htdocs/core/lib/invoice.lib.php index 22b0b276571..f718b345eec 100644 --- a/htdocs/lib/invoice.lib.php +++ b/htdocs/core/lib/invoice.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/invoice.lib.php + * \file htdocs/core/lib/invoice.lib.php * \brief Functions used by invoice module * \ingroup invoice */ @@ -74,7 +74,7 @@ function facture_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id; /*$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); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/lib/member.lib.php b/htdocs/core/lib/member.lib.php similarity index 99% rename from htdocs/lib/member.lib.php rename to htdocs/core/lib/member.lib.php index 343898df42c..65822f82972 100644 --- a/htdocs/lib/member.lib.php +++ b/htdocs/core/lib/member.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/member.lib.php + * \file htdocs/core/lib/member.lib.php * \brief Ensemble de fonctions de base pour les adherents */ diff --git a/htdocs/lib/order.lib.php b/htdocs/core/lib/order.lib.php similarity index 97% rename from htdocs/lib/order.lib.php rename to htdocs/core/lib/order.lib.php index f6bb5d33aa9..fb1000b0dd2 100644 --- a/htdocs/lib/order.lib.php +++ b/htdocs/core/lib/order.lib.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/lib/order.lib.php + * \file htdocs/core/lib/order.lib.php * \brief Ensemble de fonctions de base pour le module commande * \ingroup commande */ @@ -75,7 +75,7 @@ function commande_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id; /*$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); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php similarity index 99% rename from htdocs/lib/pdf.lib.php rename to htdocs/core/lib/pdf.lib.php index cd3de50e42d..10e592d090e 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -21,7 +21,7 @@ */ /** - * \file htdocs/lib/pdf.lib.php + * \file htdocs/core/lib/pdf.lib.php * \brief Set of functions used for PDF generation * \ingroup core */ diff --git a/htdocs/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php similarity index 98% rename from htdocs/lib/prelevement.lib.php rename to htdocs/core/lib/prelevement.lib.php index f210b492989..2e1f13cc220 100644 --- a/htdocs/lib/prelevement.lib.php +++ b/htdocs/core/lib/prelevement.lib.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/lib/prelevement.lib.php + * \file htdocs/core/lib/prelevement.lib.php * \brief Ensemble de fonctions de base pour le module prelevement * \ingroup propal */ diff --git a/htdocs/lib/price.lib.php b/htdocs/core/lib/price.lib.php similarity index 99% rename from htdocs/lib/price.lib.php rename to htdocs/core/lib/price.lib.php index 88a4ddd83d5..6c2eb310525 100644 --- a/htdocs/lib/price.lib.php +++ b/htdocs/core/lib/price.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/price.lib.php + * \file htdocs/core/lib/price.lib.php * \brief Librairie contenant les fonctions pour calculer un prix. */ diff --git a/htdocs/lib/product.lib.php b/htdocs/core/lib/product.lib.php similarity index 99% rename from htdocs/lib/product.lib.php rename to htdocs/core/lib/product.lib.php index 62011d3ae97..5944af367e6 100644 --- a/htdocs/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/lib/product.lib.php + * \file htdocs/core/lib/product.lib.php * \brief Ensemble de fonctions de base pour le module produit et service * \ingroup product */ diff --git a/htdocs/lib/project.lib.php b/htdocs/core/lib/project.lib.php similarity index 98% rename from htdocs/lib/project.lib.php rename to htdocs/core/lib/project.lib.php index 4f9eb49b112..f5309dd35f4 100644 --- a/htdocs/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/lib/project.lib.php + * \file htdocs/core/lib/project.lib.php * \brief Functions used by project module * \ingroup project */ @@ -59,7 +59,7 @@ function project_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id; /*$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); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); @@ -94,7 +94,7 @@ function project_prepare_head($object) /** - * \file htdocs/lib/project.lib.php + * \file htdocs/core/lib/project.lib.php * \brief Ensemble de fonctions de base pour le module projet * \ingroup societe */ @@ -127,7 +127,7 @@ function task_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id; /*$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); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php similarity index 96% rename from htdocs/lib/propal.lib.php rename to htdocs/core/lib/propal.lib.php index fc82d7df4cd..29451e58cd0 100644 --- a/htdocs/lib/propal.lib.php +++ b/htdocs/core/lib/propal.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/propal.lib.php + * \file htdocs/core/lib/propal.lib.php * \brief Ensemble de fonctions de base pour le module propal * \ingroup propal */ @@ -81,7 +81,7 @@ function propal_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id; /*$filesdir = $conf->propale->dir_output . "/" . dol_sanitizeFileName($propal->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); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/lib/report.lib.php b/htdocs/core/lib/report.lib.php similarity index 98% rename from htdocs/lib/report.lib.php rename to htdocs/core/lib/report.lib.php index 1485d92608d..2df28ab9218 100644 --- a/htdocs/lib/report.lib.php +++ b/htdocs/core/lib/report.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/report.lib.php + * \file htdocs/core/lib/report.lib.php * \brief Set of functions for reporting */ diff --git a/htdocs/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php similarity index 99% rename from htdocs/lib/sendings.lib.php rename to htdocs/core/lib/sendings.lib.php index 0ee728e22ec..de6b38c669c 100644 --- a/htdocs/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/lib/sendings.lib.php + * \file htdocs/core/lib/sendings.lib.php * \ingroup expedition * \brief Library for expedition module */ diff --git a/htdocs/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php similarity index 98% rename from htdocs/lib/stock.lib.php rename to htdocs/core/lib/stock.lib.php index a1894b38634..6623a961e2d 100644 --- a/htdocs/lib/stock.lib.php +++ b/htdocs/core/lib/stock.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/stock.lib.php + * \file htdocs/core/lib/stock.lib.php * \brief Library file with function for stock module */ diff --git a/htdocs/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php similarity index 99% rename from htdocs/lib/tax.lib.php rename to htdocs/core/lib/tax.lib.php index 8f940c24e67..d205b155185 100644 --- a/htdocs/lib/tax.lib.php +++ b/htdocs/core/lib/tax.lib.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/lib/tax.lib.php + * \file htdocs/core/lib/tax.lib.php * \ingroup tax * \brief Library for tax module */ diff --git a/htdocs/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php similarity index 99% rename from htdocs/lib/usergroups.lib.php rename to htdocs/core/lib/usergroups.lib.php index 9058ff28f2e..cef75daef65 100644 --- a/htdocs/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -19,7 +19,7 @@ /** - * \file htdocs/lib/usergroups.lib.php + * \file htdocs/core/lib/usergroups.lib.php * \brief Ensemble de fonctions de base pour la gestion des utilisaterus et groupes */ function user_prepare_head($object) diff --git a/htdocs/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php similarity index 98% rename from htdocs/lib/ws.lib.php rename to htdocs/core/lib/ws.lib.php index c7d2c019453..f93513bcbdc 100755 --- a/htdocs/lib/ws.lib.php +++ b/htdocs/core/lib/ws.lib.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/lib/ws.lib.php + * \file htdocs/core/lib/ws.lib.php * \ingroup webservices * \brief Set of function for manipulating web services */ diff --git a/htdocs/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php similarity index 99% rename from htdocs/lib/xcal.lib.php rename to htdocs/core/lib/xcal.lib.php index e26f04bfa6d..9ddefa83def 100644 --- a/htdocs/lib/xcal.lib.php +++ b/htdocs/core/lib/xcal.lib.php @@ -17,7 +17,7 @@ /** - * \file htdocs/lib/xcal.lib.php + * \file htdocs/core/lib/xcal.lib.php * \brief Function to manage calendar files (vcal/ical/...) */ diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php index 2b1a8202993..fbde981779c 100644 --- a/htdocs/core/photos_resize.php +++ b/htdocs/core/photos_resize.php @@ -34,7 +34,7 @@ //if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is public (can be called outside logged session) require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/document.php b/htdocs/document.php index 8c06ea3078c..6a96f4c97e5 100644 --- a/htdocs/document.php +++ b/htdocs/document.php @@ -47,7 +47,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); function llxHeader() { } 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 = ''; $action = GETPOST("action"); diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index ac8429d0c0d..31adb1bca7c 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.class.php @@ -322,7 +322,7 @@ class EcmDirectory // extends CommonObject function delete($user) { 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 @@ -643,7 +643,7 @@ class EcmDirectory // extends CommonObject function refreshcachenboffile($all=0) { 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(); $filelist=dol_dir_list($dir,'files',0,'','\.meta$'); diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php index feb37ef27f7..ec851c6e2fa 100644 --- a/htdocs/ecm/docfile.php +++ b/htdocs/ecm/docfile.php @@ -25,8 +25,8 @@ require("../main.inc.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."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php"); // Load traductions files $langs->load("ecm"); diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php index 2fd20a9ed26..c0ffe1aa7dd 100644 --- a/htdocs/ecm/docmine.php +++ b/htdocs/ecm/docmine.php @@ -26,8 +26,8 @@ require("../main.inc.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."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php"); // Load traductions files @@ -83,7 +83,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$relativepath; // Upload file 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) { diff --git a/htdocs/ecm/docother.php b/htdocs/ecm/docother.php index 1d98e484af1..973ee2a4e4a 100644 --- a/htdocs/ecm/docother.php +++ b/htdocs/ecm/docother.php @@ -11,7 +11,7 @@ require("../main.inc.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 $langs->load("ecm"); @@ -46,7 +46,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$section; // Envoie fichier 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) { diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index 83a283fde35..2609e5eb723 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -27,8 +27,8 @@ if (! defined('REQUIRE_JQUERY_LAYOUT')) define('REQUIRE_JQUERY_LAYOUT','1'); require("../main.inc.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."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.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."/ecm/class/ecmdirectory.class.php"); diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php index 7b1005493de..f3e0016ee9d 100644 --- a/htdocs/ecm/search.php +++ b/htdocs/ecm/search.php @@ -25,8 +25,8 @@ require("../main.inc.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."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.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."/ecm/class/ecmdirectory.class.php"); diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index cb9da1f7989..30a50678796 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -421,7 +421,7 @@ class Expedition extends CommonObject { 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"); @@ -770,7 +770,7 @@ class Expedition extends CommonObject { 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(); $sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet"; diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index d049528d8e4..19bf39dcb84 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -32,8 +32,8 @@ require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/sendings.lib.php"); if ($conf->product->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); @@ -287,7 +287,7 @@ if ($action == 'builddoc') // En get ou en post */ 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 $vardir=$conf->user->dir_output."/".$user->id; @@ -303,7 +303,7 @@ if ($_POST['addfile']) */ 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 $vardir=$conf->user->dir_output."/".$user->id; diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index 1e0050ba792..9b37eb076b4 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -28,8 +28,8 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/sendings.lib.php"); if ($conf->product->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/class/product.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"); diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php index b58b40c9e3e..7fe564aa948 100644 --- a/htdocs/fichinter/apercu.php +++ b/htdocs/fichinter/apercu.php @@ -24,8 +24,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.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"); diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 6d240bfb31d..cac377c7b35 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -555,7 +555,7 @@ class Fichinter extends CommonObject function delete($user) { global $conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php index 77c2aa75d98..a5893d6f419 100644 --- a/htdocs/fichinter/contact.php +++ b/htdocs/fichinter/contact.php @@ -25,7 +25,7 @@ require("../main.inc.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."/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'); $langs->load("interventions"); diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index d55461e5fc2..872d191cd1f 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.php @@ -28,8 +28,8 @@ require("../main.inc.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."/lib/fichinter.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load("other"); @@ -69,7 +69,7 @@ $modulepart='fichinter'; */ 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) { diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 5535aeaffba..314b810cf72 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -28,11 +28,11 @@ require("../main.inc.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."/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"); if ($conf->projet->enabled) { - require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); } if (! empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php")) @@ -458,7 +458,7 @@ if ($action == 'down' && $user->rights->ficheinter->creer) */ 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 $vardir=$conf->user->dir_output."/".$user->id; @@ -474,7 +474,7 @@ if ($_POST['addfile']) */ 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 $vardir=$conf->user->dir_output."/".$user->id; diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php index baea3fa8ec5..05c74544d24 100644 --- a/htdocs/fichinter/info.php +++ b/htdocs/fichinter/info.php @@ -26,7 +26,7 @@ require("../main.inc.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."/lib/fichinter.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); $langs->load('companies'); $langs->load("interventions"); diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php index 65a6b9c6e47..764e02bba0b 100644 --- a/htdocs/fichinter/note.php +++ b/htdocs/fichinter/note.php @@ -24,7 +24,7 @@ require("../main.inc.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("interventions"); diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index f91dc0003d9..8695e9d6004 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -205,14 +205,14 @@ if (! defined('DOL_DEFAULT_TTF_BOLD')) { define('DOL_DEFAULT_TTF_BOLD', (!isset( if (! defined('ADODB_DATE_VERSION')) include_once(ADODB_PATH.'adodb-time.inc.php'); -if (! file_exists(DOL_DOCUMENT_ROOT ."/lib/functions.lib.php")) +if (! file_exists(DOL_DOCUMENT_ROOT ."/core/lib/functions.lib.php")) { print "Error: Dolibarr config file content seems to be not correctly defined.
\n"; print "Please run dolibarr setup by calling page /install.
\n"; exit; } -include_once(DOL_DOCUMENT_ROOT ."/lib/functions.lib.php"); // Need 970ko memory (1.1 in 2.2) +include_once(DOL_DOCUMENT_ROOT ."/core/lib/functions.lib.php"); // Need 970ko memory (1.1 in 2.2) include_once(DOL_DOCUMENT_ROOT ."/core/lib/security.lib.php"); // Include by default // If password is encoded, we decode it diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index f92cd5b2f00..51f2ef66671 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -272,7 +272,7 @@ class CommandeFournisseur extends Commande function valid($user) { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; @@ -933,7 +933,7 @@ class CommandeFournisseur extends Commande global $langs,$mysoc; dol_syslog("FournisseurCommande::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2. $fk_product, $fk_prod_fourn_price, $fourn_ref, $remise_percent, $price_base_type, $pu_ttc, $type"); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); // Clean parameters if (! $qty) $qty=1; @@ -1565,7 +1565,7 @@ class CommandeFournisseur extends Commande function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0) { dol_syslog("CommandeFournisseur::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type"); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); if ($this->brouillon) { diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index f407958435a..9247057f4ed 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -928,7 +928,7 @@ class FactureFournisseur extends Facture function addline($desc, $pu, $txtva, $txlocaltax1=0, $txlocaltax2=0, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0) { dol_syslog("FactureFourn::Addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type", LOG_DEBUG); - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); // Clean parameters if ($txtva == '') $txtva=0; @@ -988,7 +988,7 @@ class FactureFournisseur extends Facture */ function updateline($id, $label, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0) { - include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); $pu = price2num($pu); $qty = price2num($qty); diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php index 8a7cc08aa50..08f6244a93c 100644 --- a/htdocs/fourn/commande/contact.php +++ b/htdocs/fourn/commande/contact.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"; require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); $langs->load("facture"); diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index 0bb534d89e2..e569912f3bb 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -29,7 +29,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_order/modules_commandefournisseur.php'); require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php index d28530f1348..31d2ef5749a 100644 --- a/htdocs/fourn/commande/document.php +++ b/htdocs/fourn/commande/document.php @@ -25,9 +25,9 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.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 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); diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 486ee57581f..3316766f8d5 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_order/modules_command require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"; require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php"; require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; -require_once DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"; require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); @@ -524,7 +524,7 @@ if ($action == 'builddoc') // En get ou en post // Delete file in doc form if ($action=='remove_file') { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if ($object->fetch($id)) { @@ -574,7 +574,7 @@ if ($action == 'create') */ 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 $vardir=$conf->user->dir_output."/".$user->id; @@ -590,7 +590,7 @@ if ($_POST['addfile']) */ 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 $vardir=$conf->user->dir_output."/".$user->id; diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php index 98b64f2d185..a28f3ee4b0d 100644 --- a/htdocs/fourn/commande/history.php +++ b/htdocs/fourn/commande/history.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); $langs->load("orders"); diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index d0bd737f374..efef39c24b7 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); $langs->load("orders"); diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php index d05b29d7888..25274ccf72d 100644 --- a/htdocs/fourn/facture/contact.php +++ b/htdocs/fourn/facture/contact.php @@ -27,7 +27,7 @@ require("../../main.inc.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."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); $langs->load("bills"); diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index fd7b4de18c5..b0c0ab10a2e 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -27,8 +27,8 @@ require("../../main.inc.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.'/lib/fourn.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load('bills'); @@ -62,7 +62,7 @@ if (! $sortfield) $sortfield="name"; // Envoi fichier 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); if ($facture->fetch($facid)) diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 8b3be30dc79..7e21975f9c9 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_invoice/modules_facturefournisseur.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); @@ -620,7 +620,7 @@ if ($action == 'reopen' && $user->rights->fournisseur->facture->creer) */ 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 $vardir=$conf->user->dir_output."/".$user->id; @@ -636,7 +636,7 @@ if ($_POST['addfile']) */ 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 $vardir=$conf->user->dir_output."/".$user->id; @@ -838,7 +838,7 @@ if ($action == 'builddoc') // Delete file in doc form 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)) { diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php index 2efeb38f612..71daf72ec81 100644 --- a/htdocs/fourn/facture/info.php +++ b/htdocs/fourn/facture/info.php @@ -27,7 +27,7 @@ require("../../main.inc.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."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'); $langs->load('bills'); diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php index e8af8fe7fc1..ea40e32c645 100644 --- a/htdocs/fourn/facture/note.php +++ b/htdocs/fourn/facture/note.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index 1c45855c89f..0ea5c62a2d7 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/index.php @@ -25,7 +25,7 @@ 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."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); // Load traductions files @@ -82,7 +82,7 @@ $conn_id=0; // FTP connection ID // Envoie fichier 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"]); if (! $result > 0) diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php index 1421d116343..a730fd23a5d 100644 --- a/htdocs/imports/emptyexample.php +++ b/htdocs/imports/emptyexample.php @@ -33,7 +33,7 @@ function llxHeader() { print 'Build an import example file< function llxFooter() { print ''; } 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.'/includes/modules/import/modules_import.php'); diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 25d1e087bd1..b9125754200 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -27,8 +27,8 @@ 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."/imports/class/import.class.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."/lib/import.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/import.lib.php"); $langs->load("exports"); $langs->load("errors"); @@ -191,7 +191,7 @@ if ($action == 'add_import_model') 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)) { diff --git a/htdocs/includes/modules/action/rapport.pdf.php b/htdocs/includes/modules/action/rapport.pdf.php index fd19bca4b20..ff706f69662 100644 --- a/htdocs/includes/modules/action/rapport.pdf.php +++ b/htdocs/includes/modules/action/rapport.pdf.php @@ -24,7 +24,7 @@ * \brief File to build PDF with events */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); diff --git a/htdocs/includes/modules/barcode/modules_barcode.php b/htdocs/includes/modules/barcode/modules_barcode.php index 5b3a782adc1..f0c567fbaef 100644 --- a/htdocs/includes/modules/barcode/modules_barcode.php +++ b/htdocs/includes/modules/barcode/modules_barcode.php @@ -24,7 +24,7 @@ * \ingroup barcode * \brief Fichier contenant la classe mere de generation des codes barres */ -require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); /** diff --git a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php index ab1fee40f44..2f9f4b4ca08 100644 --- a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php +++ b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php @@ -23,7 +23,7 @@ * \brief File to build cheque deposit receipts */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/cheque/pdf/modules_chequereceipts.php"); diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php index 744c9196b0c..cb8e4259721 100644 --- a/htdocs/includes/modules/commande/modules_commande.php +++ b/htdocs/includes/modules/commande/modules_commande.php @@ -203,7 +203,7 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0 $outputlangs->charset_output=$sav_charset_output; // 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); // Appel des triggers diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index 688081802a3..5b26393b5df 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** * \class pdf_edison diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index 4c79ca7a720..36f71b69e61 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.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/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/expedition/methode_expedition.modules.php b/htdocs/includes/modules/expedition/methode_expedition.modules.php index 509c5cc1219..6affea15c6b 100644 --- a/htdocs/includes/modules/expedition/methode_expedition.modules.php +++ b/htdocs/includes/modules/expedition/methode_expedition.modules.php @@ -23,7 +23,7 @@ * \brief Fichier contenant la classe mere de generation de bon de livraison en PDF * et la classe mere de numerotation des bons de livraisons */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php index 0591e8b8524..39b20ce6d26 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"; require_once DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"; require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php index 9e59b31d7a8..47ec6815a44 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php @@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"; require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php index bf83dd74d1a..84336a0fe05 100644 --- a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -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."/core/lib/company.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"); /** diff --git a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php index a6bae3cfcaa..e7a7cfd26a8 100755 --- a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php @@ -30,7 +30,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."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php b/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php index 699ad259d2e..d00a7ad9fb8 100755 --- a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php @@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php index f0ec7568380..8cda5e5dd36 100644 --- a/htdocs/includes/modules/facture/modules_facture.php +++ b/htdocs/includes/modules/facture/modules_facture.php @@ -306,7 +306,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"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $fac = new Facture($db); $fac->fetch($facid); diff --git a/htdocs/includes/modules/fichinter/modules_fichinter.php b/htdocs/includes/modules/fichinter/modules_fichinter.php index 9dd588eccec..cd735982099 100644 --- a/htdocs/includes/modules/fichinter/modules_fichinter.php +++ b/htdocs/includes/modules/fichinter/modules_fichinter.php @@ -206,7 +206,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"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if (!$fichinterref) { diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index 67c8e7c5e7f..f504f482989 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -26,7 +26,7 @@ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); diff --git a/htdocs/includes/modules/import/modules_import.php b/htdocs/includes/modules/import/modules_import.php index 9ff2837fae1..54254bd9bc0 100644 --- a/htdocs/includes/modules/import/modules_import.php +++ b/htdocs/includes/modules/import/modules_import.php @@ -22,7 +22,7 @@ * \ingroup export * \brief File of parent class for import file readers */ -require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); /** diff --git a/htdocs/includes/modules/livraison/modules_livraison.php b/htdocs/includes/modules/livraison/modules_livraison.php index f2d4a06af40..a748ae7fa6e 100644 --- a/htdocs/includes/modules/livraison/modules_livraison.php +++ b/htdocs/includes/modules/livraison/modules_livraison.php @@ -197,7 +197,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"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $delivery = new Livraison($db,"",$deliveryid); $delivery->fetch($deliveryid); diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php index 1d68409a95c..c0c1b929aec 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php @@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php index 67613fa5fef..555d1e1610c 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php"); require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/mailings/modules_mailings.php b/htdocs/includes/modules/mailings/modules_mailings.php index 115ce374c2e..9a32cd7ea36 100644 --- a/htdocs/includes/modules/mailings/modules_mailings.php +++ b/htdocs/includes/modules/mailings/modules_mailings.php @@ -23,7 +23,7 @@ * \ingroup mailing * \brief File with parent class of emailing target selectors modules */ -require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); /** diff --git a/htdocs/includes/modules/mailings/peche.modules.php b/htdocs/includes/modules/mailings/peche.modules.php index c7c79d80928..1a9ca96c6a5 100644 --- a/htdocs/includes/modules/mailings/peche.modules.php +++ b/htdocs/includes/modules/mailings/peche.modules.php @@ -104,7 +104,7 @@ class mailing_peche extends MailingTargets { 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 ini_set('auto_detect_line_endings', true); diff --git a/htdocs/includes/modules/member/cards/modules_cards.php b/htdocs/includes/modules/member/cards/modules_cards.php index 86f15e5b2ee..28df2886d3f 100644 --- a/htdocs/includes/modules/member/cards/modules_cards.php +++ b/htdocs/includes/modules/member/cards/modules_cards.php @@ -25,7 +25,7 @@ * \brief File of parent class of document generator for members cards. */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/includes/modules/member/cards/pdf_standard.class.php b/htdocs/includes/modules/member/cards/pdf_standard.class.php index c36a1ac05ed..b45d11496ce 100644 --- a/htdocs/includes/modules/member/cards/pdf_standard.class.php +++ b/htdocs/includes/modules/member/cards/pdf_standard.class.php @@ -62,7 +62,7 @@ * \author Jean Louis Bergamo. */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'); diff --git a/htdocs/includes/modules/member/labels/modules_labels.php b/htdocs/includes/modules/member/labels/modules_labels.php index db4706dee85..7a8a6fb0a32 100644 --- a/htdocs/includes/modules/member/labels/modules_labels.php +++ b/htdocs/includes/modules/member/labels/modules_labels.php @@ -25,7 +25,7 @@ * \brief File of parent class of document generator for members labels sheets. */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php index f9256e545da..2c84b0bafe0 100644 --- a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php +++ b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php @@ -62,7 +62,7 @@ * \author Jean Louis Bergamo. */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'); diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/includes/modules/modFacture.class.php index 48a27f933f4..7ac03cf74b1 100644 --- a/htdocs/includes/modules/modFacture.class.php +++ b/htdocs/includes/modules/modFacture.class.php @@ -214,7 +214,7 @@ class modFacture extends DolibarrModules // Remove permissions and default values $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'; create_exdir($dirodt); dol_copy(DOL_DOCUMENT_ROOT.'/install/doctemplates/invoices/template_invoice.odt',$dirodt.'/template_invoice.odt',0,0); diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/includes/modules/modSociete.class.php index d02511f7cdf..4aa343a1f03 100644 --- a/htdocs/includes/modules/modSociete.class.php +++ b/htdocs/includes/modules/modSociete.class.php @@ -305,7 +305,7 @@ class modSociete extends DolibarrModules // We disable this to prevent pb of modules not correctly disabled //$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'; create_exdir($dirodt); dol_copy(DOL_DOCUMENT_ROOT.'/install/doctemplates/thirdparties/template_thirdparty.odt',$dirodt.'/template_thirdparty.odt',0,0); diff --git a/htdocs/includes/modules/project/modules_project.php b/htdocs/includes/modules/project/modules_project.php index c42449728c1..2c67de1c2c0 100644 --- a/htdocs/includes/modules/project/modules_project.php +++ b/htdocs/includes/modules/project/modules_project.php @@ -205,7 +205,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"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $project = new Project($db); $project->fetch($objectid); diff --git a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php index a233662a042..a42a08602ea 100644 --- a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php +++ b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php @@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php index f179cbb0400..773d47697b0 100644 --- a/htdocs/includes/modules/propale/modules_propale.php +++ b/htdocs/includes/modules/propale/modules_propale.php @@ -248,7 +248,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, function propale_delete_preview($db, $propalid, $propalref='') { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if (!$propalref) { diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index ec4fcde4cfb..a9819f1ce0a 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.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/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index 1fd06d31b0b..cd9e4668be0 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.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/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/rapport/pdf_paiement.class.php b/htdocs/includes/modules/rapport/pdf_paiement.class.php index 716974270eb..24b9c6543e9 100644 --- a/htdocs/includes/modules/rapport/pdf_paiement.class.php +++ b/htdocs/includes/modules/rapport/pdf_paiement.class.php @@ -22,7 +22,7 @@ * \ingroup banque * \brief File to build payment reports */ -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); diff --git a/htdocs/includes/modules/security/generate/modules_genpassword.php b/htdocs/includes/modules/security/generate/modules_genpassword.php index e462a76e850..d9c8efa8338 100644 --- a/htdocs/includes/modules/security/generate/modules_genpassword.php +++ b/htdocs/includes/modules/security/generate/modules_genpassword.php @@ -21,7 +21,7 @@ * \ingroup core * \brief File with parent class for password generating classes */ -require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); /** diff --git a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php index a336fd0c1ca..708b601895d 100644 --- a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php @@ -26,7 +26,7 @@ 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."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); /** diff --git a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php index a84517bd1f1..32de721358f 100755 --- a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php +++ b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php @@ -128,7 +128,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"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $comfourn = new FactureFournisseur($db); $comfourn->fetch($objectid); diff --git a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 80fe0c7a626..e6c056dcb13 100755 --- a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_invoice/modules_factu require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.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.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php index 7909c4497cc..9d55e32c6ce 100644 --- a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php @@ -235,7 +235,7 @@ function supplier_order_pdf_create($db, $object, $model, $outputlangs, $hidedeta function supplier_order_delete_preview($db, $comfournid, $comfournref='') { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if (!$comfournref) { diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php index e338475274a..46165333d00 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_order/modules_command require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.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.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index e4c5a8d79a9..f4ebaaf17a9 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -35,9 +35,9 @@ if (! defined('ADODB_PATH')) } require_once('../core/class/translate.class.php'); -require_once('../lib/functions.lib.php'); +require_once('../core/lib/functions.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'); error_reporting(E_ALL); // To have all errors without disabled E_STRICT diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index bee0e48e43e..ddb3ff5bb41 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -34,9 +34,9 @@ require_once($dolibarr_main_document_root . '/comm/propal/class/propal.class.php require_once($dolibarr_main_document_root . '/contrat/class/contrat.class.php'); 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/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'); +require_once($dolibarr_main_document_root . '/core/lib/files.lib.php'); $grant_query=''; $etape = 2; diff --git a/htdocs/lib/.cvsignore b/htdocs/lib/.cvsignore deleted file mode 100644 index 6c8214fdbe2..00000000000 --- a/htdocs/lib/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -htmlMimeMail diff --git a/htdocs/lib/index.php b/htdocs/lib/index.php deleted file mode 100644 index 7db0dd9ebf9..00000000000 --- a/htdocs/lib/index.php +++ /dev/null @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index 97c3a72d4b2..3d0fa964e6f 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -314,7 +314,7 @@ class Livraison extends CommonObject function valid($user) { global $conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); dol_syslog("livraison.class.php::valid begin"); @@ -526,7 +526,7 @@ class Livraison extends CommonObject */ function delete() { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $this->db->begin(); $sql = "DELETE FROM ".MAIN_DB_PREFIX."livraisondet"; diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index b794ed59eeb..cffdf236cdc 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -29,7 +29,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/sendings.lib.php"); if ($conf->product->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); if ($conf->expedition_bon->enabled) require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); diff --git a/htdocs/product/barcode.php b/htdocs/product/barcode.php index 3532baba1d7..144bd9c5f62 100644 --- a/htdocs/product/barcode.php +++ b/htdocs/product/barcode.php @@ -24,7 +24,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php"); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index d8b33fb3c1f..6fb35027c98 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2459,7 +2459,7 @@ class Product extends CommonObject */ 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 ."/photos"; @@ -2544,7 +2544,7 @@ class Product extends CommonObject */ function is_photo_available($sdir) { - include_once(DOL_DOCUMENT_ROOT ."/lib/files.lib.php"); + include_once(DOL_DOCUMENT_ROOT ."/core/lib/files.lib.php"); $pdir = get_exdir($this->id,2) . $this->id ."/photos/"; $dir = $sdir . '/'. $pdir; @@ -2585,7 +2585,7 @@ class Product extends CommonObject { global $conf,$user,$langs; - include_once(DOL_DOCUMENT_ROOT ."/lib/files.lib.php"); + include_once(DOL_DOCUMENT_ROOT ."/core/lib/files.lib.php"); include_once(DOL_DOCUMENT_ROOT ."/core/lib/images.lib.php"); $pdir = get_exdir($this->id,2) . $this->id ."/photos/"; @@ -2745,7 +2745,7 @@ class Product extends CommonObject */ function liste_photos($dir,$nbmax=0) { - include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); $nbphoto=0; $tabobj=array(); @@ -2797,7 +2797,7 @@ class Product extends CommonObject */ 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 $dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php index f5a254e650f..cdee1c53aca 100644 --- a/htdocs/product/composition/fiche.php +++ b/htdocs/product/composition/fiche.php @@ -28,7 +28,7 @@ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); diff --git a/htdocs/product/document.php b/htdocs/product/document.php index 855f641b906..17ee1d5d9e2 100755 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -26,9 +26,9 @@ */ require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.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"); $langs->load("other"); @@ -74,7 +74,7 @@ $modulepart='produit'; 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) { diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index bfb377c58cf..9c71db624cd 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/canvas.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 2f7c4749d57..7f39a3ef563 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -26,7 +26,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php"); diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php index e7432c2fd2e..ed182dec840 100644 --- a/htdocs/product/photos.php +++ b/htdocs/product/photos.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 242a203819e..c14961ff55a 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -26,7 +26,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); $langs->load("products"); diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 356fac863c1..57dabd161b4 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index b9faf7cf016..78ed5cdd81f 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 677b8b9021d..e70314c8273 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 37423aae0e0..7f980b15041 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index 95a45d8a658..63f043bcad3 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -24,7 +24,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php index 1319ae7cede..eabd7f2b844 100644 --- a/htdocs/product/stats/fiche.php +++ b/htdocs/product/stats/fiche.php @@ -25,7 +25,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 9348be54f84..4ed7f31882f 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -25,7 +25,7 @@ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php index c9a6e8053ba..31262e08e7a 100644 --- a/htdocs/product/stock/fiche-valo.php +++ b/htdocs/product/stock/fiche-valo.php @@ -24,7 +24,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/stock.lib.php"); $langs->load("products"); $langs->load("stocks"); diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php index 1391e71d156..6fd5a617e94 100644 --- a/htdocs/product/stock/fiche.php +++ b/htdocs/product/stock/fiche.php @@ -27,8 +27,8 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/stock.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); $langs->load("products"); $langs->load("stocks"); diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php index 6065e4268b7..f0eacdfa9e1 100644 --- a/htdocs/product/stock/info.php +++ b/htdocs/product/stock/info.php @@ -24,7 +24,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/stock.lib.php"); $langs->load("stocks"); diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index cb7a9162f74..d2763537639 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -27,8 +27,8 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/stock.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load("products"); diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index e7de512ade1..4944be1bde2 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -28,7 +28,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); $langs->load("products"); diff --git a/htdocs/product/stock/user.php b/htdocs/product/stock/user.php index 6e88eb466bc..174c0b38885 100644 --- a/htdocs/product/stock/user.php +++ b/htdocs/product/stock/user.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/stock.lib.php"); $langs->load("products"); diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index ce21422bce3..5987bb93fe0 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 1bc200e92c5..d0762fccd5b 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -26,7 +26,7 @@ require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $mine = $_REQUEST['mode']=='mine' ? 1 : 0; diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php index b109004ab83..1a15568dc90 100644 --- a/htdocs/projet/activity/list.php +++ b/htdocs/projet/activity/list.php @@ -27,7 +27,7 @@ require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load('projects'); diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 4583e20a4a5..11fe01ace16 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -383,7 +383,7 @@ class Project extends CommonObject function delete($user, $notrigger=0) { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); $error=0; diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index 0e32a7aba33..e87891ad22e 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -24,7 +24,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); $langs->load("projects"); diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php index 5aea22728a1..69d67b4c5a3 100644 --- a/htdocs/projet/document.php +++ b/htdocs/projet/document.php @@ -23,8 +23,8 @@ require('../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load('projects'); @@ -69,7 +69,7 @@ if (! $project->fetch($_GET['id'],$_GET['ref']) > 0) // Envoi fichier 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->projet->dir_output . "/" . dol_sanitizeFileName($project->ref); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 03c10d4771f..bc53b2bb416 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -25,7 +25,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture-rec.class.php"); diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index a9994f4f8ba..83b026724cd 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -26,7 +26,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php"); diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 789dba883d4..7da800e1304 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -26,7 +26,7 @@ require ("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 5d339d15775..f692a2edf29 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -25,7 +25,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); $langs->load("projects"); diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php index 9a475379f97..d696529e4d3 100644 --- a/htdocs/projet/note.php +++ b/htdocs/projet/note.php @@ -23,7 +23,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); $langs->load('projects'); diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 345c161c4d6..8c6f5898a49 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -26,7 +26,7 @@ require ("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 85149118030..516c7aa65ff 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -27,7 +27,7 @@ require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); $langs->load("projects"); diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index 68c08ae6e71..ac2dd13d9b4 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -24,8 +24,8 @@ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); +require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); @@ -84,7 +84,7 @@ else // Envoi fichier 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) { diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php index 335d8622869..095137e4966 100644 --- a/htdocs/projet/tasks/index.php +++ b/htdocs/projet/tasks/index.php @@ -26,7 +26,7 @@ require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load('projects'); diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index d36d24f0517..e14f8005fbc 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -24,7 +24,7 @@ require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); $langs->load('projects'); diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 690284c899c..f4f608f03bb 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -26,7 +26,7 @@ require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); $taskid = GETPOST("id"); diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 4aab61e1a62..535f10ba5b8 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load('projects'); diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 068b864bd64..25d5a378562 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -866,7 +866,7 @@ class Societe extends CommonObject function delete($id) { global $user,$langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); dol_syslog(get_class($this)."::delete", LOG_DEBUG); $error = 0; diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index 57c57637dca..9058601728d 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -26,7 +26,7 @@ require("../main.inc.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"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 821901460d2..fc9a466e337 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -30,7 +30,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.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.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index c1118c35cd3..7a372fd8ab8 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -35,9 +35,9 @@ if (! defined('ADODB_PATH')) } require_once('../core/class/translate.class.php'); -require_once('../lib/functions.lib.php'); +require_once('../core/lib/functions.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'); diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 2452e5f1b78..3ab3d691e9b 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -36,7 +36,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); session_cache_limiter(FALSE); require_once("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php"); // Define css type header('Content-type: text/css'); diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 28983084fd6..4dda379c374 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -37,7 +37,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); require_once("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php"); // Define css type header('Content-type: text/css'); diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 4e623ca7e3a..bb8372247a1 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -38,7 +38,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); session_cache_limiter(FALSE); require_once("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php"); // Define css type header('Content-type: text/css'); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 1f2e7c15fd4..61cedd8395a 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -37,7 +37,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); session_cache_limiter(FALSE); require_once("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php"); // Define css type header('Content-type: text/css'); diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index c31b3f61a68..40738105168 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -34,7 +34,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); session_cache_limiter(FALSE); require_once("../../../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php"); // Define css type header('Content-type: text/css'); diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index c2044000a45..70b5faad5ba 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -22,7 +22,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); $langs->load("users"); $langs->load("admin"); diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index cad5412cb7c..c3fc65c1d08 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); if ($conf->ldap->enabled) require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); if (! empty($conf->multicompany->enabled)) dol_include_once("/multicompany/class/actions_multicompany.class.php"); @@ -267,7 +267,7 @@ if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield) if ($action == 'update' && ! $_POST["cancel"]) { - require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); if ($caneditfield) // Case we can edit all field { diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index a5842f331e0..7ffac06a564 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -25,7 +25,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); if(! empty($conf->multicompany->enabled)) dol_include_once("/multicompany/class/actions_multicompany.class.php"); // Defini si peux lire/modifier utilisateurs et permisssions diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index 564ce79fb9e..01be80d3564 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -25,7 +25,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index 8281285b452..af7a977858d 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'); -require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); $langs->load("users"); diff --git a/htdocs/user/info.php b/htdocs/user/info.php index 934a54ee5e5..bb69ec84cca 100644 --- a/htdocs/user/info.php +++ b/htdocs/user/info.php @@ -23,7 +23,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/usergroups.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); $langs->load("users"); diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index e730d8f1979..131ec6de54c 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); diff --git a/htdocs/user/note.php b/htdocs/user/note.php index d83adced357..01fd68c6362 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.php @@ -23,7 +23,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/usergroups.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/user/class/user.class.php'); $action=isset($_GET["action"])?$_GET["action"]:(isset($_POST["action"])?$_POST["action"]:""); diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index daf788b10c3..d9edc9447fc 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -23,7 +23,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); $langs->load("companies"); diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index b7b1737a085..d836c0c9179 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -25,7 +25,7 @@ define("NOLOGIN",1); // This means this output page does not require to be logge require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); if ($conf->ldap->enabled) require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); $langs->load("other"); diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 618a9a560c4..96b1d372d6e 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -25,7 +25,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); $langs->load("users"); $langs->load("admin"); diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index c42ff64e79a..03f4847fb08 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -51,7 +51,7 @@ function llxHeader() { } require("./main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); // Security check if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart'); diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php index 05e8b93ad7d..6bb16855beb 100755 --- a/htdocs/webservices/server_invoice.php +++ b/htdocs/webservices/server_invoice.php @@ -25,7 +25,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); require_once("../master.inc.php"); require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); diff --git a/htdocs/webservices/server_other.php b/htdocs/webservices/server_other.php index 187a4ff67be..14837976222 100644 --- a/htdocs/webservices/server_other.php +++ b/htdocs/webservices/server_other.php @@ -25,7 +25,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); require_once("../master.inc.php"); require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index 509b0383c3a..c16a33be3ae 100755 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -25,7 +25,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); require_once("../master.inc.php"); require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php index 8f65042c3da..f2a5c851149 100755 --- a/htdocs/webservices/server_supplier_invoice.php +++ b/htdocs/webservices/server_supplier_invoice.php @@ -25,7 +25,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); require_once("../master.inc.php"); require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php index e4b19ad66dd..e2550e32a46 100755 --- a/htdocs/webservices/server_thirdparty.php +++ b/htdocs/webservices/server_thirdparty.php @@ -25,7 +25,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); require_once("../master.inc.php"); require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php index 189840058b1..b56b6a569fd 100644 --- a/htdocs/webservices/server_user.php +++ b/htdocs/webservices/server_user.php @@ -26,7 +26,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); require_once("../master.inc.php"); require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php index fa7e1e9e9bd..dec671c01c7 100644 --- a/scripts/invoices/rebuild_merge_pdf.php +++ b/scripts/invoices/rebuild_merge_pdf.php @@ -39,7 +39,7 @@ require_once($path."../../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/cron/functions_cron.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); -require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); // Load main language strings diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php index b9e5b9db6d9..815a86b2844 100644 --- a/test/phpunit/BuildDocTest.php +++ b/test/phpunit/BuildDocTest.php @@ -34,7 +34,7 @@ require_once dirname(__FILE__).'/../../htdocs/fichinter/class/fichinter.class.ph require_once dirname(__FILE__).'/../../htdocs/expedition/class/expedition.class.php'; require_once dirname(__FILE__).'/../../htdocs/projet/class/project.class.php'; require_once dirname(__FILE__).'/../../htdocs/projet/class/task.class.php'; -require_once dirname(__FILE__).'/../../htdocs/lib/pdf.lib.php'; +require_once dirname(__FILE__).'/../../htdocs/core/lib/pdf.lib.php'; require_once dirname(__FILE__).'/../../htdocs/includes/modules/facture/doc/pdf_crabe.modules.php'; require_once dirname(__FILE__).'/../../htdocs/includes/modules/facture/doc/pdf_oursin.modules.php'; require_once dirname(__FILE__).'/../../htdocs/includes/modules/commande/pdf_edison.modules.php'; diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php index fcd4080239a..bf4b5c85775 100755 --- a/test/phpunit/SecurityTest.php +++ b/test/phpunit/SecurityTest.php @@ -27,7 +27,7 @@ global $conf,$user,$langs,$db; //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; -require_once dirname(__FILE__).'/../../htdocs/lib/functions.lib.php'; +require_once dirname(__FILE__).'/../../htdocs/core/lib/functions.lib.php'; require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php'; if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); From b1de04bc1b7a8d0838b956296e1b7175b31a60fc Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Oct 2011 13:36:11 +0200 Subject: [PATCH 24/41] Fix: change /lib/ by /core/lib/ --- htdocs/core/class/html.form.class.php | 2 +- htdocs/core/class/html.formother.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 5d36d245abb..79d3dc57eb6 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3188,7 +3188,7 @@ class Form // Generate the date part, depending on the use or not of the javascript calendar if (empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR == "eldy") { - $base=DOL_URL_ROOT.'/lib/'; + $base=DOL_URL_ROOT.'/core/lib/'; $reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJava").'\',\''.$langs->defaultlang.'\');'; } else diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 442559bb851..679485a4a07 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -417,7 +417,7 @@ class FormOther /* // No list of colors forced, we can suggest any color print "\n".'
'; - print ''."\n"; + print ''."\n"; print ''."\n"; } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index cf2943d0404..b780aef1713 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -223,7 +223,7 @@ if ($action == 'valid') if ($action == 'set_thirdparty') { - $object->updateObjectField('facture',$id,'fk_soc',$socid); + $object->setValueFrom('facture',$id,'fk_soc',$socid); Header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id); exit; diff --git a/htdocs/core/ajaxbox.php b/htdocs/core/ajax/box.php similarity index 96% rename from htdocs/core/ajaxbox.php rename to htdocs/core/ajax/box.php index 07a7edc0f18..0ee675434b9 100644 --- a/htdocs/core/ajaxbox.php +++ b/htdocs/core/ajax/box.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/core/ajaxbox.php + * \file htdocs/core/ajax/box.php * \brief File to return Ajax response on Box move */ @@ -28,7 +28,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require('../main.inc.php'); +require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/boxes.php"); diff --git a/htdocs/core/ajaxconstantonoff.php b/htdocs/core/ajax/constantonoff.php similarity index 95% rename from htdocs/core/ajaxconstantonoff.php rename to htdocs/core/ajax/constantonoff.php index 65db9fb3ff8..c6aeab1ac61 100644 --- a/htdocs/core/ajaxconstantonoff.php +++ b/htdocs/core/ajax/constantonoff.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/core/ajaxconstantonoff.php + * \file htdocs/core/ajax/constantonoff.php * \brief File to set or del an on/off constant */ @@ -27,7 +27,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require('../main.inc.php'); +require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); diff --git a/htdocs/core/ajaxfileupload.php b/htdocs/core/ajax/fileupload.php similarity index 99% rename from htdocs/core/ajaxfileupload.php rename to htdocs/core/ajax/fileupload.php index 5a066d8b783..0d0820d3176 100644 --- a/htdocs/core/ajaxfileupload.php +++ b/htdocs/core/ajax/fileupload.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/core/ajaxfileupload.php + * \file htdocs/core/ajax/fileupload.php * \brief File to return Ajax response on file upload */ @@ -33,8 +33,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't nee //if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is public (can be called outside logged session) -require("../main.inc.php"); - +require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); diff --git a/htdocs/core/ajax/index.php b/htdocs/core/ajax/index.php new file mode 100644 index 00000000000..7db0dd9ebf9 --- /dev/null +++ b/htdocs/core/ajax/index.php @@ -0,0 +1 @@ +Url not available \ No newline at end of file diff --git a/htdocs/core/ajaxrow.php b/htdocs/core/ajax/row.php similarity index 96% rename from htdocs/core/ajaxrow.php rename to htdocs/core/ajax/row.php index 9556a9d3668..882a28f9c42 100644 --- a/htdocs/core/ajaxrow.php +++ b/htdocs/core/ajax/row.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/core/ajaxrow.php + * \file htdocs/core/ajax/row.php * \brief File to return Ajax response on Row move */ @@ -27,7 +27,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require('../main.inc.php'); +require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/core/class/genericobject.class.php"); diff --git a/htdocs/core/ajaxsecurity.php b/htdocs/core/ajax/security.php similarity index 95% rename from htdocs/core/ajaxsecurity.php rename to htdocs/core/ajax/security.php index 9cdf885734c..13ef292c3eb 100644 --- a/htdocs/core/ajaxsecurity.php +++ b/htdocs/core/ajax/security.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/core/ajaxsecurity.php + * \file htdocs/core/ajax/security.php * \brief File for return security data */ @@ -27,7 +27,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require('../main.inc.php'); +require('../../main.inc.php'); /* * View diff --git a/htdocs/core/ajaxziptown.php b/htdocs/core/ajax/ziptown.php similarity index 98% rename from htdocs/core/ajaxziptown.php rename to htdocs/core/ajax/ziptown.php index c83ef3cb61f..52eeafb4c8a 100644 --- a/htdocs/core/ajaxziptown.php +++ b/htdocs/core/ajax/ziptown.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/core/ajaxziptown.php + * \file htdocs/core/ajax/ziptown.php * \ingroup core * \brief File to return Ajax response on zipcode or town request */ @@ -29,7 +29,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); -require('../main.inc.php'); +require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php index 0eaaa8b2222..f878dee86c3 100644 --- a/htdocs/core/class/html.formcompany.class.php +++ b/htdocs/core/class/html.formcompany.class.php @@ -628,7 +628,7 @@ class FormCompany $size=''; if (!empty($fieldsize)) $size='size="'.$fieldsize.'"'; - if ($conf->use_javascript_ajax && empty($disableautocomplete)) $out.= ajax_multiautocompleter($htmlname,$fields,DOL_URL_ROOT.'/core/ajaxziptown.php')."\n"; + if ($conf->use_javascript_ajax && empty($disableautocomplete)) $out.= ajax_multiautocompleter($htmlname,$fields,DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n"; $out.= ''."\n"; return $out; diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index df036a26f59..a2256cc229f 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -810,7 +810,7 @@ class FormFile '; print '
'; - print ''; + print ''; print ''; print ''; print '
'; diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php index ab8b5228899..3b3eec1eb48 100644 --- a/htdocs/core/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -234,7 +234,7 @@ function ajax_constantonoff($code,$input=array()) // Set constant $( "#set_'.$code.'" ).click(function() { - $.get( "'.DOL_URL_ROOT.'/core/ajaxconstantonoff.php", { + $.get( "'.DOL_URL_ROOT.'/core/ajax/constantonoff.php", { action: \'set\', name: \''.$code.'\' }, @@ -256,7 +256,7 @@ function ajax_constantonoff($code,$input=array()) // Del constant $( "#del_'.$code.'" ).click(function() { - $.get( "'.DOL_URL_ROOT.'/core/ajaxconstantonoff.php", { + $.get( "'.DOL_URL_ROOT.'/core/ajax/constantonoff.php", { action: \'del\', name: \''.$code.'\' }, diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php index ef15dd62a04..ca7dee493b2 100644 --- a/htdocs/core/tpl/ajaxrow.tpl.php +++ b/htdocs/core/tpl/ajaxrow.tpl.php @@ -36,7 +36,7 @@ jQuery(document).ready(function(){ var table_element_line = "table_element_line; ?>"; var fk_element = "fk_element; ?>"; var element_id = "id; ?>"; - jQuery.get("/core/ajaxrow.php", + jQuery.get("/core/ajax/row.php", { roworder: roworder, table_element_line: table_element_line, diff --git a/htdocs/core/triggers/interface_modPaypal_PaypalWorkflow.class.php b/htdocs/core/triggers/interface_modPaypal_PaypalWorkflow.class.php index 22a814989c0..370d47305b3 100644 --- a/htdocs/core/triggers/interface_modPaypal_PaypalWorkflow.class.php +++ b/htdocs/core/triggers/interface_modPaypal_PaypalWorkflow.class.php @@ -123,10 +123,10 @@ class InterfacePaypalWorkflow if ($ret < 0) return -1; // Add payer id - $soc->updateObjectField('societe', $obj->socid, 'ref_int', $object->payerID); + $soc->setValueFrom('societe', $obj->socid, 'ref_int', $object->payerID); // Add transaction id - $obj->updateObjectField($obj->table_element,$obj->id,'ref_int',$object->resArray["TRANSACTIONID"]); + $obj->setValueFrom($obj->table_element,$obj->id,'ref_int',$object->resArray["TRANSACTIONID"]); } diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php index f9ad8560629..e54ad7f30c8 100644 --- a/htdocs/paypal/admin/paypal.php +++ b/htdocs/paypal/admin/paypal.php @@ -112,7 +112,7 @@ if ($conf->use_javascript_ajax) }); $("#generate_token").click(function() { - $.get( "'.DOL_URL_ROOT.'/core/ajaxsecurity.php", { + $.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", { action: \'getrandompassword\', generic: true }, From 1398a41add6950bc2effa9a8a618a3d26d80b123 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 25 Oct 2011 19:04:02 +0200 Subject: [PATCH 41/41] New: works on edit in place --- htdocs/compta/deplacement/fiche.php | 10 ++++- htdocs/core/ajax/loadinplace.php | 49 ++++++++++++++++++++ htdocs/core/ajax/saveinplace.php | 54 +++++++++++++++++++++++ htdocs/core/class/commonobject.class.php | 43 ++++++++++++++---- htdocs/core/class/genericobject.class.php | 2 +- htdocs/core/tpl/ajaxeditinplace.tpl.php | 45 +++++++++++++++++++ htdocs/main.inc.php | 19 +++++--- 7 files changed, 203 insertions(+), 19 deletions(-) create mode 100644 htdocs/core/ajax/loadinplace.php create mode 100644 htdocs/core/ajax/saveinplace.php create mode 100644 htdocs/core/tpl/ajaxeditinplace.tpl.php diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index fe0a2b6382a..791584581c3 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -344,6 +344,8 @@ else if ($id) $soc = new Societe($db); if ($object->socid) $soc->fetch($object->socid); + + if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) include(DOL_DOCUMENT_ROOT.'/core/tpl/ajaxeditinplace.tpl.php'); print ''; @@ -413,7 +415,9 @@ else if ($id) // Public note print ''; print '"; // Private note @@ -421,7 +425,9 @@ else if ($id) { print ''; print '"; } diff --git a/htdocs/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php new file mode 100644 index 00000000000..214ca46d81c --- /dev/null +++ b/htdocs/core/ajax/loadinplace.php @@ -0,0 +1,49 @@ + + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/core/ajax/loadinplace.php + * \brief File to load field value + */ + +if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal +if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); +if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); +if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); +if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); +if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); + +require('../../main.inc.php'); +require_once(DOL_DOCUMENT_ROOT."/core/class/genericobject.class.php"); + +/* + * View + */ + +top_httphead(); + +//print ''."\n"; + +// Load original field value +if((isset($_GET['field']) && ! empty($_GET['field'])) && (isset($_GET['table_element']) && ! empty($_GET['table_element'])) && (isset($_GET['fk_element']) && ! empty($_GET['fk_element']))) +{ + $object = new GenericObject($db); + $ret=$object->getValueFrom($_GET['table_element'], $_GET['fk_element'], $_GET['field']); + echo $ret; +} + +?> diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php new file mode 100644 index 00000000000..5e0ff2b6b42 --- /dev/null +++ b/htdocs/core/ajax/saveinplace.php @@ -0,0 +1,54 @@ + + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/core/ajax/saveinplace.php + * \brief File to save field value + */ + +if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal +if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); +if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); +if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); +if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); +if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); + +require('../../main.inc.php'); +require_once(DOL_DOCUMENT_ROOT."/core/class/genericobject.class.php"); + +/* + * View + */ + +top_httphead(); + +//print ''."\n"; +//var_dump($_POST); + +// Load original field value +if((isset($_POST['field']) && ! empty($_POST['field'])) && (isset($_POST['table_element']) && ! empty($_POST['table_element'])) && (isset($_POST['fk_element']) && ! empty($_POST['fk_element']))) +{ + $object = new GenericObject($db); + + // Clean parameters + $value = trim($_POST['value']); + + $ret=$object->setValueFrom($_POST['table_element'], $_POST['fk_element'], $_POST['field'], $value); + if ($ret > 0) echo (! empty($value) ? dol_nl2br($value) : ' '); +} + +?> diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 46a70f250dc..b47b5b07f74 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -589,25 +589,50 @@ abstract class CommonObject return $result; } + + /** + * Load value from specific field + * + * @param string $table Table of element or element line + * @param int $id Element id + * @param string $field Field selected + * @return int <0 if KO, >0 if OK + */ + function getValueFrom($table, $id, $field) + { + $result=false; + + $sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table; + $sql.= " WHERE rowid = ".$id; + + $resql = $this->db->query($sql); + if ($resql) + { + $row = $this->db->fetch_row($resql); + $result = $row[0]; + } + + return $result; + } /** - * Update a specific field from an object + * Update a specific field from an object * - * @param table Table element or element line - * @param id Object id - * @param field Field to update - * @param value New value - * @return int <0 if KO, >0 if OK + * @param string $table Table element or element line + * @param int $id Object id + * @param string $field Field to update + * @param mixte $value New value + * @return int <0 if KO, >0 if OK */ - function updateObjectField($table,$id,$field,$value) + function setValueFrom($table, $id, $field, $value) { global $conf; $sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET "; - $sql.= $field." = '".$value."'"; + $sql.= $field." = '".$this->db->escape($value)."'"; $sql.= " WHERE rowid = ".$id; - dol_syslog(get_class($this)."::updateObjectField sql=".$sql, LOG_DEBUG); + dol_syslog(get_class($this)."::setValueFrom sql=".$sql, LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { diff --git a/htdocs/core/class/genericobject.class.php b/htdocs/core/class/genericobject.class.php index de4511f8283..06f8067f2b4 100755 --- a/htdocs/core/class/genericobject.class.php +++ b/htdocs/core/class/genericobject.class.php @@ -37,7 +37,7 @@ class GenericObject extends CommonObject * * @param DoliDB $DB Database handler */ - function GenericObject($db) + function __construct($db) { $this->db=$db; } diff --git a/htdocs/core/tpl/ajaxeditinplace.tpl.php b/htdocs/core/tpl/ajaxeditinplace.tpl.php new file mode 100644 index 00000000000..89c8ff27fe2 --- /dev/null +++ b/htdocs/core/tpl/ajaxeditinplace.tpl.php @@ -0,0 +1,45 @@ + + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ +?> + + + + \ No newline at end of file diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 0b46afe4689..cd81033134d 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -917,19 +917,24 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print ''."\n"; //print ''."\n"; // jQuery Layout - if (!empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) || defined('REQUIRE_JQUERY_LAYOUT')) + if (! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) || defined('REQUIRE_JQUERY_LAYOUT')) { print ''."\n"; } // jQuery jnotify if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY)) print ''."\n"; - // Flot - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; + // jQuery jeditable + if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) print ''."\n"; + // Flot + if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT)) + { + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + } // CKEditor - if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_EDITORNAME) && $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') + if (! empty($conf->fckeditor->enabled) && ! empty($conf->global->FCKEDITOR_EDITORNAME) && $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') { print ''."\n"; print ''."\n";
'.$langs->trans("NotePublic").''; - print ($object->note_public ? nl2br($object->note_public) : " "); + print '
'; + print ($object->note_public ? dol_nl2br($object->note_public) : " "); + print '
'; print "
'.$langs->trans("NotePrivate").''; - print ($object->note_private ? nl2br($object->note_private) : " "); + print '
'; + print ($object->note_private ? dol_nl2br($object->note_private) : " "); + print '
'; print "