- Added database validation

- Added valid date for posts
- Fix passing data to htmls conflicts

App/Controllers/Posts.php

@@ -6,6 +6,8 @@ use App\Models\Post;
 use App\Models\Access;
 use \Core\Token;
 use \Core\Session;
+use \Core\Redirect;
+use \Core\Validate;
 
 class Posts
 {
@@ -18,31 +20,73 @@ class Posts
         $this->access = new Access();
     }
 
+    public function checkExpired()
+    {
+        $date = new \DateTime();
+        $now = $date->format("Y-m-d");
+
+        if ($expired = $this->post->showAll('expired_at', '<', $now)) {
+            foreach ($expired as $value) {
+                $this->post->update('pengumuman', ['status' => 0], $value['id']);
+            }
+        }
+    }
+
+    public function checkValid()
+    {
+        $date = new \DateTime();
+        $date = $date->setTime(0,0);
+        $now = $date->format("Y-m-d");
+
+        if ($not_valid = $this->post->showAll('valid_at', '>', $now)) {
+            foreach ($not_valid as $value) {
+                $this->post->update('pengumuman', ['status' => 0], $value['id']);
+            }
+        }
+    }
+
     public function index()
     {
-        $posts = $this->post->showAll(['status' => 1]);
+        $this->checkValid();
+        $this->checkExpired();
+
+        $posts = $this->post->showAll('status', '=', 1);
+
         $url = 'Data/pengumuman.html';
+
         $status = '';
-        // echo "This is index of posts."; // Nanti di replace sama twig view ke App\Views\Data\pengumuman.html
+
         if (Session::exists('userid')) {
             $posts = $this->post->showAll();
             $status = 'admin';
         }
+
+        // $x = 0;
+        for ($i=0; $i < count($posts); $i++) {
+            $posts[$i]['content'] = preg_replace('/[\r]/', '', $posts[$i]['content']);
+            $posts[$i]['content'] = preg_replace('/[\n]/', "<br/>", $posts[$i]['content']);
+        }
+
         View::render($url, [
             'posts' => $posts,
             'status' => $status
         ]);
+
         return true;
     }
 
     public function entry()
     {
         $categories = $this->post->showCategories();
-        // echo "You can entry new data here."; // Nanti di replace sama twig view ke App\Views\Data\entry_pengumuman.html
+
+        $user = Session::get('userid');
+
         View::render('Data/entry_pengumuman.html', [
             'categories' => $categories,
+            'user' => $user,
             'token' => Token::generate()
         ]);
+
         return true;
     }
 
@@ -52,55 +96,71 @@ class Posts
             if (is_array($id)) {
                 $id = implode('', $id);
             }
-            $post = $this->post->showSingle($id);
+
             $categories = $this->post->showCategories();
-            $user = $this->access->showSingle($id);
+
+            $post = $this->post->showSingle($id);
+            $creator = $post['creator'];
+            $editor = $post['editor'];
+
+            $creator = $this->access->showSingle($creator);
+            $editor = $this->access->showSingle($editor);
+
+            $editor_now = Session::get('userid');
+
             $date = new \DateTime();
             $timestamp = $date->format("Y/m/d H:i:s");
-            // echo "You can edit exists data with id $id here"; // Nanti di replace sama twig view ke App\Views\Data\edit_pengumuman.html
+
             View::render(
                 'Data/edit_pengumuman.html',
                 [
                     'post' => $post,
                     'categories' => $categories,
-                    'user' => $user,
+                    'creator' => $creator,
+                    'editor' => $editor,
+                    'editor_now' => $editor_now,
                     'timestamp' => $timestamp,
                     'token' => Token::generate()
                 ]
             );
-            return true;
         }
-        return false;
     }
 
     // Methods
     public function post($args = [])
     {
         $table = 'pengumuman';
+
         if ($this->post->entry($table, $args)) {
             Session::flash('info', 'Data successfuly uploaded');
-            return $this->index();
+            Redirect::to('/');
         }
     }
 
     public function put($args = [])
     {
         $table = 'pengumuman';
+
+        $args['content'] = htmlspecialchars($args['content']);
+
         $id = $args['id'];
         unset($args['id']);
+
         if ($this->post->update($table, $args, $id)) {
             Session::flash('info', 'Data successfuly updated');
-            return $this->edit($id);
+            Redirect::to('/');
         }
     }
 
     public function delete($args = [])
     {
         $table = 'pengumuman';
+
         $id = $args['id'];
+
         if ($this->post->delete($table, $id)) {
             Session::flash('info', 'Data successfuly removed');
-            return $this->edit($id);
+            Redirect::to('/');
         }
     }
 }

App/Models/Access.php

@@ -10,11 +10,11 @@ class Access extends \Core\Model
             [
                 'id int(3) NOT NULL AUTO_INCREMENT',
                 'username varchar(25) NOT NULL',
-                'password char(13)',
+                'password char(13) NOT NULL',
-                'salt char(23)',
+                'salt char(23) NOT NULL',
-                'name varchar(50)',
+                'name varchar(50) NOT NULL',
-                'registered_at timestamp DEFAULT CURRENT_TIMESTAMP',
+                'registered_at date NOT NULL DEFAULT CURRENT_TIMESTAMP',
-                'status tinyint DEFAULT 1',
+                'status tinyint NOT NULL DEFAULT 1',
                 'PRIMARY KEY (id)'
             ]
         );

