From b0e2e42b8650ec7a61c0ac86e6a7764b74e2b331 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 28 Sep 2007 08:45:10 +0000
Subject: [PATCH] Fix: Mauvaise activation du mode fckeditor des notes sur
 user/groups

---
 htdocs/user/fiche.php       |  2 +-
 htdocs/user/group/fiche.php | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 652818a4bbf..82e59f82a10 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -650,7 +650,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
 	print '<tr><td valign="top">';
 	print $langs->trans("Note");
 	print '</td><td>';
-	if ($conf->fckeditor->enabled)
+	if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_USER)
 	{
 		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
 		$doleditor=new DolEditor('note','',180,'dolibarr_notes','',false);
diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php
index 846c041d002..fad0ac15dc6 100644
--- a/htdocs/user/group/fiche.php
+++ b/htdocs/user/group/fiche.php
@@ -181,10 +181,10 @@ if ($action == 'create')
     print '<td class="valeur"><input size="30" type="text" name="nom" value=""></td></tr>';
 
     print "<tr>".'<td valign="top">'.$langs->trans("Note").'</td><td>';
-	if ($conf->fckeditor->enabled)
+	if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_USER)
 	{
 		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-		$doleditor=new DolEditor('note','',180,'dolibarr_notes','',false);
+		$doleditor=new DolEditor('note','',240,'dolibarr_notes','',true);
 		$doleditor->Create();
 	}
 	else
@@ -404,15 +404,15 @@ else
             print "</tr>\n";
             print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>';
             print '<td class="valeur">';
-			if ($conf->fckeditor->enabled)
+			if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_USER)
 			{
 				require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-				$doleditor=new DolEditor('note',$group->note,180,'dolibarr_notes','',false);
+				$doleditor=new DolEditor('note',$group->note,240,'dolibarr_notes','',true);
 				$doleditor->Create();
 			}
 			else
 			{
-				print '<textarea class="flat" name="note" rows="'.ROWS_4.'" cols="90">';
+				print '<textarea class="flat" name="note" rows="'.ROWS_8.'" cols="90">';
 				print $group->note;
 				print '</textarea>';
 			}