Merge pull request panique#41 from panique/develop

Develop

Author: panique

.htaccess

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

CHANGELOG.md

@@ -1,5 +1,8 @@
 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")

application/.htaccess

@@ -1,4 +1,4 @@
 <Files *.php>
     Order Deny,Allow
     Deny from all
-</Files>
+</Files>

application/_install/01-create-database.sql

@@ -1 +1 @@
-CREATE DATABASE IF NOT EXISTS `php-mvc`;
+CREATE DATABASE IF NOT EXISTS `php-mvc`;

application/_install/02-create-table-song.sql

@@ -5,4 +5,4 @@ CREATE TABLE `php-mvc`.`song` (
   `link` text COLLATE utf8_unicode_ci,
   PRIMARY KEY (`id`),
   UNIQUE KEY `id` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

application/_install/03-insert-demo-data-into-table-song.sql

@@ -28,4 +28,4 @@ INSERT INTO `php-mvc`.`song` (`id`, `artist`, `track`, `link`) VALUES
 (27, 'Flight Facilities (ft. Christine Hoberg)', 'Clair De Lune', 'http://www.youtube.com/watch?v=Jcu1AHaTchM'),
 (28, 'Karmon', 'Turning Point (Original Mix)', 'https://www.youtube.com/watch?v=-tB-zyLSPEo'),
 (29, 'Shuttle Life', 'The Birds', 'http://www.youtube.com/watch?v=-I3m3cWDEtM'),
-(30, 'Santé', 'Homegirl (Rampa Mix)', 'http://www.youtube.com/watch?v=fnhMNOWxLYw');
+(30, 'Santé', 'Homegirl (Rampa Mix)', 'http://www.youtube.com/watch?v=fnhMNOWxLYw');

application/libs/application.php

@@ -4,7 +4,7 @@ class Application
 {
     /** @var null The controller */
     private $url_controller = null;
-    
+
     /** @var null The method (of the above controller), often also named "action" */
     private $url_action = null;
 

composer.json

@@ -19,4 +19,4 @@
     "require": {
         "php": ">=5.3.0"
     }
-}
+}

public/css/style.css

@@ -30,4 +30,4 @@ table {
 
 .bold {
     font-weight: bold;
-}
+}

public/js/application.js

@@ -7,4 +7,4 @@ $(function() {
         $('#javascript-header-demo-box').css('color', 'green');
         $('#javascript-header-demo-box').fadeIn('slow');
     }
-});
+});