diff --git a/.htaccess b/.htaccess index 61d6fb9..98d92e0 100644 --- a/.htaccess +++ b/.htaccess @@ -1,16 +1,11 @@ RewriteEngine On -RewriteBase /vasek/home-update/ -DirectoryIndex ./public/index.php +DirectoryIndex ./public/ RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d -RewriteCond %{REQUEST_FILENAME} !.css -RewriteCond %{REQUEST_FILENAME} !.js -RewriteRule (.*) ./public/index.php?url=$1 [QSA,L] +RewriteRule (.*) ./public/index.php?url=/$1 [QSA,L] RewriteCond %{HTTPS} off -RewriteCond %{REQUEST_FILENAME} !api.php -RewriteCond %{REQUEST_FILENAME} !apiFront.php RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] AddType application/x-httpd-php .php .phtml \ No newline at end of file diff --git a/app/templates/part/head.phtml b/app/templates/part/head.phtml index 445fcae..1555607 100644 --- a/app/templates/part/head.phtml +++ b/app/templates/part/head.phtml @@ -18,9 +18,9 @@ - - - - - - + + + + + + diff --git a/public/.htaccess b/public/.htaccess new file mode 100644 index 0000000..0668858 --- /dev/null +++ b/public/.htaccess @@ -0,0 +1,15 @@ +RewriteEngine On +DirectoryIndex ./index.php + +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d +RewriteCond %{REQUEST_FILENAME} !.css +RewriteCond %{REQUEST_FILENAME} !.js +RewriteRule (.*) ./index.php?url=$1 [QSA,L] + +RewriteCond %{HTTPS} off +RewriteCond %{REQUEST_FILENAME} !api.php +RewriteCond %{REQUEST_FILENAME} !apiFront.php +RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] + +AddType application/x-httpd-php .php .phtml \ No newline at end of file