App/Models/Post.php

@@ -11,12 +11,14 @@ class Post extends \Core\Model
             [
                 'id int(3) NOT NULL AUTO_INCREMENT',
                 'category int(3) NOT NULL',
-                'created_at timestamp DEFAULT CURRENT_TIMESTAMP',
+                'created_at date NOT NULL DEFAULT CURRENT_TIMESTAMP',
-                'expired_at timestamp NOT NULL',
+                'valid_at date NOT NULL DEFAULT CURRENT_TIMESTAMP',
+                'expired_at date NOT NULL',
                 'creator int(3) NOT NULL',
-                'edited_at timestamp',
+                'edited_at date',
-                'editor timestamp',
+                'editor date',
                 'content varchar(255) NOT NULL',
+                'status tinyint NOT NULL DEFAULT 1',
                 'PRIMARY KEY (id)'
             ]
         );
@@ -32,22 +34,21 @@ class Post extends \Core\Model
         );
     }
 
-    public function showAll($conds = [])
+    public function showAll($key = '', $operator = '', $cond = '')
     {
         try {
             $db = static::connectDB();
 
             $sql = "SELECT * FROM pengumuman";
 
-            if ($conds) {
+            if ($key && $operator && $cond) {
-                $key = implode('', array_keys($conds));
+                $sql .= " WHERE {$key} {$operator} ?";
-                $sql .= " WHERE {$key} = ?";
             }
 
             $query = $db->prepare($sql);
 
-            if ($conds) {
+            if ($key && $operator && $cond) {
-                $query->bindValue(1, implode('', array_values($conds)));
+                $query->bindValue(1, $cond);
             }
 
             if ($query->execute()) {
@@ -56,6 +57,7 @@ class Post extends \Core\Model
                     return $result;
                 }
             }
+            return false;
         } catch (PDOException $e) {
             echo $e->getMessage();
         }

App/Views/Data/edit_pengumuman.html

@@ -35,9 +35,7 @@
 
         <label>Dibuat oleh: </label>
         <span>
-            {% if post.creator == user.id %}
+            {{ creator.name }}
-                {{ user.name }}
-            {% endif %}
         </span>
 
         <br>
@@ -66,12 +64,10 @@
             {% if post.editor == "0" %}
                 -
             {% else %}
-                {% if post.editor == user.id %}
+                {{ editor.name }}
-                    {{ user.name }}
-                {% endif %}
             {% endif %}
         </span>
-        <input type="hidden" name="editor" value="3"><!-- User -->
+        <input type="hidden" name="editor" value="{{ editor_now }}">
 
         <br>
 

App/Views/Data/entry_pengumuman.html

@@ -15,6 +15,11 @@
 
     <br>
 
+    <label for="expired_at">Berlaku dari</label>
+    <input type="date" name="valid_at" value="">
+
+    <br>
+
     <label for="expired_at">Berlaku sampai</label>
     <input type="date" name="expired_at" value="">
 
@@ -23,7 +28,7 @@
     <label for="content">Konten</label>
     <textarea name="content" rows="3" cols="30"></textarea>
 
-    <input type="hidden" name="creator" value="1"> <!-- Nanti diganti user id -->
+    <input type="hidden" name="creator" value="{{ user }}">
 
     <!-- Current Timestamp -->
     <input type="hidden" name="_currts" value="{{ timestamp }}" disabled>

App/Views/Data/pengumuman.html

@@ -6,18 +6,20 @@
 <h2>List Pengumuman</h2>
 
     {% for post in posts %}
-        <h3>Pengumuman {{ post.id }}</h3>
+        {% if post.id %}
-        {% if status %}
+            <h3>Pengumuman {{ post.id }}</h3>
-            <a href="/posts/edit/{{ post.id }}">
+            {% if status %}
-            {% if post.status == 1 %}
+                <a href="/posts/edit/{{ post.id }}">
-                    Edit
+                {% if post.status == 1 %}
-                </a>
+                        Edit
-            {% else %}
+                    </a>
-                    <strike>Edit</strike>
+                {% elseif post.status == 0 %}
-                </a> (Nonaktif)
+                        <strike>Edit</strike>
+                    </a> (Nonaktif)
+                {% endif %}
             {% endif %}
+            <p>{{ post.content|raw }}</p>
         {% endif %}
-        <p>{{ post.content }}</p>
     {% endfor %}
 
     {% if status %}

Core/Router.php

@@ -76,7 +76,8 @@ class Router
                         } else {
                             // Token invalid
                             $flash = Session::flash('info', 'Token invalid, try again');
-                            die($flash);
+                            $error = Session::flash('info');
+                            die($error);
                         }
                         unset($var['_token']);
                         unset($var['_method']);

Core/Validate.php

@@ -0,0 +1,14 @@
+<?php
+namespace Core;
+
+class Validate
+{
+    public static function check($items)
+    {
+        foreach ($items as $item) {
+            $item = preg_replace('/^<[\Ww\/]>$/', '', $item);
+            return true;
+        }
+        return false;
+    }
+}