Global:

- fix layout Meta

Blog:
- added Vimeo video
- fix YouTube, Vimeo preview image
- fix URL rule

common/modules/blog/controllers/PostController.php

@@ -2,14 +2,21 @@
 
 namespace common\modules\blog\controllers;
 
+use common\modules\blog\entities\BlogPost;
 use common\modules\blog\forms\BlogCommentForm;
+use common\modules\blog\forms\BlogPostForm;
+use common\modules\blog\helpers\BlogPostHelper;
 use common\modules\blog\repositories\read\BlogCategoryReadRepository;
 use common\modules\blog\repositories\read\BlogPostReadRepository;
 use common\modules\blog\repositories\read\BlogTagReadRepository;
 use common\modules\blog\services\BlogCommentService;
+use core\entities\Meta;
 use frontend\components\FrontendController;
 use Yii;
+use yii\base\Security;
 use yii\data\ActiveDataProvider;
+use yii\helpers\FileHelper;
+use yii\helpers\Json;
 use yii\web\NotFoundHttpException;
 use yii\filters\AccessControl;
 
@@ -43,10 +50,10 @@ class PostController extends FrontendController
 	{
 		return [
 			'access' => [
-				'class' => AccessControl::className(),
+				'class' => AccessControl::class,
 				'rules' => [
 					[
-						'actions' => ['index', 'category', 'tag', 'post'],
+						'actions' => ['index', 'category', 'tag', 'post', 'preview'],
 						'allow' => true,
 						//'roles' => ['Blog'],
 					],
@@ -159,4 +166,64 @@ class PostController extends FrontendController
             'model' => $form,
         ]);
     }
+
+	public function beforeAction($action)
+	{
+		// ...set `$this->enableCsrfValidation` here based on some conditions...
+		// call parent method that will check CSRF if such property is true.
+		if ($action->id === 'preview') {
+			# code...
+			$this->enableCsrfValidation = false;
+		}
+		return parent::beforeAction($action);
+	}
+
+	public function actionPreview()
+    {
+	    Yii::$app->controller->enableCsrfValidation = false;
+	    $form = new BlogPostForm();
+	    if ($form->load(Yii::$app->request->post()) && $form->validate()) {
+		    $post = new BlogPost();
+		    $post->id = -1;
+		    $post->title = $form->title;
+		    $post->description = $form->description;
+		    $post->content = $form->content;
+		    $post->category_id = $form->category_id;
+		    $post->created_at = time();
+		    $post->updated_at = time();
+		    $post->published_at = time();
+
+		    $meta = new Meta($form->meta->title, $form->meta->description, $form->meta->keywords);
+		    $post->meta = $meta;
+		    $post->meta_json = Json::encode([
+		    	'title' => $form->meta->title,
+		    	'description' => $form->meta->description,
+		    	'keywords' => $form->meta->keywords,
+		    ]);
+		    $post->video = $form->video;
+		    $post->slug = $form->slug;
+
+		    if ($form->image) {
+			    $post->setImage($form->image);
+		    }
+		    else if ($form->video) {
+			    $src = 'https://i.ytimg.com/vi/' . BlogPostHelper::parseYoutubeUrl($post->video) . '/maxresdefault.jpg';
+			    $filename = (new Security())->generateRandomString(15) . '.jpg';
+			    copy($src, \Yii::getAlias(BlogPost::FILE_ORIGINAL_PATH . '/' . $post->id . '.jpg'));
+			    //copy($src, \Yii::getAlias(BlogPost::FILE_ORIGINAL_PATH . '/' . $filename));
+			    $post->image = $filename;
+		    }
+
+		    $path = $post->getUploadedFilePath('image');
+		    FileHelper::createDirectory(pathinfo($path, PATHINFO_DIRNAME), 0775, true);
+		    $post->image->saveAs($path);
+
+		    $post->image = $post->getImageFileUrl('image');
+
+		    return $this->render('post', [
+			    'post' => $post,
+		    ]);
+	    }
+	    return '';
+    }
 }

common/modules/blog/controllers/manage/PostController.php

