Merge branch 'master' of http://gitlab.informatika.org/if4033/secure-and-simple-blog

Conflicts:
	README.md~
	code/edit_post_action.php

README.md

@@ -7,33 +7,13 @@
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/mblaschke/php-docker-boilerplate.svg)](http://isitmaintained.com/project/mblaschke/php-docker-boilerplate "Average time to resolve an issue")
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/mblaschke/php-docker-boilerplate.svg)](http://isitmaintained.com/project/mblaschke/php-docker-boilerplate "Percentage of issues still open")
 
-This is an easy customizable docker boilerplate for any PHP-based projects like _Symfony Framework_, _CakePHP_, _Yii_ and many other frameworks or applications.
-
-Supports:
-
-- Nginx or Apache HTTPd
-- PHP-FPM (with Xdebug)
-- MySQL, MariaDB or PerconaDB
-- PostgreSQL
-- Solr (disabled, without configuration)
-- Elasticsearch (disabled, without configuration)
-- Redis (disabled)
-- Memcached (disabled)
-- Mailcatcher (if no mail sandbox is used, eg. [Vagrant Development VM](https://github.com/mblaschke/vagrant-development))
-- FTP server (vsftpd)
-- maybe more later...
-
-This Docker boilerplate is based on the [Docker best practices](https://docs.docker.com/articles/dockerfile_best-practices/) and doesn't use too much magic. Configuration of each docker container is available in the `docker/` directory - feel free to customize.
-
-This boilerplate can also be used for any other web project. Just customize the makefile for your needs.
-
-*Warning: There may be issues when using it in production.*
+# How to Run
 
-If you have any success stories please contact me.
+```docker-compose up -d```
 
-You can use my [Vagrant Development VM](https://github.com/mblaschke/vagrant-development) for this Docker boilerplate, e.g. for easily creating new boilerplate installations with short shell command: `ct docker:create directory`.
+# Dockerized PHP web project boilerplate Documentation
 
-## Table of contents
+This is an easy customizable docker boilerplate for any PHP-based projects like _Symfony Framework_, _CakePHP_, _Yii_ and many other frameworks or applications.
 
 - [First steps / Installation and requirements](/documentation/INSTALL.md)
 - [Updating docker boilerplate](/documentation/UPDATE.md)
@@ -45,6 +25,68 @@ You can use my [Vagrant Development VM](https://github.com/mblaschke/vagrant-dev
 - [Troubleshooting](/documentation/TROUBLESHOOTING.md)
 - [Changelog](/CHANGELOG.md)
 
+# Simple Blog
+
+Tugas 1 IF3110.
+
+![Simple Blog](http://i655.photobucket.com/albums/uu275/sonnylazuardi/ss-5.jpg)
+
+## Deskripsi
+
+Gunakan template ini untuk membuat sebuah blog sederhana dengan menggunakan bahasa pemrograman PHP.
+
+## Spesifikasi
+
+### List Post
+
+List Post merupakan halaman awal blog yang berisi daftar post yang sudah pernah dibuat. Setiap item pada list post mengandung `Judul`, `Tanggal`, `Konten`. Terdapat juga menu untuk mengedit dan menghapus item post tersebut.
+
+### Add Post
+
+Add Post merupakan halaman untuk menambahkan post baru.  Post baru memiliki form untuk mengisi `Judul`, `Tanggal`, dan `Konten`. Lakukan **validasi** untuk tanggal dengan javascript agar tanggal yang dimasukkan lebih besar atau sama dengan tanggal saat menambahkan post baru tersebut.
+
+### Edit Post
+
+Mengedit post yang sudah pernah dibuat. Form yang ditampilkan sama seperti saat menambahkan form baru.
+
+### Delete Post
+
+Menghapus post yang sudah pernah dibuat. Lakukan **konfimasi** dengan javascript untuk konfirmasi pengguna terhadap penghapusan post tersebut. Keluarkan konfirmasi berisi pesan berikut
+
+    Apakah Anda yakin menghapus post ini?
+
+Jika pengguna memilih `yes` maka post terhapus, jika tidak maka post tidak jadi dihapus.
+
+### View Post
+
+Halaman View Post merupakan halaman untuk melihat suatu post. Pada halaman ini terdapat informasi `Judul`, `Tanggal`, dan `Konten`, serta **Komentar** (spesifikasi di bawah).
+
+### Komentar
+
+Komentar berisi daftar komentar yang ditulis untuk post tertentu. Form komentar terdiri dari `Nama`, `Email`, dan `Komentar`, simpan juga tanggal dibuatnya komentar tersebut. Setiap item pada list komentar berisi `Nama`, `Tanggal`, `Komentar`.
+
+Lakukan **validasi** email pada form komentar dengan menggunakan javascript. Komentar dibuat dengan menggunakan AJAX. Pemanggilan AJAX dilakukan saat
+
+- Load list komentar
+- Menambahkan komentar baru
+
+## Tools
+
+Pembuatan blog ini tidak boleh menggunakan framework PHP dan javascript.
+
+## Deliverable
+
+Masing-masing orang lakukan Fork pada repo ini. Jika sudah selesai tambahkan pull request ke repo ini.
+
+## Lisensi
+
+© 2014 Asisten IF3110
+
+Yogi | [Sonny](http://github.com/sonnylazuardi) | Fathan | Renusa | Kelvin | Yanuar
+
+Dosen: [Yudistira Dwi Wardhana](http://github.com/yudis)
+
+
 ## Credits
 
 This Docker layout is based on https://github.com/denderello/symfony-docker-example/
@@ -59,9 +101,6 @@ Thanks for your support, ideas and issues.
 - [Stephan Ferraro](https://github.com/ferraro)
 - [Cedric Ziel](https://github.com/cedricziel)
 - [Elmar Hinz](https://github.com/elmar-hinz)
-
+- [Tegar Aji Pangestu](https://facebook.com/tegarnization)
 
 Thanks to [cron IT GmbH](http://www.cron.eu/) for inspiration.
-
-Did I forget anyone? Send me a tweet or create pull request!
-

README.md~

-# Dockerized PHP web project boilerplate. 
-
-## Customized for secure-blog assignment
-
-[![latest v4.0.0](https://img.shields.io/badge/latest-v4.0.0-green.svg?style=flat)](https://github.com/webdevops/php-docker-boilerplate/releases/tag/4.0.0)
-![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)
-[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/mblaschke/php-docker-boilerplate.svg)](http://isitmaintained.com/project/mblaschke/php-docker-boilerplate "Average time to resolve an issue")
-[![Percentage of issues still open](http://isitmaintained.com/badge/open/mblaschke/php-docker-boilerplate.svg)](http://isitmaintained.com/project/mblaschke/php-docker-boilerplate "Percentage of issues still open")
-
-This is an easy customizable docker boilerplate for any PHP-based projects like _Symfony Framework_, _CakePHP_, _Yii_ and many other frameworks or applications.
-
-Supports:
-
-- Nginx or Apache HTTPd
-- PHP-FPM (with Xdebug)
-- MySQL, MariaDB or PerconaDB
-- PostgreSQL
-- Solr (disabled, without configuration)
-- Elasticsearch (disabled, without configuration)
-- Redis (disabled)
-- Memcached (disabled)
-- Mailcatcher (if no mail sandbox is used, eg. [Vagrant Development VM](https://github.com/mblaschke/vagrant-development))
-- FTP server (vsftpd)
-- maybe more later...
-
-This Docker boilerplate is based on the [Docker best practices](https://docs.docker.com/articles/dockerfile_best-practices/) and doesn't use too much magic. Configuration of each docker container is available in the `docker/` directory - feel free to customize.
-
-This boilerplate can also be used for any other web project. Just customize the makefile for your needs.
-
-*Warning: There may be issues when using it in production.*
-
-If you have any success stories please contact me.
-
-You can use my [Vagrant Development VM](https://github.com/mblaschke/vagrant-development) for this Docker boilerplate, e.g. for easily creating new boilerplate installations with short shell command: `ct docker:create directory`.
-
-## Table of contents
-
-- [First steps / Installation and requirements](/documentation/INSTALL.md)
-- [Updating docker boilerplate](/documentation/UPDATE.md)
-- [Customizing](/documentation/CUSTOMIZE.md)
-- [Services (Webserver, MySQL... Ports, Users, Passwords)](/documentation/SERVICES.md)
-- [Docker Quickstart](/documentation/DOCKER-QUICKSTART.md)
-- [Run your project](/documentation/DOCKER-STARTUP.md)
-- [Container detail info](/documentation/DOCKER-INFO.md)
-- [Troubleshooting](/documentation/TROUBLESHOOTING.md)
-- [Changelog](/CHANGELOG.md)
-
-## Credits
-
-This Docker layout is based on https://github.com/denderello/symfony-docker-example/
-
-Thanks for your support, ideas and issues.
-- [Ingo Pfennigstorf](https://github.com/ipf)
-- [Florian Tatzel](https://github.com/PanadeEdu)
-- [Josef Florian Glatz](https://github.com/jousch)
-- [Ingo Müller](https://github.com/IngoMueller)
-- [Benjamin Rau](https://twitter.com/benjamin_rau)
-- [Philipp Kitzberger](https://github.com/Kitzberger)
-- [Stephan Ferraro](https://github.com/ferraro)
-- [Cedric Ziel](https://github.com/cedricziel)
-- [Elmar Hinz](https://github.com/elmar-hinz)
-
-
-Thanks to [cron IT GmbH](http://www.cron.eu/) for inspiration.
-
-Did I forget anyone? Send me a tweet or create pull request!
-

code/edit_post_action.php

@@ -33,8 +33,7 @@ if (isset($_SESSION["isLogin"]) && (isset($_POST['csrf_token']) && $_POST['csrf_
 	
 	$Tanggal = $_POST['Tanggal'];
     $Konten = $decrypt->$funcname(preg_replace(array_keys($utf8), array_values($utf8), $_POST['Konten']),(int)$_SESSION["shared_key"]);// caesarDecode ( $_POST['Konten'], (int)$_SESSION["shared_key"]) ;
-	$postid  = $_GET['postid'];
-    $con = phpsqlconnection();
+	$postid  = $_GET['postid'];    $con = phpsqlconnection();
     
     
     if ($_FILES["image"]["name"]!='') {
@@ -105,4 +104,4 @@ if (isset($_SESSION["isLogin"]) && (isset($_POST['csrf_token']) && $_POST['csrf_
     header("Location: login.php");
     /* Redirect browser */
 }
-?>
\ No newline at end of file
+?>