В настройки гибридного поля "HTML" добавлена опция "Удалять пустые те…

…ги", при включении которой в поле при сохранении удаляются теги: `<p></p>`, `<p> </p>`, `<p><br></p>`, `<p><br /></p>`, `<p> <br /></p>`, `<p> </p>`. issue #298
KodiCMS-Kohana · Oct 28, 2014 · 23a9808 · 23a9808
1 parent 74d20a3
commit 23a9808
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 1 deletion.
diff --git a/cms/modules/kodicms/classes/kses.php b/cms/modules/kodicms/classes/kses.php
@@ -156,6 +156,26 @@ public static function parse_tags($tags)
 
 		return $allowed_html;
 	}
+
+	/**
+	 * 
+	 * @param string $string
+	 * @param array $tags
+	 * @return string
+	 */
+	public static function remove_empty_tags($string, array $tags = array('p', 'div'))
+	{
+		$tags = array_unique($tags);
+
+		foreach ($tags as $tag)
+		{
+			$string = preg_replace_callback("/<{$tag}[^>]*>[\s|&nbsp;|<br ?\/?>]*<\/{$tag}>/iU", function($match) {
+				return '';
+			}, $string);
+		}
+
+		return $string;
+	}
 
 	/**#@+
 	 *	@access private
@@ -1251,6 +1271,7 @@ private function decodeEntities($string)
 		$string = preg_replace_callback('/&#[Xx]([0-9A-Fa-f]+);/', function($match) {
 			return chr(hexdec($match[1]));
 		}, $string);
+
 		return $string;
 	}
 

diff --git a/cms/plugins/hybrid/classes/datasource/hybrid/field/primitive/html.php b/cms/plugins/hybrid/classes/datasource/hybrid/field/primitive/html.php
@@ -7,18 +7,31 @@ class DataSource_Hybrid_Field_Primitive_HTML extends DataSource_Hybrid_Field_Pri
 	protected $_props = array(
 		'default' => NULL,
 		'filter_html' => FALSE,
+		'remove_empty_tags' => FALSE,
 		'allowed_tags' => '<b><i><u><p><ul><li><ol>'
 	);
 
 	public function booleans()
 	{
-		return array('filter_html');
+		return array('filter_html', 'remove_empty_tags');
 	}
 
 	public function set(array $data)
 	{
 		return parent::set($data);
 	}
+
+	public function onSetValue($value, DataSource_Hybrid_Document $doc)
+	{
+		$value = parent::onSetValue($value, $doc);
+
+		if($this->remove_empty_tags === TRUE)
+		{
+			return Kses::remove_empty_tags($value);
+		}
+
+		return $value;
+	}
 
 	public function onUpdateDocument(DataSource_Hybrid_Document $old = NULL, DataSource_Hybrid_Document $new)
 	{

diff --git a/cms/plugins/hybrid/i18n/ru.php b/cms/plugins/hybrid/i18n/ru.php
@@ -71,6 +71,7 @@
 	'Max file size: :size' => 'Максимальный размер файла: :size',
 	'Allow HTML tags' => 'Разрешить HTML теги',
 	'Filter HTML tags' => 'Фильтровать HTML теги',
+	'Remove empty tags' => 'Удалять пустые теги',
 	'Create hybrid section' => 'Создать гибридный раздел',
 	'Slug separator' => 'Разделитель',
 	'Slug from header' => 'Брать значение из Заголовка',

diff --git a/cms/plugins/hybrid/views/datasource/hybrid/field/edit/primitive_html.php b/cms/plugins/hybrid/views/datasource/hybrid/field/edit/primitive_html.php
@@ -12,6 +12,14 @@
 
 <div class="form-group">
 	<div class="col-md-offset-3 col-md-9">
+		<div class="checkbox">
+			<label>
+				<?php echo Form::checkbox('remove_empty_tags', 1, $field->remove_empty_tags == 1, array(
+					'id' => 'remove_empty_tags'
+				)); ?> <?php echo __('Remove empty tags'); ?>
+			</label>
+		</div>
+
 		<div class="checkbox">
 			<label>
 				<?php echo Form::checkbox('filter_html', 1, $field->filter_html == 1, array(