Merge branch 'feature-issue79' into develop

Conflicts:
	application/libs/application.php
	application/views/_templates/header.php

.htaccess

@@ -1,20 +1,2 @@
-# 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/
-
-# General rewrite rules
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-l
-
-RewriteRule ^(.+)$ index.php?url=$1 [QSA,L]
+RewriteEngine on
+RewriteRule ^(.*) public/$1 [L]

application/controller/home.php

@@ -19,9 +19,9 @@ public function index()
         // debug message to show where you are, just for the demo
         echo 'Message from Controller: You are in the controller home, using the method index()';
         // load views. within the views we can echo out $songs and $amount_of_songs easily
-        require 'application/views/_templates/header.php';
-        require 'application/views/home/index.php';
-        require 'application/views/_templates/footer.php';
+        require APP . 'views/_templates/header.php';
+        require APP . 'views/home/index.php';
+        require APP . 'views/_templates/footer.php';
     }
 
     /**
@@ -34,9 +34,9 @@ public function exampleOne()
         // debug message to show where you are, just for the demo
         echo 'Message from Controller: You are in the controller home, using the method exampleOne()';
         // load views. within the views we can echo out $songs and $amount_of_songs easily
-        require 'application/views/_templates/header.php';
-        require 'application/views/home/example_one.php';
-        require 'application/views/_templates/footer.php';
+        require APP . 'views/_templates/header.php';
+        require APP . 'views/home/example_one.php';
+        require APP . 'views/_templates/footer.php';
     }
 
     /**
@@ -49,8 +49,8 @@ public function exampleTwo()
         // debug message to show where you are, just for the demo
         echo 'Message from Controller: You are in the controller home, using the method exampleTwo()';
         // load views. within the views we can echo out $songs and $amount_of_songs easily
-        require 'application/views/_templates/header.php';
-        require 'application/views/home/example_two.php';
-        require 'application/views/_templates/footer.php';
+        require APP . 'views/_templates/header.php';
+        require APP . 'views/home/example_two.php';
+        require APP . 'views/_templates/footer.php';
     }
 }

application/controller/songs.php

@@ -31,9 +31,9 @@ public function index()
         $amount_of_songs = $stats_model->getAmountOfSongs();
 
         // load views. within the views we can echo out $songs and $amount_of_songs easily
-        require 'application/views/_templates/header.php';
-        require 'application/views/songs/index.php';
-        require 'application/views/_templates/footer.php';
+        require APP . 'views/_templates/header.php';
+        require APP . 'views/songs/index.php';
+        require APP . 'views/_templates/footer.php';
     }
 
     /**

application/libs/controller.php

@@ -45,7 +45,7 @@ private function openDatabaseConnection()
      */
     public function loadModel($model_name)
     {
-        require 'application/models/' . strtolower($model_name) . '.php';
+        require APP . '/models/' . strtolower($model_name) . '.php';
         // return new model (and pass the database connection to the model)
         return new $model_name($this->db);
     }

public/.htaccess

@@ -0,0 +1,16 @@
+# 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
+
+# General rewrite rules
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-l
+
+RewriteRule ^(.+)$ index.php?url=$1 [QSA,L]

index.php → public/index.php

@@ -10,17 +10,19 @@
  * @license http://opensource.org/licenses/MIT MIT License
  */
 
+define('ROOT', dirname(__DIR__) . DIRECTORY_SEPARATOR);
+define('APP', ROOT . 'application' . DIRECTORY_SEPARATOR);
 // load the (optional) Composer auto-loader
-if (file_exists('vendor/autoload.php')) {
-    require 'vendor/autoload.php';
+if (file_exists(ROOT . 'vendor/autoload.php')) {
+    require ROOT . 'vendor/autoload.php';
 }
 
 // load application config (error reporting etc.)
-require 'application/config/config.php';
+require APP . '/config/config.php';
 
 // load application class
-require 'application/libs/application.php';
-require 'application/libs/controller.php';
+require APP . '/libs/application.php';
+require APP . '/libs/controller.php';
 
 // start the application
 $app = new Application();