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 ''.$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 ''; @@ -620,7 +620,7 @@ if ($rowid > 0) print ""; 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 ""; 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 ''.$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 ''."\n"; @@ -242,7 +242,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit // Message of the day on home page $var=!$var; 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 ''."\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 ''.$langs->trans("Description").''; print ''; -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 ''; 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 ''.$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 ''; 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 ''.$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 ''; @@ -801,7 +801,7 @@ if ($id) // Description 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 ''; 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 ''; // 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 ''; @@ -1045,7 +1045,7 @@ else print ''; 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 ''; 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 ''.$langs->trans("Comment").''; print ''; // 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 ''; @@ -589,7 +589,7 @@ else print ''.$langs->trans("Comment").''; print ''; // 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 ''; 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 ''; // 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 ''; 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 ''.$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 ""; @@ -961,7 +961,7 @@ else // Note 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 ""; 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 ''.$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 ''; @@ -479,7 +479,7 @@ else // Description 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 ''; 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 ''; 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 '".'
'.$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)) {