diff --git a/App/Controllers/Home.php b/App/Controllers/Home.php index 0040cd4..aac841d 100644 --- a/App/Controllers/Home.php +++ b/App/Controllers/Home.php @@ -175,4 +175,20 @@ class Home } return true; } + + // Branch mithril test + public function mithril() { + if (Session::exists('userid')) { + $user['id'] = Session::get('userid'); + $user['username'] = Session::get('username'); + $user['full_name'] = Session::get('full_name'); + $user['privilege'] = Session::get('privilege'); + } else { + $user = false; + } + + View::render('Data/mithril.html', [ + 'user' => $user + ]); + } } diff --git a/App/Models/Post.php b/App/Models/Post.php index 03a8d0d..ba729b2 100644 --- a/App/Models/Post.php +++ b/App/Models/Post.php @@ -122,7 +122,7 @@ class Post extends \Core\Model try { $db = static::connectDB(); - $sql = "SELECT pengumuman.id, kategori.background, kategori.foreground, pengumuman.valid_at, pengumuman.expired_at, pengumuman.creator, pengumuman.editor, pengumuman.content, pengumuman.status FROM pengumuman INNER JOIN kategori ON pengumuman.category=kategori.id"; + $sql = "SELECT pengumuman.id, kategori.category, kategori.background, kategori.foreground, date(pengumuman.valid_at) as valid_at, date(pengumuman.expired_at) as expired_at, pengumuman.creator, pengumuman.editor, pengumuman.content, pengumuman.status FROM pengumuman INNER JOIN kategori ON pengumuman.category=kategori.id"; if ($conditions) { $sql .= " WHERE";