From 954e2740bca4ff5c86aba164050e4e7aeae23b34 Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Mon, 27 Mar 2017 10:18:59 +0200 Subject: [PATCH] Minor - format code --- main/inc/lib/formvalidator/Element/HtmlEditor.php | 9 +++------ main/inc/lib/pear/HTML/QuickForm/textarea.php | 15 +++++++-------- .../CoreBundle/Component/Editor/Editor.php | 5 +++-- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/main/inc/lib/formvalidator/Element/HtmlEditor.php b/main/inc/lib/formvalidator/Element/HtmlEditor.php index c430fd3694..13105790b5 100644 --- a/main/inc/lib/formvalidator/Element/HtmlEditor.php +++ b/main/inc/lib/formvalidator/Element/HtmlEditor.php @@ -31,7 +31,7 @@ class HtmlEditor extends HTML_QuickForm_textarea $config = array() ) { if (empty($name)) { - + return false; } @@ -58,7 +58,6 @@ class HtmlEditor extends HTML_QuickForm_textarea if ($this->editor) { if ($this->editor->getConfigAttribute('fullPage')) { - if (strlen(trim($value)) == 0) { // TODO: To be considered whether here to be added DOCTYPE, // language and character set declarations. @@ -73,11 +72,10 @@ class HtmlEditor extends HTML_QuickForm_textarea return $this->getFrozenHtml(); } else { $styleCss = $this->editor->getConfigAttribute('style'); - if ($styleCss) { - $style = true; + $style = true; } else { - $style = false; + $style = false; } return $this->buildEditor($style); @@ -104,7 +102,6 @@ class HtmlEditor extends HTML_QuickForm_textarea if ($this->editor) { $this->editor->value = $this->getValue(); $this->editor->setName($this->getName()); - if ($style == true) { $result = $this->editor->createHtmlStyle(); } else { diff --git a/main/inc/lib/pear/HTML/QuickForm/textarea.php b/main/inc/lib/pear/HTML/QuickForm/textarea.php index 7a3f282172..8f13f4e395 100755 --- a/main/inc/lib/pear/HTML/QuickForm/textarea.php +++ b/main/inc/lib/pear/HTML/QuickForm/textarea.php @@ -43,7 +43,6 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element * @access private */ public $_value = null; - private $columnsSize; // }}} // {{{ constructor @@ -132,7 +131,7 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element // }}} // {{{ setWrap() - + /** * Sets wrap type for textarea element * @@ -224,7 +223,7 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element } return $html . $this->_getPersistantData(); } - + /** * @return null */ @@ -240,7 +239,7 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element { $this->columnsSize = $columnsSize; } - + /** * @param string $layout * @@ -250,7 +249,7 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element { $size = $this->getColumnsSize(); $this->removeAttribute('cols-size'); - + if (empty($size)) { $size = [2, 8, 2]; } @@ -291,7 +290,7 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element '; - + break; case FormValidator::LAYOUT_BOX_NO_LABEL: return ' @@ -304,6 +303,6 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element break; } } - - + + } diff --git a/src/Chamilo/CoreBundle/Component/Editor/Editor.php b/src/Chamilo/CoreBundle/Component/Editor/Editor.php index 9c5d61cf8a..0166de5aba 100644 --- a/src/Chamilo/CoreBundle/Component/Editor/Editor.php +++ b/src/Chamilo/CoreBundle/Component/Editor/Editor.php @@ -89,7 +89,7 @@ class Editor public function createHtml() { $html = ''; - //$html .= $this->editorReplace(); + return $html; } @@ -102,6 +102,7 @@ class Editor $toolbar->setLanguage($this->getLocale()); $config = $toolbar->getConfig(); $javascript = $this->toJavascript($config); + $html = "