diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000..dbed322 --- /dev/null +++ b/.htaccess @@ -0,0 +1,49 @@ +# Disable directory browsing +Options -Indexes + +# ---------------------------------------------------------------------- +# Rewrite engine +# ---------------------------------------------------------------------- + +# Turning on the rewrite engine is necessary for the following rules and features. +# FollowSymLinks must be enabled for this to work. + + Options +FollowSymlinks + RewriteEngine On + + # If you installed CodeIgniter in a subfolder, you will need to + # change the following line to match the subfolder you need. + # http://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritebase + # RewriteBase / + + # Redirect Trailing Slashes... + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_URI} (.+)/$ + RewriteRule ^ %1 [L,R=301] + + # Rewrite "www.example.com -> example.com" + RewriteCond %{HTTPS} !=on + RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC] + RewriteRule ^ http://%1%{REQUEST_URI} [R=301,L] + + # Checks to see if the user is attempting to access a valid file, + # such as an image or css document, if this isn't true it sends the + # request to the front controller, index.php + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule ^([\s\S]*)$ index.php/$1 [L,NC,QSA] + + # Ensure Authorization header is passed along + RewriteCond %{HTTP:Authorization} . + RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}] + + + + # If we don't have mod_rewrite installed, all 404's + # can be sent to index.php, and everything works as normal. + ErrorDocument 404 index.php + + +# Disable server signature start + ServerSignature Off +# Disable server signature end diff --git a/app/Config/App.php b/app/Config/App.php index 743a61c..e41c2cb 100644 --- a/app/Config/App.php +++ b/app/Config/App.php @@ -16,7 +16,7 @@ class App extends BaseConfig * * E.g., http://example.com/ */ - public string $baseURL = 'http://localhost/the_mechanic/public'; + public string $baseURL = 'http://localhost/the_mechanic/'; /** * Allowed Hostnames in the Site URL other than the hostname in the baseURL. @@ -57,7 +57,8 @@ class App extends BaseConfig * * WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded! */ - public string $uriProtocol = 'REQUEST_URI'; + // public string $uriProtocol = 'REQUEST_URI'; + public string $uriProtocol = 'PATH_INFO'; /** * -------------------------------------------------------------------------- diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php index 18a13c8..c00da37 100644 --- a/app/Views/layout/footer.php +++ b/app/Views/layout/footer.php @@ -38,33 +38,33 @@ - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 85cd248..026aec4 100644 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -8,24 +8,24 @@ - + - - - - + + + + - - + + - - + + - +