diff --git a/.htaccess b/.htaccess
deleted file mode 100644
index c6fe4d8..0000000
--- a/.htaccess
+++ /dev/null
@@ -1,20 +0,0 @@
-# Necessary to prevent problems when using a controller named "index" and having a root index.php
-# more here: http://httpd.apache.org/docs/2.2/content-negotiation.html
-Options -MultiViews
-
-# Activates URL rewriting (like myproject.com/controller/action/1/2/3)
-RewriteEngine On
-
-# Disallows others to look directly into /public/ folder
-Options -Indexes
-
-# When using the script within a sub-folder, put this path here, like /mysubfolder/
-# If your app is in the root of your web folder, then leave it commented out
-RewriteBase /php-mvc-advanced/
-
-# General rewrite rules
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-l
-
-RewriteRule ^(.+)$ index.php?url=$1 [QSA,L]
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 3f2a92e..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-CHANGE LOG
-==========
-
-**January 4th 2014**
-- fixed htaccess issue when there's a controller named "index" and a base index.php (which collide)
-
-**December 29th 2013**
-- fixed case-sensitive model file loading (thanks "grrnikos")
diff --git a/README.md b/README.md
index a5ecbfd..1880600 100644
--- a/README.md
+++ b/README.md
@@ -1,178 +1,3 @@
-# PHP-MVC-ADVANCED
+# MINI2
-*Note: This is the same like [panique/php-mvc](https://github.com/panique/php-mvc), but with additional features.*
-*This repo is in development, more to come...*
-
-### New in the advanced version:
-
-1. Twig
-2. SASS-compiler in PHP ! The SASS compiling is optional, you can delete the scss folder and just use classic .css, too.
- I've used https://github.com/panique/laravel-sass here.
-
-An extremely simple and easy to understand MVC skeleton application, reduced to the max.
-Everything is **as simple as possible**, as **manually as possible** and as readable as possible.
-This project is - by intention - NOT a full framework, it's a bare-bone structure, written in
-purely native PHP ! The php-mvc skeleton tries to be the extremely slimmed down opposite of big frameworks
-like Zend2, Symfony or Laravel.
-
-[![Donate with PayPal banner](_tutorial/donate-with-paypal.png)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=P5YLUK4MW3LDG)
-
-[![Donate with Flattr banner](_tutorial/donate-with-flattr.png)](https://flattr.com/submit/auto?user_id=panique&url=https%3A%2F%2Fgithub.com%2Fpanique%2Fphp-mvc-advanced)
-
-## Why does this project exist ?
-
-One of the biggest question in the PHP world is "How do I build an application ?".
-It's hard to find a good base, a good file structure and useful information on that, but at the same time
-there are masses of frameworks that might be really good, but really hard to understand, hard to use and extremely
-complex. This project tries to be some kind of naked skeleton bare-bone for quick application building,
-especially for the not-so-advanced coder.
-
-### Goals of this project:
-
-- give people a clean base MVC structure to build a modern PHP application with
-- teach people the basics of the Model-View-Controller architecture
-- encourage people to code according to PSR 1/2 coding guidelines
-- promote the usage of PDO
-- promote the usage of external libraries via Composer
-- promote development with max. error reporting
-- promote to comment code
-- promote the usage of OOP code
-- using only native PHP code, so people don't have to learn a framework
-
-## Support forum
-
-If you are stuck with something even AFTER reading and following the install tutorials and the quick-manual, then feel
-free to ask in the [official forum](http://forum.php-mvc.net/). Note that this forum is fresh and new, more content
-will come over time.
-
-## Installation
-
-1. First, install Composer ([How to install Composer on Ubuntu, Debian or Windows 7/8](http://www.dev-metal.com/install-update-composer-windows-7-ubuntu-debian-centos/)).
-That's some kind of PHP standard now and there's no reason to work without Composer. If you think "I don't need/want
-Composer" then you are doing something seriously wrong!
-
-2. Copy this repo into a public accessible folder on your server.
-Common techniques are a) downloading and extracting the .zip / .tgz by hand, b) cloning the repo with git (into var/www)
-
-```
-git clone https://github.com/panique/php-mvc-advanced.git /var/www
-```
-
-or c) getting the repo via Composer (here we copy into var/www)
-
-```
-composer create-project panique/php-mvc-advanced /var/www dev-master
-```
-
-3. Install mod_rewrite, for example by following this guideline:
-[How to install mod_rewrite in Ubuntu](http://www.dev-metal.com/enable-mod_rewrite-ubuntu-12-04-lts/)
-
-4. Run the SQL statements in the *application/_install* folder.
-
-5. Change the .htaccess file from
-```
-RewriteBase /php-mvc-advanced/
-```
-to where you put this project, relative to the web root folder (usually /var/www). So when you put this project into
-the web root, like directly in /var/www, then the line should look like or can be commented out:
-```
-RewriteBase /
-```
-If you have put the project into a sub-folder, then put the name of the sub-folder here:
-```
-RewriteBase /sub-folder/
-```
-
-6. Edit the *application/config/config.php*, change this line
-```php
-define('URL', 'http://127.0.0.1/php-mvc-advanced/');
-```
-to where your project is. Real domain, IP or 127.0.0.1 when developing locally. Make sure you put the sub-folder
-in here (when installing in a sub-folder) too, also don't forget the trailing slash !
-
-7. Edit the *application/config/config.php*, change these lines
-```php
-define('DB_TYPE', 'mysql');
-define('DB_HOST', '127.0.0.1');
-define('DB_NAME', 'php-mvc');
-define('DB_USER', 'root');
-define('DB_PASS', 'mysql');
-```
-to your database credentials. If you don't have an empty database, create one. Only change the type `mysql` if you
-know what you are doing.
-
-8. Run `composer install` on the command line while being in the root of your project.
-
-## A quickstart tutorial
-
-You can also find these tutorial pictures in the *_tutorial* folder.
-**Note:** **These files are not up-to-date, as Twig and SASS support are not mentioned here. I'll update the tutorial
-when there's time.**
-
-![php-mvc introduction tutorial - page 1](_tutorial/tutorial-part-01.png)
-![php-mvc introduction tutorial - page 2](_tutorial/tutorial-part-02.png)
-![php-mvc introduction tutorial - page 3](_tutorial/tutorial-part-03.png)
-![php-mvc introduction tutorial - page 4](_tutorial/tutorial-part-04.png)
-![php-mvc introduction tutorial - page 5](_tutorial/tutorial-part-05.png)
-
-## You like what you see ?
-
-Then please also have a look on ...
-
-#### My other project php-login
-
-A collection of 4 similar login scripts for PHP, from a super-simple one-file
-script with a SQLite one-file to a highly professional MVC frameworks solution. All scripts use the most advanced
-hashing algorithms possible in PHP, exactly like the PHP core developers want you to use them.
-
-https://github.com/panique/php-login (full MVC framework)
-
-https://github.com/panique/php-login-minimal (minimal)
-
-https://github.com/panique/php-login-advanced (advanced)
-
-https://github.com/panique/php-login-one-file (one-file)
-
-#### My PHP and frontend blog
-
-Lots of non-boring development stuff and tutorials there.
-
-http://www.dev-metal.com
-
-## Useful information
-
-1. SQLite does not have a rowCount() method (!). Keep that in mind in case you use SQLite.
-
-2. Don't use the same name for class and method, as this might trigger an (unintended) *__construct* of the class.
- This is really weird behaviour, but documented here: [php.net - Constructors and Destructors](http://php.net/manual/en/language.oop5.decon.php).
-
-## Add external libraries via Composer
-
-To add external libraries/tools/whatever into your project in an extremely clean way, simply add a line with the
-repo name and version to the composer.json! Take a look on these tutorials if you want to get into Composer:
-[How to install (and update) Composer on Windows 7 or Ubuntu / Debian](http://www.dev-metal.com/install-update-composer-windows-7-ubuntu-debian-centos/)
-and [Getting started with Composer](http://www.dev-metal.com/getting-started-composer/).
-
-## License
-
-This project is licensed under the MIT License.
-This means you can use and modify it for free in private or commercial projects.
-
-## Contribute
-
-Please commit into the develop branch (which holds the in-development version), not into master branch
-(which holds the tested and stable version).
-
-## Support / Donate
-
-If you think this script is useful and saves you a lot of work, then think about supporting the project:
-
-1. Donate via [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=P5YLUK4MW3LDG), [GitTip](https://www.gittip.com/Panique/) or [Flattr](https://flattr.com/submit/auto?user_id=panique&url=https%3A%2F%2Fgithub.com%2Fpanique%2Fphp-mvc-advanced).
-2. Rent your next server at [A2 Hosting](http://www.a2hosting.com/4471.html) or [DigitalOcean](https://www.digitalocean.com/?refcode=40d978532a20).
-3. Contribute to this project. Feel free to improve this project with your skills.
-4. Spread the word: Tell others about this project.
-
-## Linked music tracks in the demo application
-
-The linked tracks in this naked application are just some of my personal favourites of the last few months.
-I think it's always a good idea to fill boring nerd-code stuff with quality culture.
+This will become the new home of MINI2, the advanced version of MINI (an extremely simple naked PHP application).
\ No newline at end of file
diff --git a/_tutorial/donate-with-flattr.png b/_tutorial/donate-with-flattr.png
deleted file mode 100644
index 0241629..0000000
Binary files a/_tutorial/donate-with-flattr.png and /dev/null differ
diff --git a/_tutorial/donate-with-paypal.png b/_tutorial/donate-with-paypal.png
deleted file mode 100644
index 0d61aa5..0000000
Binary files a/_tutorial/donate-with-paypal.png and /dev/null differ
diff --git a/_tutorial/tutorial-part-01.png b/_tutorial/tutorial-part-01.png
deleted file mode 100644
index 795a3ad..0000000
Binary files a/_tutorial/tutorial-part-01.png and /dev/null differ
diff --git a/_tutorial/tutorial-part-02.png b/_tutorial/tutorial-part-02.png
deleted file mode 100644
index a8c0414..0000000
Binary files a/_tutorial/tutorial-part-02.png and /dev/null differ
diff --git a/_tutorial/tutorial-part-03.png b/_tutorial/tutorial-part-03.png
deleted file mode 100644
index 03ac95e..0000000
Binary files a/_tutorial/tutorial-part-03.png and /dev/null differ
diff --git a/_tutorial/tutorial-part-04.png b/_tutorial/tutorial-part-04.png
deleted file mode 100644
index 151c0e5..0000000
Binary files a/_tutorial/tutorial-part-04.png and /dev/null differ
diff --git a/_tutorial/tutorial-part-05.png b/_tutorial/tutorial-part-05.png
deleted file mode 100644
index 64cbf50..0000000
Binary files a/_tutorial/tutorial-part-05.png and /dev/null differ
diff --git a/application/.htaccess b/application/.htaccess
deleted file mode 100644
index f68fbbe..0000000
--- a/application/.htaccess
+++ /dev/null
@@ -1,4 +0,0 @@
-
';
- // echo 'Action: ' . $this->url_action . '
';
- // echo 'Parameter 1: ' . $this->url_parameter_1 . '
';
- // echo 'Parameter 2: ' . $this->url_parameter_2 . '
';
- // echo 'Parameter 3: ' . $this->url_parameter_3 . '
';
- }
- }
-}
diff --git a/application/libs/controller.php b/application/libs/controller.php
deleted file mode 100644
index c4275ce..0000000
--- a/application/libs/controller.php
+++ /dev/null
@@ -1,63 +0,0 @@
-openDatabaseConnection();
- }
-
- /**
- * Open the database connection with the credentials from application/config/config.php
- */
- private function openDatabaseConnection()
- {
- // set the (optional) options of the PDO connection. in this case, we set the fetch mode to
- // "objects", which means all results will be objects, like this: $result->user_name !
- // For example, fetch mode FETCH_ASSOC would return results like this: $result["user_name] !
- // @see http://www.php.net/manual/en/pdostatement.fetch.php
- $options = array(PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_OBJ, PDO::ATTR_ERRMODE => PDO::ERRMODE_WARNING);
-
- // generate a database connection, using the PDO connector
- // @see http://net.tutsplus.com/tutorials/php/why-you-should-be-using-phps-pdo-for-database-access/
- $this->db = new PDO(DB_TYPE . ':host=' . DB_HOST . ';dbname=' . DB_NAME, DB_USER, DB_PASS, $options);
- }
-
- /**
- * Load the model with the given name.
- * loadModel("SongModel") would include models/songmodel.php and create the object in the controller, like this:
- * $songs_model = $this->loadModel('SongsModel');
- * Note that the model class name is written in "CamelCase", the model's filename is the same in lowercase letters
- * @param string $model_name The name of the model
- * @return object model
- */
- public function loadModel($model_name)
- {
- require 'application/models/' . strtolower($model_name) . '.php';
- // return new model (and pass the database connection to the model)
- return new $model_name($this->db);
- }
-
- public function render($view, $data_array = array())
- {
- // load Twig, the template engine
- // @see http://twig.sensiolabs.org
- $twig_loader = new Twig_Loader_Filesystem(PATH_VIEWS);
- $twig = new Twig_Environment($twig_loader);
-
- // render a view while passing the to-be-rendered data
- echo $twig->render($view . PATH_VIEW_FILE_TYPE, $data_array);
- }
-}
diff --git a/application/models/songsmodel.php b/application/models/songsmodel.php
deleted file mode 100644
index 52ebfd0..0000000
--- a/application/models/songsmodel.php
+++ /dev/null
@@ -1,63 +0,0 @@
-db = $db;
- } catch (PDOException $e) {
- exit('Database connection could not be established.');
- }
- }
-
- /**
- * Get all songs from database
- */
- public function getAllSongs()
- {
- $sql = "SELECT id, artist, track, link FROM song";
- $query = $this->db->prepare($sql);
- $query->execute();
-
- // fetchAll() is the PDO method that gets all result rows, here in object-style because we defined this in
- // libs/controller.php! If you prefer to get an associative array as the result, then do
- // $query->fetchAll(PDO::FETCH_ASSOC); or change libs/controller.php's PDO options to
- // $options = array(PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC ...
- return $query->fetchAll();
- }
-
- /**
- * Add a song to database
- * @param string $artist Artist
- * @param string $track Track
- * @param string $link Link
- */
- public function addSong($artist, $track, $link)
- {
- // clean the input from javascript code for example
- $artist = strip_tags($artist);
- $track = strip_tags($track);
- $link = strip_tags($link);
-
- $sql = "INSERT INTO song (artist, track, link) VALUES (:artist, :track, :link)";
- $query = $this->db->prepare($sql);
- $query->execute(array(':artist' => $artist, ':track' => $track, ':link' => $link));
- }
-
- /**
- * Delete a song in the database
- * Please note: this is just an example! In a real application you would not simply let everybody
- * add/update/delete stuff!
- * @param int $song_id Id of song
- */
- public function deleteSong($song_id)
- {
- $sql = "DELETE FROM song WHERE id = :song_id";
- $query = $this->db->prepare($sql);
- $query->execute(array(':song_id' => $song_id));
- }
-}
diff --git a/application/models/statsmodel.php b/application/models/statsmodel.php
deleted file mode 100644
index 2d197e2..0000000
--- a/application/models/statsmodel.php
+++ /dev/null
@@ -1,30 +0,0 @@
-db = $db;
- } catch (PDOException $e) {
- exit('Database connection could not be established.');
- }
- }
-
- /**
- * Get simple "stats". This is just a simple demo to show
- * how to use more than one model in a controller (see application/controller/songs.php for more)
- */
- public function getAmountOfSongs()
- {
- $sql = "SELECT COUNT(id) AS amount_of_songs FROM song";
- $query = $this->db->prepare($sql);
- $query->execute();
-
- // fetchAll() is the PDO method that gets all result rows
- return $query->fetch()->amount_of_songs;
- }
-}
diff --git a/application/views/_templates/base.twig b/application/views/_templates/base.twig
deleted file mode 100644
index 3c68aab..0000000
--- a/application/views/_templates/base.twig
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
In a real application this could be a normal page.
-In a real application this could be a normal page.
-In a real application this could be the homepage.
-Id | -Artist | -Track | -Link | -DELETE | -
{{ song.id }} | -{{ song.artist }} | -{{ song.track }} | -- {% if song.link %} - {{ song.link }} - {% endif %} - | -- x - | -