diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index bc6b0dc33ac..6523ec833b3 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -21,7 +21,7 @@
/**
* \file htdocs/admin/fckeditor.php
* \ingroup fckeditor
- * \brief Page d'activation du module FCKeditor dans les autres modules
+ * \brief Activation page for the FCKeditor module in the other modules
*/
require '../main.inc.php';
@@ -43,35 +43,41 @@ $mode = GETPOST('mode') ?GETPOST('mode', 'alpha') : 'dolibarr_notes';
if (!$user->admin) accessforbidden();
-// Constante et traduction de la description du module
+// Constant and translation of the module description
$modules = array(
-'SOCIETE' => 'FCKeditorForCompany',
-'PRODUCTDESC' => 'FCKeditorForProduct',
-'DETAILS' => 'FCKeditorForProductDetails',
-'USERSIGN' => 'FCKeditorForUserSignature',
-'MAILING' => 'FCKeditorForMailing',
-'MAIL' => 'FCKeditorForMail',
-'TICKET' => 'FCKeditorForTicket'
+ 'SOCIETE' => 'FCKeditorForCompany',
+ 'PRODUCTDESC' => 'FCKeditorForProduct',
+ 'DETAILS' => 'FCKeditorForProductDetails',
+ 'USERSIGN' => 'FCKeditorForUserSignature',
+ 'MAILING' => 'FCKeditorForMailing',
+ 'MAIL' => 'FCKeditorForMail',
+ 'TICKET' => 'FCKeditorForTicket',
+ 'NOTE_PUBLIC' => 'FCKeditorForNotePublic',
+ 'NOTE_PRIVATE' => 'FCKeditorForNotePrivate',
);
-// Conditions pour que l'option soit proposee
+// Conditions for the option to be offered
$conditions = array(
-'SOCIETE' => 1,
-'PRODUCTDESC' => (!empty($conf->product->enabled) || !empty($conf->service->enabled)),
-'DETAILS' => (!empty($conf->facture->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->supplier_proposal->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)),
-'USERSIGN' => 1,
-'MAILING' => !empty($conf->mailing->enabled),
-'MAIL' => (!empty($conf->facture->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled)),
-'TICKET' => !empty($conf->ticket->enabled)
+ 'SOCIETE' => 1,
+ 'PRODUCTDESC' => (!empty($conf->product->enabled) || !empty($conf->service->enabled)),
+ 'DETAILS' => (!empty($conf->facture->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->supplier_proposal->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)),
+ 'USERSIGN' => 1,
+ 'MAILING' => !empty($conf->mailing->enabled),
+ 'MAIL' => (!empty($conf->facture->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled)),
+ 'TICKET' => !empty($conf->ticket->enabled),
+ 'NOTE_PUBLIC' => 1,
+ 'NOTE_PRIVATE' => 1,
);
// Picto
$picto = array(
-'SOCIETE' => 'generic',
-'PRODUCTDESC' => 'product',
-'DETAILS' => 'product',
-'USERSIGN' => 'user',
-'MAILING' => 'email',
-'MAIL' => 'email',
-'TICKET' => 'ticket'
+ 'SOCIETE' => 'generic',
+ 'PRODUCTDESC' => 'product',
+ 'DETAILS' => 'product',
+ 'USERSIGN' => 'user',
+ 'MAILING' => 'email',
+ 'MAIL' => 'email',
+ 'TICKET' => 'ticket',
+ 'NOTE_PUBLIC' => 'generic',
+ 'NOTE_PRIVATE' => 'generic',
);
@@ -85,7 +91,7 @@ foreach ($modules as $const => $desc)
if ($action == 'activate_'.strtolower($const))
{
dolibarr_set_const($db, "FCKEDITOR_ENABLE_".$const, "1", 'chaine', 0, '', $conf->entity);
- // Si fckeditor est active dans la description produit/service, on l'active dans les formulaires
+ // If fckeditor is active in the product/service description, it is activated in the forms
if ($const == 'PRODUCTDESC' && !empty($conf->global->PRODUIT_DESC_IN_FORM))
{
dolibarr_set_const($db, "FCKEDITOR_ENABLE_DETAILS", "1", 'chaine', 0, '', $conf->entity);
@@ -154,7 +160,7 @@ if (empty($conf->use_javascript_ajax))
// Modules
foreach ($modules as $const => $desc)
{
- // Si condition non remplie, on ne propose pas l'option
+ // If this condition is not met, the option is not offered
if (!$conditions[$const]) continue;
print '';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 4742aebfde0..464f6aca20a 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1659,7 +1659,7 @@ if ($action == 'create')
print '| '.$langs->trans('NotePublic').' | ';
print '';
$note_public = $object->getDefaultCreateValueFor('note_public', (is_object($objectsrc) ? $objectsrc->note_public : null));
- $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// Private note
@@ -1669,7 +1669,7 @@ if ($action == 'create')
print ' | '.$langs->trans('NotePrivate').' | ';
print '';
$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc)) ? $objectsrc->note_private : null));
- $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// print '
print ' |
';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 16e53e0a23b..f0a6d601a42 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1734,7 +1734,7 @@ if ($action == 'create' && $usercancreate)
print ''.$langs->trans('NotePublic').' | ';
print '';
- $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// print '';
print ' | ';
@@ -1745,7 +1745,7 @@ if ($action == 'create' && $usercancreate)
print ''.$langs->trans('NotePrivate').' | ';
print '';
- $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// print '';
print ' | ';
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 0a18d68b5db..f1e34e99985 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -252,7 +252,7 @@ if ($action == 'create')
print ''.$langs->trans('NotePublic').' | ';
print '';
- $doleditor = new DolEditor('note_public', GETPOST('note_public', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+ $doleditor = new DolEditor('note_public', GETPOST('note_public', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_8, '90%');
print $doleditor->Create(1);
print ' | ';
@@ -264,7 +264,7 @@ if ($action == 'create')
print ''.$langs->trans('NotePrivate').' | ';
print '';
- $doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+ $doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_8, '90%');
print $doleditor->Create(1);
print ' | ';
@@ -349,7 +349,7 @@ if ($action == 'create')
print '| '.$langs->trans("NotePublic").' | ';
print '';
- $doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+ $doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_8, '90%');
print $doleditor->Create(1);
print " |
";
@@ -360,7 +360,7 @@ if ($action == 'create')
print '| '.$langs->trans("NotePrivate").' | ';
print '';
- $doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+ $doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_8, '90%');
print $doleditor->Create(1);
print " |
";
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 4f754fbd173..4c25d3df652 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -998,7 +998,7 @@ if ($action == 'create')
print $form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic');
print '';
print '';
- $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// Private note
@@ -1009,7 +1009,7 @@ if ($action == 'create')
print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext, 1, 'help', '', 0, 2, 'noteprivate');
print ' | ';
print '';
- $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// print '
print ' | ';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index def74e173a3..37f236e875a 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3534,7 +3534,7 @@ if ($action == 'create')
print $form->textwithpicto($langs->trans('NotePublic'), $htmltext);
print '';
print '';
- $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// Private note
@@ -3545,7 +3545,7 @@ if ($action == 'create')
print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext);
print ' | ';
print '';
- $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// print '
print ' | ';
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 752bdc4d642..23297438e19 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1129,13 +1129,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
// Note Public
print ' | ';
- $doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' |
';
// Note Private
print ' | ';
- $doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' |
';
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index a92ac8a1e73..dcca2fe816c 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1174,14 +1174,14 @@ if ($action == 'create')
}
print '| '.$langs->trans("NotePublic").' | ';
- $doleditor = new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' |
';
if (empty($user->socid))
{
print '| '.$langs->trans("NotePrivate").' | ';
- $doleditor = new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' |
';
}
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index c55751e913f..cd3175cdce0 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -443,7 +443,7 @@ if ($action == 'create')
print ''.$langs->trans('NotePublic').' | ';
print '';
- $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' | ';
@@ -453,7 +453,7 @@ if ($action == 'create')
print ''.$langs->trans('NotePrivate').' | ';
print '';
- $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' | ';
}
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index fd1e38e2438..a0541120ec6 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -942,7 +942,7 @@ if ($action == 'create')
// Note Public
print '| '.$langs->trans("NotePublic").' | ';
print '';
- $doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print " |
";
@@ -951,7 +951,7 @@ if ($action == 'create')
{
print '| '.$langs->trans("NotePrivate").' | ';
print '';
- $doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print " |
";
}
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 83e1173fcb4..71f190a08f9 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1457,7 +1457,7 @@ if ($action == 'create')
print ''.$langs->trans('NotePublic').' | ';
print '';
- $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' | ';
@@ -1467,7 +1467,7 @@ if ($action == 'create')
print ''.$langs->trans('NotePrivate').' | ';
print '';
- $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' | ';
}
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 07c0146c2a8..f96bab63e2f 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -941,7 +941,7 @@ if ($action == 'create')
print '';
print '| '.$langs->trans('NotePublic').' | ';
print '';
- $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
//print '';
print ' |
';
@@ -952,7 +952,7 @@ if ($action == 'create')
print '';
print '| '.$langs->trans('NotePrivate').' | ';
print '';
- $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
//print '';
print ' |
';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index cf6543c96e0..470a5cf0b0c 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1708,7 +1708,7 @@ if ($action == 'create')
print '| '.$langs->trans('NotePublic').' | ';
print '';
- $doleditor = new DolEditor('note_public', isset($note_public) ? $note_public : GETPOST('note_public', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', isset($note_public) ? $note_public : GETPOST('note_public', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' | ';
//print '';
@@ -1716,7 +1716,7 @@ if ($action == 'create')
print '
| '.$langs->trans('NotePrivate').' | ';
print '';
- $doleditor = new DolEditor('note_private', isset($note_private) ? $note_private : GETPOST('note_private', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', isset($note_private) ? $note_private : GETPOST('note_private', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' | ';
//print ' | ';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index b439e5cad45..d9a8be9903c 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2109,7 +2109,7 @@ if ($action == 'create')
// Public note
print '
| '.$langs->trans('NotePublic').' | ';
print '';
- $doleditor = new DolEditor('note_public', (GETPOSTISSET('note_public') ?GETPOST('note_public', 'restricthtml') : $note_public), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', (GETPOSTISSET('note_public') ?GETPOST('note_public', 'restricthtml') : $note_public), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' | ';
// print ' | ';
@@ -2118,7 +2118,7 @@ if ($action == 'create')
// Private note
print '
| '.$langs->trans('NotePrivate').' | ';
print '';
- $doleditor = new DolEditor('note_private', (GETPOSTISSET('note_private') ?GETPOST('note_private', 'restricthtml') : $note_private), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', (GETPOSTISSET('note_private') ?GETPOST('note_private', 'restricthtml') : $note_private), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' | ';
// print ' | ';
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 17454356c76..29cae07e11d 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -315,7 +315,7 @@ if ($action == 'create')
print ''.$langs->trans('NotePrivate').' | ';
print '';
- $doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), '', 160, 'dolibarr_notes', 'In', false, true, true, ROWS_6, '90%');
+ $doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), '', 160, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_6, '90%');
print $doleditor->Create(1);
print ' |
';
@@ -324,7 +324,7 @@ if ($action == 'create')
print '';
print '| '.$langs->trans('NotePublic').' | ';
print '';
- $doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), '', 160, 'dolibarr_notes', 'In', false, true, true, ROWS_6, '90%');
+ $doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), '', 160, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_6, '90%');
print $doleditor->Create(1);
print ' |
';
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 3bac7265606..0cf53b7dd4f 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -785,7 +785,7 @@ if ($action == 'create')
// Note Public
print '| '.$langs->trans("NotePublic").' | ';
print '';
- $doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print " |
";
@@ -794,7 +794,7 @@ if ($action == 'create')
{
print '| '.$langs->trans("NotePrivate").' | ';
print '';
- $doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print " |
";
}