From a1c1ca905e45eabc238d741affa7968f79e1b182 Mon Sep 17 00:00:00 2001
From: Egorka <error-202@mail.ru>
Date: Wed, 8 Aug 2018 16:03:50 +0300
Subject: [PATCH] Widget content render behavior

---
 common/behaviors/WidgetContentBehavior.php         | 30 ++++++++++++++++++++++
 common/modules/pages/entities/Page.php             |  2 ++
 common/modules/pages/views/page/view.php           | 12 +++++++--
 .../themes/start/modules/pages/views/page/view.php |  8 ++----
 4 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 common/behaviors/WidgetContentBehavior.php

diff --git a/common/behaviors/WidgetContentBehavior.php b/common/behaviors/WidgetContentBehavior.php
new file mode 100644
index 0000000..d66fd3d
--- /dev/null
+++ b/common/behaviors/WidgetContentBehavior.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Created by Error202
+ * Date: 08.08.2018
+ */
+
+namespace common\behaviors;
+
+use yii\helpers\Html;
+use yii\base\Behavior;
+
+class WidgetContentBehavior extends Behavior
+{
+	/**
+	 * Parse Widgets [?= ... ?]
+	 * @param $text
+	 *
+	 * @return string
+	 */
+	public function content($text): string
+	{
+		$content = preg_replace_callback('/\[\?= (.*)\((.*)\) \?\]/m', function ($m) {
+			$array  = [];
+			$string = Html::decode( $m[2] );
+			eval( "\$array = $string;" );
+			return $m[1]( $array );
+		}, $text);
+		return $content;
+	}
+}
\ No newline at end of file
diff --git a/common/modules/pages/entities/Page.php b/common/modules/pages/entities/Page.php
index 2a947e1..8ac42d6 100644
--- a/common/modules/pages/entities/Page.php
+++ b/common/modules/pages/entities/Page.php
@@ -6,6 +6,7 @@ use common\modules\pages\entities\queries\PageQuery;
 use paulzi\nestedsets\NestedSetsBehavior;
 use core\behaviors\MetaBehavior;
 use yii\behaviors\TimestampBehavior;
+use common\behaviors\WidgetContentBehavior;
 use yii\db\ActiveRecord;
 use core\entities\Meta;
 use Yii;
@@ -81,6 +82,7 @@ class Page extends ActiveRecord
 		        'treeAttribute' => 'tree',
 	        ],
 	        TimestampBehavior::class,
+	        WidgetContentBehavior::class,
         ];
     }
 
diff --git a/common/modules/pages/views/page/view.php b/common/modules/pages/views/page/view.php
index 0dbf6dd..11a55d8 100644
--- a/common/modules/pages/views/page/view.php
+++ b/common/modules/pages/views/page/view.php
@@ -29,7 +29,7 @@ $this->params['breadcrumbs'][] = $page->title;
         'URI.SafeIframeRegexp'=>'%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/)%',
     ])) ?> -->
 
-	<?= preg_replace_callback('/\[\?= (.*) \?\]/gm', function ($m) {
+	<!-- < ?= preg_replace_callback('/\[\?= (.*) \?\]/gm', function ($m) {
 		return $m[1];
 	}, Yii::$app->formatter->asHtml($page->content, [
 		'Attr.AllowedRel' => array('nofollow'),
@@ -37,6 +37,14 @@ $this->params['breadcrumbs'][] = $page->title;
 		'Output.FlashCompat' => true,
 		'HTML.SafeIframe' => true,
 		'URI.SafeIframeRegexp'=>'%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/)%',
-	])) ?>
+	])) ?> -->
+
+	<?= $page->content(Yii::$app->formatter->asHtml($page->content, [
+		'Attr.AllowedRel' => array('nofollow'),
+		'HTML.SafeObject' => true,
+		'Output.FlashCompat' => true,
+		'HTML.SafeIframe' => true,
+		'URI.SafeIframeRegexp'=>'%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/)%',
+	]))?>
 
 </article>
diff --git a/frontend/web/themes/start/modules/pages/views/page/view.php b/frontend/web/themes/start/modules/pages/views/page/view.php
index ddeca41..679a6a1 100644
--- a/frontend/web/themes/start/modules/pages/views/page/view.php
+++ b/frontend/web/themes/start/modules/pages/views/page/view.php
@@ -21,12 +21,7 @@ $this->params['breadcrumbs'][] = $page->title;
 
     <h1><?= Html::encode($page->title) ?></h1>
 
-	<?= preg_replace_callback('/\[\?= (.*)\((.*)\) \?\]/m', function ($m) {
-		$array = [];
-		$string = Html::decode($m[2]);
-		eval("\$array = $string;");
-		return $m[1]($array);
-	}, Yii::$app->formatter->asHtml($page->content, [
+	<?= $page->content(Yii::$app->formatter->asHtml($page->content, [
 		'Attr.AllowedRel' => array('nofollow'),
 		'HTML.SafeObject' => true,
 		'Output.FlashCompat' => true,
@@ -34,4 +29,5 @@ $this->params['breadcrumbs'][] = $page->title;
 		'URI.SafeIframeRegexp'=>'%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/)%',
 	])) ?>
 
+
 </article>