From 5a419927393530f0ed8d10eac8b3309f9f7410e1 Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Mon, 10 Jan 2011 18:15:15 +0000
Subject: [PATCH] Trying to make CKEditor work with the "ExtKey" widget. (Trac
 #343) Seems to be functional but there is still an "uncaught exception" that
 pops up from nowhere when closing the dialog.

SVN:trunk[1049]
---
 application/cmdbabstract.class.inc.php        | 2 +-
 application/itopwebpage.class.inc.php         | 2 ++
 application/ui.htmleditorwidget.class.inc.php | 9 ++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index 268e2adc2..68423c6f4 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -1110,7 +1110,7 @@ EOF
 				break;
 
 				case 'HTML':
-					$oWidget = new UIHTMLEditorWidget($iId, $sAttCode, $sNameSuffix, $sHelpText, $sValidationField, $value, $bMandatory);
+					$oWidget = new UIHTMLEditorWidget($iId, $sAttCode, $sNameSuffix, $sFieldPrefix, $sHelpText, $sValidationField, $value, $bMandatory);
 					$sHTMLValue = $oWidget->Display($oPage, $aArgs);
 				break;
 
diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index ab25a98ea..ae5b2fa95 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -67,6 +67,8 @@ class iTopWebPage extends NiceWebPage
 		$this->add_linked_script("../js/jquery.blockUI.js");
 		$this->add_linked_script("../js/utils.js");
 		$this->add_linked_script("../js/swfobject.js");
+		$this->add_linked_script("../js/ckeditor/ckeditor.js");
+		$this->add_linked_script("../js/ckeditor/adapters/jquery.js");
 		$this->add_ready_script(
 <<<EOF
 	try
diff --git a/application/ui.htmleditorwidget.class.inc.php b/application/ui.htmleditorwidget.class.inc.php
index 32296c981..0aa15786e 100644
--- a/application/ui.htmleditorwidget.class.inc.php
+++ b/application/ui.htmleditorwidget.class.inc.php
@@ -29,12 +29,13 @@ class UIHTMLEditorWidget
 	protected $m_iId;
 	protected $m_sAttCode;
 	protected $m_sNameSuffix;
+	protected $m_sFieldPrefix;
 	protected $m_sHelpText;
 	protected $m_sValidationField;
 	protected $m_sValue;
 	protected $m_sMandatory;
 	
-	public function __construct($iInputId, $sAttCode, $sNameSuffix, $sHelpText, $sValidationField, $sValue, $sMandatory)
+	public function __construct($iInputId, $sAttCode, $sNameSuffix, $sFieldPrefix, $sHelpText, $sValidationField, $sValue, $sMandatory)
 	{
 		$this->m_iId = $iInputId;
 		$this->m_sAttCode = $sAttCode;
@@ -43,6 +44,7 @@ class UIHTMLEditorWidget
 		$this->m_sValidationField = $sValidationField;
 		$this->m_sValue = $sValue;
 		$this->m_sMandatory = $sMandatory;
+		$this->m_sFieldPrefix = $sFieldPrefix;
 	}
 	
 	/**
@@ -53,16 +55,13 @@ class UIHTMLEditorWidget
 	 */
 	public function Display(WebPage $oPage, $aArgs = array())
 	{
-		$oPage->add_linked_script("../js/ckeditor/ckeditor.js");
-		$oPage->add_linked_script("../js/ckeditor/adapters/jquery.js");
-
 		$iId = $this->m_iId;
 		$sCode = $this->m_sAttCode.$this->m_sNameSuffix;
 		$sValue = $this->m_sValue;
 		$sHelpText = $this->m_sHelpText;
 		$sValidationField = $this->m_sValidationField;
 
-		$sHtmlValue = "<table><tr><td><textarea title=\"$sHelpText\" name=\"attr_{$sCode}\" rows=\"14\" cols=\"110\" id=\"$iId\">$sValue</textarea></td><td>$sValidationField</td></tr></table>";
+		$sHtmlValue = "<table><tr><td><textarea class=\"htmlEditor\" title=\"$sHelpText\" name=\"attr_{$this->m_sFieldPrefix}{$sCode}\" rows=\"14\" cols=\"110\" id=\"$iId\">$sValue</textarea></td><td>$sValidationField</td></tr></table>";
 
 		// Replace the text area with CKEditor
 		// To change the default settings of the editor,