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