@@ -28,7 +28,7 @@ class PostController extends Controller
     {
         return [
             'access' => [
-                'class' => AccessControl::className(),
+                'class' => AccessControl::class,
                 'rules' => [
                     [
                         'allow' => true,
@@ -41,7 +41,7 @@ class PostController extends Controller
                 ],
             ],
             'verbs' => [
-                'class' => VerbFilter::className(),
+                'class' => VerbFilter::class,
                 'actions' => [
                     'delete' => ['POST'],
                     'activate' => ['POST'],

common/modules/blog/entities/BlogPost.php

@@ -273,22 +273,22 @@ class BlogPost extends ActiveRecord
 
     public function getBlogComments(): ActiveQuery
     {
-        return $this->hasMany(BlogComment::className(), ['post_id' => 'id']);
+        return $this->hasMany(BlogComment::class, ['post_id' => 'id']);
     }
 
     public function getBlogTagAssignments(): ActiveQuery
     {
-        return $this->hasMany(BlogTagAssignment::className(), ['post_id' => 'id']);
+        return $this->hasMany(BlogTagAssignment::class, ['post_id' => 'id']);
     }
 
     public function getTags(): ActiveQuery
     {
-        return $this->hasMany(BlogTag::className(), ['id' => 'tag_id'])->viaTable('blog_tag_assignments', ['post_id' => 'id']);
+        return $this->hasMany(BlogTag::class, ['id' => 'tag_id'])->viaTable('blog_tag_assignments', ['post_id' => 'id']);
     }
 
     public function getCategory(): ActiveQuery
     {
-        return $this->hasOne(BlogCategory::className(), ['id' => 'category_id']);
+        return $this->hasOne(BlogCategory::class, ['id' => 'category_id']);
     }
 
     ######################################
@@ -296,15 +296,15 @@ class BlogPost extends ActiveRecord
 	public function behaviors(): array
 	{
 		return [
-			TimestampBehavior::className(),
+			TimestampBehavior::class,
-			MetaBehavior::className(),
+			MetaBehavior::class,
 			[
-				'class' => SaveRelationsBehavior::className(),
+				'class' => SaveRelationsBehavior::class,
 				'relations' => ['blogTagAssignments', 'blogComments'],
 			],
 			[
 				// todo Image Sizes to settings or theme settings
-				'class' => ImageUploadBehavior::className(),
+				'class' => ImageUploadBehavior::class,
 				'attribute' => 'image',
 				'createThumbsOnRequest' => true,
 				//'filePath' => $this::FILE_ORIGINAL_PATH . '/[[id]].[[extension]]',
@@ -313,7 +313,7 @@ class BlogPost extends ActiveRecord
 				'thumbPath' => '@staticRoot/cache/posts/[[profile]]_[[id]].[[extension]]',
 				'thumbUrl' => '@static/cache/posts/[[profile]]_[[id]].[[extension]]',
 				'thumbs' => [
-					'blog_list' => ['width' => 750, 'height' => 300],
+					'blog_list' => ['width' => 750, 'height' => 300, 'resizeUp' => true],
 					'blog_post' => ['width' => 900, 'height' => 300],
 
 					'admin' => ['width' => 60, 'height' => 60],

common/modules/blog/messages/ru/blog.php

@@ -54,6 +54,7 @@ return [
 	'User' => 'Пользователь',
 	'Post' => 'Статья',
 	'YouTube URL' => 'Ссылка YouTube',
+	'Video URL' => 'Ссылка на видео (YouTube, Vimeo)',
 	'Add Image' => 'Новое изображение',
 	'Video' => 'Видео',
 	'If a video link is specified, the image will be used as a preview image' => 'Если указана ссылка на видео, то изображение будет рассматриваться как картинка для предварительного просмотра',

common/modules/blog/services/BlogPostManageService.php

@@ -10,6 +10,7 @@ use common\modules\blog\repositories\BlogCategoryRepository;
 use common\modules\blog\repositories\BlogRepository;
 use common\modules\blog\repositories\BlogTagRepository;
 use core\entities\Meta;
+use core\helpers\VideoHelper;
 use core\services\TransactionManager;
 use yii\base\Security;
 use yii\helpers\Inflector;
@@ -53,16 +54,6 @@ class BlogPostManageService
             )
         );
 
-        if ($form->image) {
-            $post->setImage($form->image);
-        }
-        else if ($form->video) {
-	        $src = 'https://i.ytimg.com/vi/' . BlogPostHelper::parseYoutubeUrl($post->video) . '/maxresdefault.jpg';
-	        $filename = (new Security())->generateRandomString(15) . '.jpg';
-	        copy($src, \Yii::getAlias(BlogPost::FILE_ORIGINAL_PATH . '/' . $post->id . '.jpg'));
-	        $post->image = $filename;
-        }
-
         $this->transaction->wrap(function () use ($post, $form) {
 
 	        if (is_array($form->tags->new_tags) && !empty($form->tags->new_tags)) {
@@ -75,6 +66,23 @@ class BlogPostManageService
 		        }
 	        }
             $this->posts->save($post);
+
+	        if ($form->image) {
+		        $post->setImage($form->image);
+	        }
+	        else if ($form->video) {
+		        $src = VideoHelper::getThumb($form->video);
+		        //$src = 'https://i.ytimg.com/vi/' . BlogPostHelper::parseYoutubeUrl($post->video) . '/maxresdefault.jpg';
+		        $filename = (new Security())->generateRandomString(15) . '.jpg';
+		        copy($src, \Yii::getAlias(BlogPost::FILE_ORIGINAL_PATH . '/' . $post->id . '.jpg'));
+		        $post->image = $filename;
+	        }
+
+	        if ($form->status == BlogPost::STATUS_ACTIVE) {
+	        	$post->activate();
+	        }
+
+	        $this->posts->save($post);
         });
 
         return $post;
@@ -106,7 +114,8 @@ class BlogPostManageService
         }
 	    elseif ($form->video && (!$post->image || $form->reset_image)) {
 		    $post->cleanFiles();
-			$src = 'https://i.ytimg.com/vi/' . BlogPostHelper::parseYoutubeUrl($post->video) . '/maxresdefault.jpg';
+		    $src = VideoHelper::getThumb($form->video);
+			//$src = 'https://i.ytimg.com/vi/' . BlogPostHelper::parseYoutubeUrl($post->video) . '/maxresdefault.jpg';
 			$filename = (new Security())->generateRandomString(15) . '.jpg';
 			copy($src, \Yii::getAlias(BlogPost::FILE_ORIGINAL_PATH . '/' . $post->id . '.jpg'));
 			$post->image = $filename;

common/modules/blog/urls/BlogMainUrlRule.php

@@ -4,7 +4,6 @@ namespace common\modules\blog\urls;
 
 use common\modules\blog\repositories\read\BlogPostReadRepository;
 use yii\base\BaseObject;
-use yii\base\InvalidParamException;
 use yii\caching\Cache;
 use yii\caching\TagDependency;
 use yii\web\UrlNormalizerRedirectException;
@@ -66,7 +65,8 @@ class BlogMainUrlRule extends BaseObject implements UrlRuleInterface
             }, null, new TagDependency(['tags' => ['blog']]));
 
             if (!$url) {
-                throw new InvalidParamException('Undefined id.');
+            	return '#';
+                //throw new InvalidArgumentException('Undefined id.');
             }
 
 	        $url = $this->prefix . '/' . $url;

common/modules/blog/views/manage/post/_form.php

@@ -132,7 +132,7 @@ $this->registerJs($js2);
 							<?php endif; ?>
 						</div>
 						<div id="field_video" class="tab-pane fade" style="padding-top: 20px;">
-							<?= $form->field($model, 'video')->textInput()->label(Yii::t('blog', 'YouTube URL'))->hint(Yii::t('blog', 'If a video link is specified, the image will be used as a preview image')) ?>
+							<?= $form->field($model, 'video')->textInput()->label(Yii::t('blog', 'Video URL'))->hint(Yii::t('blog', 'If a video link is specified, the image will be used as a preview image')) ?>
 						</div>
 					</div>
 
@@ -158,7 +158,13 @@ $this->registerJs($js2);
 			<div class="box box-default">
 				<div class="box-header with-border"><?= Yii::t('blog', 'Publish') ?></div>
 				<div class="box-body">
-					<?= Html::button(Yii::t('blog', 'Preview on site')) ?>
+					<?= Html::submitButton(Yii::t('blog', 'Preview on site'), [
+						'class' => 'btn btn-info',
+						'value'=>'preview',
+						'name'=>'submit_preview',
+						'formaction' => Url::to(Yii::$app->params['frontendHostInfo'] . '/blog/post/preview'),
+						'formtarget' => '_blank',
+					]) ?>
 					<hr>
 					<?= $form->field($model, 'status')->radioList(BlogPostHelper::statusList()) ?>
 					<hr>

common/modules/blog/views/manage/post/view.php

@@ -76,7 +76,11 @@ $this->params['breadcrumbs'][] = $title;
 		<div class="box">
 			<div class="box-header with-border"><?= Yii::t('blog', 'Image') ?></div>
 			<div class="box-body">
-				<?= Html::img('https://i.ytimg.com/vi/' . BlogPostHelper::parseYoutubeUrl($post->video) . '/maxresdefault.jpg', [
+				<!-- < ?= Html::img('https://i.ytimg.com/vi/' . BlogPostHelper::parseYoutubeUrl($post->video) . '/maxresdefault.jpg', [
+					'width' => 300,
+					'class' => 'thumbnail',
+				]) ?> -->
+				<?= Html::img(\core\helpers\VideoHelper::getThumb($post->video), [
 					'width' => 300,
 					'class' => 'thumbnail',
 				]) ?>
@@ -88,7 +92,10 @@ $this->params['breadcrumbs'][] = $title;
 		<div class="box">
 			<div class="box-header with-border"><?= Yii::t('blog', 'Video') ?></div>
 			<div class="box-body">
-				<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/<?= BlogPostHelper::parseYoutubeUrl($post->video) ?>?rel=0" frameborder="0" allowfullscreen></iframe>
+				<?= \core\widgets\VideoWidget::widget([
+					'src' => $post->video,
+					'style' => '',
+				]) ?>
 			</div>
 		</div>
 	<?php endif; ?>

core/helpers/VideoHelper.php

@@ -0,0 +1,86 @@
+<?php
+/**
+ * Created by Error202
+ * Date: 06.07.2018
+ */
+
+namespace core\helpers;
+
+
+class VideoHelper
+{
+	public static function identityProvider($url)
+	{
+		if (preg_match('%youtube|youtu\.be%i', $url)) {
+			return 'youtube';
+		}
+		elseif (preg_match('%vimeo%i', $url)) {
+			return 'vimeo';
+		}
+		return null;
+	}
+
+	public static function getThumb($url)
+	{
+		$src = '';
+		switch (self::identityProvider($url)) {
+			case 'youtube':
+				$id = VideoHelper::parseYoutubeUrl($url);
+				$src = 'https://i.ytimg.com/vi/' . $id . '/maxresdefault.jpg';
+				break;
+			case 'vimeo':
+				$id = VideoHelper::parseVimeoUrl($url);
+				$data = file_get_contents("http://vimeo.com/api/v2/video/$id.json");
+				$data = json_decode($data);
+				$src = $data[0]->thumbnail_large;
+				break;
+		}
+		return $src;
+	}
+
+	public static function parseVimeoUrl($url)
+	{
+		$urls = parse_url($url);
+		// https://vimeo.com/274720181
+		if($urls['host'] == 'vimeo.com'){
+			$id = ltrim($urls['path'],'/');
+		}
+		// https://player.vimeo.com/video/274720181
+		else {
+			$parts = explode('/',$urls['path']);
+			$id = end($parts);
+		}
+
+		return $id;
+	}
+
+	public static function parseYoutubeUrl($url)
+	{
+		$urls = parse_url($url);
+		//url is http://youtu.be/xxxx
+		if($urls['host'] == 'youtu.be'){
+			$id = ltrim($urls['path'],'/');
+		}
+		//url is http://www.youtube.com/embed/xxxx
+		else if(strpos($urls['path'],'embed') == 1){
+			$parts = explode('/',$urls['path']);
+			$id = end($parts);
+		}
+		//url is xxxx only
+		else if(strpos($url,'/')===false){
+			$id = $url;
+		}
+		//http://www.youtube.com/watch?feature=player_embedded&v=m-t4pcO99gI
+		//url is http://www.youtube.com/watch?v=xxxx
+		else{
+			parse_str($urls['query']);
+			/* @var $v */
+			$id = $v;
+			if(!empty($feature)){
+				$id = end(explode('v=',$urls['query']));
+			}
+		}
+		return $id;
+	}
+
+}

core/widgets/VideoWidget.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Created by Error202
+ * Date: 06.07.2018
+ */
+
+namespace core\widgets;
+
+
+use yii\base\Widget;
+use core\helpers\VideoHelper;
+
+class VideoWidget extends Widget
+{
+	public $src;
+
+	public $width = 640;
+	public $height = 360;
+	public $style = "width: 100%";
+
+	public function run() {
+		$player = '';
+		switch (VideoHelper::identityProvider($this->src)) {
+			case 'youtube':
+				$id = VideoHelper::parseYoutubeUrl($this->src);
+				$player = '<iframe style="'.$this->style.'" width="'.$this->width.'" height="'.$this->height.'" src="https://www.youtube.com/embed/'.$id.'" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>';
+				break;
+			case 'vimeo':
+				$id = VideoHelper::parseVimeoUrl($this->src);
+				$player = '<iframe style="'.$this->style.'" src="https://player.vimeo.com/video/'.$id.'" width="'.$this->width.'" height="'.$this->height.'" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>';
+				break;
+		}
+		return $player;
+	}
+}

frontend/web/themes/start/layouts/main.php

@@ -3,6 +3,8 @@
  * @var $this \yii\web\View
  */
 
+use yii\helpers\Html;
+
 \frontend\web\themes\start\layouts\code\assets\AppAsset::register($this);
 rmrevin\yii\fontawesome\cdn\AssetBundle::register($this);
 ?>
@@ -12,13 +14,12 @@ rmrevin\yii\fontawesome\cdn\AssetBundle::register($this);
 
 <head>
 
-	<meta charset="utf-8">
+	<meta charset="<?= Yii::$app->charset ?>">
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-	<meta name="description" content="">
+	<meta name="author" content="Egor Oldenburger">
-	<meta name="author" content="">
-
-	<title>Modern Business - Start Bootstrap Template</title>
 
+	<title><?= Html::encode($this->title) ?></title>
+	<?= Html::csrfMetaTags() ?>
 	<?php $this->head() ?>
 </head>
 
@@ -27,12 +28,17 @@ rmrevin\yii\fontawesome\cdn\AssetBundle::register($this);
 <!-- Navigation -->
 <nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark fixed-top">
 	<div class="container">
-		<a class="navbar-brand" href="index.html">Start Bootstrap</a>
+		<?= Html::a('Start Bootstrap', ['/site/index'], ['class' => 'navbar-brand']) ?>
 		<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
 			<span class="navbar-toggler-icon"></span>
 		</button>
 		<div class="collapse navbar-collapse" id="navbarResponsive">
 			<ul class="navbar-nav ml-auto">
+
+				<li class="nav-item">
+					<?= Html::a(Yii::t('blog_public', 'Blog'), ['/blog/post/index'], ['class' => 'nav-link']) ?>
+				</li>
+
 				<li class="nav-item">
 					<a class="nav-link" href="about.html">About</a>
 				</li>

frontend/web/themes/start/modules/blog/views/post/post.php

@@ -40,14 +40,28 @@ $url_full = Yii::$app->params['frontendHostInfo'] . Url::to(['/blog/post/post',
 			<hr>
 
 			<!-- Preview Image -->
+			<?php if ($post->video): ?>
+				<!-- <iframe style="width: 100%" width="560" height="315" src="https://www.youtube.com/embed/< ?= \core\helpers\PostHelper::parseYoutubeUrl($post->video) ?>" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe> -->
+				<?= \core\widgets\VideoWidget::widget([
+					'src' => $post->video,
+				]) ?>
+			<?php else: ?>
 			<img class="img-fluid rounded" src="<?= Html::encode($post->getThumbFileUrl('image', 'blog_post')) ?>" alt="">
-
+			<?php endif; ?>
 			<hr>
 
 			<!-- Post Content -->
 			<p class="lead"><?= Html::encode($post->description) ?></p>
 
-			<?= $post->content ?>
+			<!-- < ?= $post->content ?> -->
+
+			<?= Yii::$app->formatter->asHtml($post->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/)%',
+			]) ?>
 
 <?= \common\modules\blog\widgets\TagWidget::widget([
 	'post_id' => $post->id