Gdpr branch

README.md

@@ -1,3 +1,3 @@
 # Blog Extension
 
-A blog extensions with a built-in comment system.
+A blog extensions with a built-in comment system. Small extension for a required checkbox in the comment section that it has to be agreed to the terms and conditions before able to post a comment.

app/views/comments.js

@@ -36,7 +36,6 @@ module.exports = {
                         UIkit.Utils.scrollToElement(anchor);
                     }
                 });
-
                 this.reply();
             });
         },
@@ -55,7 +54,6 @@ module.exports = {
             }).$mount().$appendTo(parent.$els.reply);
 
         }
-
     },
 
     components: {
@@ -127,7 +125,8 @@ module.exports = {
                     email: '',
                     content: '',
                     error: false,
-                    form: false
+                    form: false,
+                    term: false
                 };
             },
 

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "pagekit/blog",
     "type": "pagekit-extension",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "title": "Blog",
     "description": "A blog extensions with a built-in comment system.",
     "license": "MIT",

index.php

@@ -129,6 +129,7 @@
             'replymail' => true,
             'require_email' => true
 
+
         ],
 
         'posts' => [

languages/de_DE/messages.php

@@ -94,4 +94,5 @@
   'View' => 'Ansicht',
   'Numeric' => 'Numerisch',
   'Name' => 'Name',
-);
+  ' I agree to the terms and conditions.' => ' Ich stimme den Nutzungsbedinungen laut Datenschutzerklärung zu.'
+);

scripts.php

@@ -95,5 +95,4 @@
         }
 
     ]
-
-];
+];

src/Controller/BlogController.php

@@ -56,7 +56,6 @@ public function editAction($id = 0)
                     'user_id' => App::user()->id,
                     'status' => Post::STATUS_DRAFT,
                     'date' => new \DateTime(),
-                    'comment_status' => (bool) $module->config('posts.comments_enabled')
                 ]);
 
                 $post->set('title', $module->config('posts.show_title'));
@@ -124,7 +123,7 @@ public function commentAction($filter = [], $post = 0, $page = null)
                     'filter' => (object) $filter,
                     'page'   => $page,
                     'post'   => $post,
-                    'limit'  => App::module('blog')->config('comments.comments_per_page')
+                    'limit'  => App::module('blog')->config('comments.comments_per_page'),
                 ]
             ]
         ];

src/Controller/CommentApiController.php

@@ -118,17 +118,16 @@ public function saveAction($data, $id = 0)
     {
         if (!$id) {
 
-            if (!$this->user->hasAccess('blog: post comments')) {
+            if (!$this->user->hasAccess('blog: post comments')){
                 App::abort(403, __('Insufficient User Rights.'));
             }
-
             $comment = Comment::create();
 
             if ($this->user->isAuthenticated()) {
                 $data['author'] = $this->user->name;
                 $data['email'] = $this->user->email;
                 $data['url'] = $this->user->url;
-            } elseif ($this->blog->config('comments.require_email') && (!@$data['author'] || !@$data['email'])) {
+            } elseif ($this->blog->config('comments.require_email') && (!@$data['author'] || !@$data['email'])){
                 App::abort(400, __('Please provide valid name and email.'));
             }
 
@@ -173,6 +172,7 @@ public function saveAction($data, $id = 0)
             App::abort(404, __('Post not found.'));
         }
 
+
         $approved_once = (boolean) Comment::where(['user_id' => $this->user->id, 'status' => Comment::STATUS_APPROVED])->first();
         $comment->status = $this->user->hasAccess('blog: skip comment approval') ? Comment::STATUS_APPROVED : $this->user->hasAccess('blog: comment approval required once') && $approved_once ? Comment::STATUS_APPROVED : Comment::STATUS_PENDING;
 

src/Controller/SiteController.php

@@ -147,6 +147,7 @@ public function postAction($id = 0)
                     'post' => $post->id,
                     'enabled' => $post->isCommentable(),
                     'requireinfo' => $this->blog->config('comments.require_email'),
+                    'requireterm' => $this->blog->config('posts.term_enabled'),
                     'max_depth' => $this->blog->config('comments.max_depth'),
                     'user' => [
                         'name' => $user->name,

views/admin/settings.php

@@ -88,7 +88,11 @@
                             <p class="uk-form-controls-condensed">
                                 <label><input type="checkbox" v-model="config.posts.comments_enabled"> {{ 'Enable Comments' | trans }}</label>
                             </p>
+                            <p class="uk-form-controls-condensed">
+                                <label><input type="checkbox" v-model="config.posts.term_enabled"> {{ 'Enable Require Term Agreement' | trans }}</label>
+                            </p>
                         </div>
+
                     </div>
 
                 </li>

views/comments.php

@@ -106,14 +106,24 @@
             <div class="uk-form-row">
                 <label for="form-comment" class="uk-form-label">{{ 'Comment' | trans }}</label>
                 <div class="uk-form-controls">
-                    <textarea id="form-comment" class="uk-form-width-large" name="content" rows="10" v-model="content" v-validate:required></textarea>
+                    <textarea id="form-comment" class="uk-form-width-large" name="content" rows="10" v-model="content" v-validate:required></textarea><br>
 
                     <p class="uk-form-help-block uk-text-danger" v-show="form.content.invalid">{{ 'Comment cannot be blank.' | trans }}</p>
                 </div>
             </div>
 
+            <div id="term">
+              <p>
+                <div class="uk-form-row" v-if="config.requireterm">
+                  <label class="checkbox">
+                    <input id="term" type="checkbox" name="term" v-model="term" v-validate:required>{{ ' I agree to the terms and conditions.' | trans }}
+                  </label>
+                </div>
+              </p>
+            </div>
+
             <p>
-                <button class="uk-button uk-button-primary" type="submit" accesskey="s">{{ 'Submit' | trans }}</button>
+                <button class="uk-button uk-button-primary" :disabled="term === false" type="submit" accesskey="s">{{ 'Submit' | trans }}</button>
                 <button class="uk-button" accesskey="c" v-if="parent" @click.prevent="cancel">{{ 'Cancel' | trans }}</button>
             </p>