Merge branch 'dev' into binarity.cz

modules/Blog/Article/Entities/Comment.php

@@ -11,7 +11,8 @@ class Comment extends Model
         'content_id',
         'content',
         'email',
-        'name'
+        'name',
+        'approved'
     ];
 
     public function author()

modules/Blog/Article/Http/Controllers/Visitor/CreateNewComment.php

@@ -40,7 +40,8 @@ class CreateNewComment extends Controller
                             'content_id' => $article->id,
                             'name'       => $name,
                             'email'      => $email,
-                            'content'    => $content
+                            'content'    => $content,
+                            'approved' => !is_null($user)
                         ]);
 
         // fire event about new comment

modules/Blog/ArticleList/Providers/ArticleListServiceProvider.php

@@ -1,12 +1,9 @@
 <?php namespace Modules\Blog\ArticleList\Providers;
 
-use App\Handlers\Registrators\TemplateRegistrator;
 use Illuminate\Support\ServiceProvider;
-use InvalidArgumentException;
-use Modules\Blog\ArticleList\Handlers\ArticleList;
-
-class ArticleListServiceProvider extends ServiceProvider {
 
+class ArticleListServiceProvider extends ServiceProvider
+{
     /**
      * Indicates if loading of the provider is deferred.
      *
@@ -42,8 +39,8 @@ class ArticleListServiceProvider extends ServiceProvider {
      */
     protected function registerConfig()
     {
-		$this->publishes([__DIR__.'/../Config/config.php' => config_path('articlelist.php')]);
+        $this->publishes([__DIR__ . '/../Config/config.php' => config_path('articlelist.php')]);
-		$this->mergeConfigFrom(__DIR__.'/../Config/config.php', 'articlelist');
+        $this->mergeConfigFrom(__DIR__ . '/../Config/config.php', 'articlelist');
     }
 
     /**
@@ -54,7 +51,10 @@ class ArticleListServiceProvider extends ServiceProvider {
     public function registerViews()
     {
         $viewPath = base_path('resources/views/modules/articlelist');
-		$sourcePath = __DIR__.'/../Resources/views';
+        $sourcePath = __DIR__ . '/../Resources/views';
+        if (!is_dir($sourcePath)) {
+            return;
+        }
 
         $this->publishes([$sourcePath => $viewPath]);
 
@@ -75,7 +75,7 @@ class ArticleListServiceProvider extends ServiceProvider {
         if (is_dir($langPath)) {
             $this->loadTranslationsFrom($langPath, 'articlelist');
         } else {
-			$this->loadTranslationsFrom(__DIR__ .'/../Resources/lang', 'articlelist');
+            $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'articlelist');
         }
     }
 
@@ -86,7 +86,6 @@ class ArticleListServiceProvider extends ServiceProvider {
      */
     public function provides()
     {
-		return array();
+        return array ();
     }
-
 }