Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
34916b2dad | ||
|
|
6fa48129f8 | ||
|
|
4b3208f824 | ||
|
|
7d0e4558ab | ||
|
|
9bbcc032c2 | ||
| c9cb10950f | |||
| 1cd18c052f | |||
| d60e335ca6 | |||
| eb7badab65 | |||
| d83d0ecdea | |||
| b8ed7a46d8 | |||
| f9e5efbffb | |||
| 7fc8cff474 | |||
| 218a0e8956 |
@@ -70,7 +70,11 @@
|
||||
"mcp__serena__find_referencing_symbols",
|
||||
"Bash(cd C:\\\\visual studio code\\\\projekty\\\\shopPRO:*)",
|
||||
"Bash(cd \"/c/visual studio code/projekty/shopPRO\" && rm -rf temp/temp_317 && powershell -ExecutionPolicy Bypass -File build-update.ps1 -FromTag v0.316 -ToTag v0.317 -ChangelogEntry \"FIX - klucz API: fix zapisu \\(brakowalo w whiteliście\\), przycisk Generuj losowy klucz, ulepszony routing API\" 2>&1)",
|
||||
"Bash(./test.ps1)"
|
||||
"Bash(./test.ps1)",
|
||||
"mcp__serena__read_memory",
|
||||
"Bash(mysql -h host117523.hostido.net.pl -u host117523_shoppro -pmhA9WCEXEnRfTtbN33hL host117523_shoppro -e \"SELECT pattern, destination FROM pp_routes WHERE destination LIKE ''%product%'' OR destination LIKE ''%category%'' LIMIT 20;\")",
|
||||
"Bash(/c/xampp/php/php.exe -r \":*)",
|
||||
"Bash(/c/xampp/php/php.exe phpunit.phar --configuration phpunit.xml)"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
205
.htaccess
205
.htaccess
@@ -7,67 +7,25 @@ Options -Indexes
|
||||
RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
|
||||
RewriteRule ^ https://%1%{REQUEST_URI} [R=301,L]
|
||||
|
||||
# Przekierowanie z http na https, jeśli nie zawiera www
|
||||
# Przekierowanie z http na https, jesli nie zawiera www
|
||||
RewriteCond %{HTTPS} off
|
||||
RewriteCond %{REQUEST_URI} !^/(tpay-status|platnosc-status|przelewy24-status)$ [NC]
|
||||
RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
|
||||
|
||||
# Usuwanie końcowego slash'a dla niekatalogów
|
||||
# Usuwanie koncowego slasha dla niekatalogów
|
||||
RewriteCond %{REQUEST_FILENAME} !-d
|
||||
RewriteCond %{REQUEST_URI} !^/admin/.*$ [NC] # Wyklucza ścieżki rozpoczynające się od "admin/"
|
||||
RewriteCond %{REQUEST_URI} !^/admin/.*$ [NC]
|
||||
RewriteCond %{REQUEST_URI} (.+)/$
|
||||
RewriteRule ^ %1 [R=301,L]
|
||||
|
||||
ErrorDocument 404 /index.php
|
||||
|
||||
RewriteCond %{REQUEST_URI} !^(.*)/libraries/(.*) [NC]
|
||||
RewriteCond %{REQUEST_URI} !^(.*)/layout/(.*) [NC]
|
||||
RewriteRule ^admin/([^/]*)/([^/]*)/(.*)$ admin/index.php?module=$1&action=$2&$3 [QSA,L]
|
||||
RewriteRule ^admin/([^/]*)/([^/]*)/(.*)$ admin/index.php?module=$1&action=$2&$3 [L]
|
||||
|
||||
RewriteRule ^admin/$ admin/index.php [L]
|
||||
|
||||
RewriteRule ^wyszukiwarka/(.*)/([0-9]*)$ index.php?module=search&action=search_results&query=$1&bs=$2 [L]
|
||||
RewriteRule ^wyszukiwarka/(.*)$ index.php?module=search&action=search_results&query=$1&bs=1 [L]
|
||||
RewriteRule ^zamowienie/([a-zA-Z0-9-]*)$ index.php?module=shop_order&action=order_details&order_hash=$1 [L]
|
||||
RewriteRule ^potwierdzenie-platnosci/([a-zA-Z0-9-]*)$ index.php?module=shop_order&action=payment_confirmation&order_hash=$1 [L]
|
||||
RewriteRule ^tpay-status$ index.php?module=shop_order&action=payment_status_tpay%{QUERY_STRING} [L]
|
||||
RewriteRule ^platnosc-status$ index.php?module=shop_order&action=payment_status_hotpay%{QUERY_STRING} [L]
|
||||
RewriteRule ^przelewy24-status$ index.php?module=shop_order&action=payment_status_przelewy24pl%{QUERY_STRING} [L]
|
||||
RewriteRule ^koszyk$ index.php?module=shop_basket&action=main_view [L]
|
||||
RewriteRule ^koszyk-podsumowanie$ index.php?module=shop_basket&action=summary_view [L]
|
||||
RewriteRule ^zloz-zamowienie$ index.php?module=shop_basket&action=basket_save [L]
|
||||
RewriteRule ^rejestracja$ index.php?module=shop_client&action=register_form [L]
|
||||
RewriteRule ^logowanie$ index.php?module=shop_client&action=login_form [L]
|
||||
RewriteRule ^wylogowanie$ index.php?module=shop_client&action=logout [L]
|
||||
RewriteRule ^odzyskiwanie-hasla$ index.php?module=shop_client&action=recover_password [L]
|
||||
RewriteRule ^panel-klienta/zamowienia$ index.php?module=shop_client&action=client_orders [L]
|
||||
RewriteRule ^panel-klienta/adresy$ index.php?module=shop_client&action=client_addresses [L]
|
||||
RewriteRule ^panel-klienta/nowy-adres$ index.php?module=shop_client&action=address_edit [L]
|
||||
RewriteRule ^panel-klienta/edytuj-adres/([0-9]*)$ index.php?module=shop_client&action=address_edit&id=$1 [L]
|
||||
RewriteRule ^panel-klienta/usun-adres/([0-9]*)$ index.php?module=shop_client&action=address_delete&id=$1 [L]
|
||||
RewriteRule ^thumb/([0-9]*)/([0-9]*)/(.*)$ /libraries/thumb.php?img=$3&w=$1&h=$2 [L]
|
||||
|
||||
RewriteCond %{REQUEST_URI} ^/shopBasket/(.*)/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)/(.*)$ index.php?module=$1&action=$2&$3 [L]
|
||||
RewriteCond %{REQUEST_URI} ^/shopClient/(.*)/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)/(.*)$ index.php?module=$1&action=$2&$3 [L]
|
||||
RewriteCond %{REQUEST_URI} ^/shopProduct/(.*)/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)/(.*)$ index.php?module=$1&action=$2&$3 [L]
|
||||
RewriteCond %{REQUEST_URI} ^/shopCoupon/(.*)/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)/(.*)$ index.php?module=$1&action=$2&$3 [L]
|
||||
RewriteCond %{REQUEST_URI} ^/search/(.*)/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)/(.*)$ index.php?module=$1&action=$2&$3 [L]
|
||||
|
||||
RewriteCond %{REQUEST_URI} ^/shopBasket/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)$ index.php?module=$1&action=$2 [L]
|
||||
RewriteCond %{REQUEST_URI} ^/shopClient/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)$ index.php?module=$1&action=$2 [L]
|
||||
RewriteCond %{REQUEST_URI} ^/shopProduct/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)$ index.php?module=$1&action=$2 [L]
|
||||
RewriteCond %{REQUEST_URI} ^/shopCoupon/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)$ index.php?module=$1&action=$2 [L]
|
||||
RewriteCond %{REQUEST_URI} ^/search/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)$ index.php?module=$1&action=$2 [L]
|
||||
|
||||
RewriteCond %{THE_REQUEST} ^[A-Z]{3,9}\ /index.php
|
||||
RewriteRule ^ /%1 [R=301,L]
|
||||
<IfModule mod_deflate.c>
|
||||
@@ -116,168 +74,17 @@ ExpiresByType image/svg+xml "access plus 1 month"
|
||||
Order Deny,Allow
|
||||
Deny from all
|
||||
</Files>
|
||||
RewriteRule ^pl/$ index.php?a=change_language&id=pl [L]
|
||||
RewriteRule ^en/$ index.php?a=change_language&id=en [L]
|
||||
RewriteRule ^newsletter/signin/$ index.php?module=newsletter&action=signin [L]
|
||||
RewriteRule ^newsletter/confirm/hash=(.*)$ index.php?module=newsletter&action=confirm&hash=$1 [L]
|
||||
RewriteRule ^newsletter/unsubscribe/hash=(.*)$ index.php?module=newsletter&action=unsubscribe&hash=$1 [L]
|
||||
RewriteRule ^producenci$ index.php?module=shop_producer&action=list&layout_id=2&%{QUERY_STRING} [L]
|
||||
RewriteRule ^producent/bibs$ index.php?module=shop_producer&action=products&producer_id=3&layout_id=2&%{QUERY_STRING} [L]
|
||||
RewriteRule ^producent/bibs/([0-9]+)$ index.php?module=shop_producer&action=products&producer_id=3&layout_id=2&bs=$1&%{QUERY_STRING} [L]
|
||||
|
||||
RewriteRule ^sen-i-otulenie$ index.php?category=10&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^sen-i-otulenie/([0-9]+)$ index.php?category=10&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^sen-i-otulenie/1$ sen-i-otulenie [R=301,L]
|
||||
RewriteRule ^kocyki-minky$ index.php?category=5&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^kocyki-minky/([0-9]+)$ index.php?category=5&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^kocyki-minky/1$ kocyki-minky [R=301,L]
|
||||
RewriteRule ^kocyki-niemowlece-minky-50x70$ index.php?category=6&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^kocyki-niemowlece-minky-50x70/([0-9]+)$ index.php?category=6&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^kocyki-niemowlece-minky-50x70/1$ kocyki-niemowlece-minky-50x70 [R=301,L]
|
||||
RewriteRule ^kocyki-sredniaka-minky-75x100$ index.php?category=7&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^kocyki-sredniaka-minky-75x100/([0-9]+)$ index.php?category=7&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^kocyki-sredniaka-minky-75x100/1$ kocyki-sredniaka-minky-75x100 [R=301,L]
|
||||
RewriteRule ^kocyki-przedszkolaka-minky-100x130$ index.php?category=8&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^kocyki-przedszkolaka-minky-100x130/([0-9]+)$ index.php?category=8&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^kocyki-przedszkolaka-minky-100x130/1$ kocyki-przedszkolaka-minky-100x130 [R=301,L]
|
||||
RewriteRule ^poduszki$ index.php?category=2&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^poduszki/([0-9]+)$ index.php?category=2&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^poduszki/1$ poduszki [R=301,L]
|
||||
RewriteRule ^poduszki-niemowlaka-minky-25x35$ index.php?category=18&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^poduszki-niemowlaka-minky-25x35/([0-9]+)$ index.php?category=18&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^poduszki-niemowlaka-minky-25x35/1$ poduszki-niemowlaka-minky-25x35 [R=301,L]
|
||||
RewriteRule ^poduszki/gwiazdki-40x40$ index.php?category=9&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^poduszki/gwiazdki-40x40/([0-9]+)$ index.php?category=9&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^poduszki/gwiazdki-40x40/1$ poduszki/gwiazdki-40x40 [R=301,L]
|
||||
RewriteRule ^rozki$ index.php?category=1&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^rozki/([0-9]+)$ index.php?category=1&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^rozki/1$ rozki [R=301,L]
|
||||
RewriteRule ^akcesoria$ index.php?category=4&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^akcesoria/([0-9]+)$ index.php?category=4&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^akcesoria/1$ akcesoria [R=301,L]
|
||||
RewriteRule ^metryczki-dzieciece$ index.php?category=11&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^metryczki-dzieciece/([0-9]+)$ index.php?category=11&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^metryczki-dzieciece/1$ metryczki-dzieciece [R=301,L]
|
||||
RewriteRule ^metryczki-ze-zdjeciem$ index.php?category=39&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^metryczki-ze-zdjeciem/([0-9]+)$ index.php?category=39&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^metryczki-ze-zdjeciem/1$ metryczki-ze-zdjeciem [R=301,L]
|
||||
RewriteRule ^metryczki-dla-dziewczynki$ index.php?category=40&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^metryczki-dla-dziewczynki/([0-9]+)$ index.php?category=40&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^metryczki-dla-dziewczynki/1$ metryczki-dla-dziewczynki [R=301,L]
|
||||
RewriteRule ^metryczki-dla-chlopca$ index.php?category=41&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^metryczki-dla-chlopca/([0-9]+)$ index.php?category=41&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^metryczki-dla-chlopca/1$ metryczki-dla-chlopca [R=301,L]
|
||||
RewriteRule ^termofory-dla-dzieci$ index.php?category=17&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^termofory-dla-dzieci/([0-9]+)$ index.php?category=17&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^termofory-dla-dzieci/1$ termofory-dla-dzieci [R=301,L]
|
||||
RewriteRule ^zawieszki$ index.php?category=43&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^zawieszki/([0-9]+)$ index.php?category=43&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^zawieszki/1$ zawieszki [R=301,L]
|
||||
RewriteRule ^zawieszki-dekoracyjne$ index.php?category=32&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^zawieszki-dekoracyjne/([0-9]+)$ index.php?category=32&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^zawieszki-dekoracyjne/1$ zawieszki-dekoracyjne [R=301,L]
|
||||
RewriteRule ^zawieszki-do-smoczkow-i-gryzakow$ index.php?category=44&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^zawieszki-do-smoczkow-i-gryzakow/([0-9]+)$ index.php?category=44&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^zawieszki-do-smoczkow-i-gryzakow/1$ zawieszki-do-smoczkow-i-gryzakow [R=301,L]
|
||||
RewriteRule ^zawieszki-do-wozka$ index.php?category=45&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^zawieszki-do-wozka/([0-9]+)$ index.php?category=45&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^zawieszki-do-wozka/1$ zawieszki-do-wozka [R=301,L]
|
||||
RewriteRule ^odziez-dziecieca$ index.php?category=12&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^odziez-dziecieca/([0-9]+)$ index.php?category=12&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^odziez-dziecieca/1$ odziez-dziecieca [R=301,L]
|
||||
RewriteRule ^apaszki$ index.php?category=35&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^apaszki/([0-9]+)$ index.php?category=35&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^apaszki/1$ apaszki [R=301,L]
|
||||
RewriteRule ^kominy-dzieciece$ index.php?category=15&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^kominy-dzieciece/([0-9]+)$ index.php?category=15&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^kominy-dzieciece/1$ kominy-dzieciece [R=301,L]
|
||||
RewriteRule ^opaski$ index.php?category=37&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^opaski/([0-9]+)$ index.php?category=37&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^opaski/1$ opaski [R=301,L]
|
||||
RewriteRule ^opaski-pin-up$ index.php?category=38&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^opaski-pin-up/([0-9]+)$ index.php?category=38&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^opaski-pin-up/1$ opaski-pin-up [R=301,L]
|
||||
RewriteRule ^turbany$ index.php?category=14&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^turbany/([0-9]+)$ index.php?category=14&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^turbany/1$ turbany [R=301,L]
|
||||
RewriteRule ^ubrania-dla-dziewczynek$ index.php?category=13&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^ubrania-dla-dziewczynek/([0-9]+)$ index.php?category=13&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^ubrania-dla-dziewczynek/1$ ubrania-dla-dziewczynek [R=301,L]
|
||||
RewriteRule ^zestawy-i-kolekcje$ index.php?category=16&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^zestawy-i-kolekcje/([0-9]+)$ index.php?category=16&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^zestawy-i-kolekcje/1$ zestawy-i-kolekcje [R=301,L]
|
||||
RewriteRule ^zestawy$ index.php?category=20&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^zestawy/([0-9]+)$ index.php?category=20&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^zestawy/1$ zestawy [R=301,L]
|
||||
RewriteRule ^komplet-niemowlaka$ index.php?category=24&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^komplet-niemowlaka/([0-9]+)$ index.php?category=24&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^komplet-niemowlaka/1$ komplet-niemowlaka [R=301,L]
|
||||
RewriteRule ^komplet-sredniaka$ index.php?category=28&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^komplet-sredniaka/([0-9]+)$ index.php?category=28&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^komplet-sredniaka/1$ komplet-sredniaka [R=301,L]
|
||||
RewriteRule ^kolekcje$ index.php?category=29&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^kolekcje/([0-9]+)$ index.php?category=29&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^kolekcje/1$ kolekcje [R=301,L]
|
||||
RewriteRule ^mama-bear-chmurki-mietowe$ index.php?category=36&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^mama-bear-chmurki-mietowe/([0-9]+)$ index.php?category=36&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^mama-bear-chmurki-mietowe/1$ mama-bear-chmurki-mietowe [R=301,L]
|
||||
RewriteRule ^koniki-na-biegunach$ index.php?category=31&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^koniki-na-biegunach/([0-9]+)$ index.php?category=31&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^koniki-na-biegunach/1$ koniki-na-biegunach [R=301,L]
|
||||
RewriteRule ^kroliki-na-hustawkach$ index.php?category=30&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^kroliki-na-hustawkach/([0-9]+)$ index.php?category=30&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^kroliki-na-hustawkach/1$ kroliki-na-hustawkach [R=301,L]
|
||||
RewriteRule ^wyprzedaz$ index.php?category=27&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^wyprzedaz/([0-9]+)$ index.php?category=27&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^wyprzedaz/1$ wyprzedaz [R=301,L]
|
||||
RewriteRule ^en/kocyk-minky-niemowlaka-50x70-en$ index.php?category=6&lang=en&%{QUERY_STRING} [L]
|
||||
RewriteRule ^en/kocyk-minky-niemowlaka-50x70-en/([0-9]+)$ index.php?category=6&lang=en&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^en/kocyk-minky-niemowlaka-50x70-en/1$ en/kocyk-minky-niemowlaka-50x70-en [R=301,L]
|
||||
RewriteCond %{REQUEST_URI} ^/home$
|
||||
RewriteRule ^(.*)$ http://www.shoppro.project-dc.pl/ [R=permanent,L]
|
||||
RewriteCond %{REQUEST_URI} ^/home-1$
|
||||
RewriteRule ^(.*)$ http://www.shoppro.project-dc.pl/ [R=permanent,L]
|
||||
RewriteRule ^$ index.php?a=page&id=6&lang=pl [L]
|
||||
RewriteRule ^home$ index.php?a=page&id=6&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^home/([0-9]+)$ index.php?a=page&id=6&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^home/1$ home [R=301,L]
|
||||
RewriteRule ^regulamin$ index.php?a=page&id=12&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^regulamin/([0-9]+)$ index.php?a=page&id=12&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^regulamin/1$ regulamin [R=301,L]
|
||||
RewriteRule ^formy-platnosci$ index.php?a=page&id=13&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^formy-platnosci/([0-9]+)$ index.php?a=page&id=13&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^formy-platnosci/1$ formy-platnosci [R=301,L]
|
||||
RewriteRule ^koszty-dostawy$ index.php?a=page&id=14&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^koszty-dostawy/([0-9]+)$ index.php?a=page&id=14&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^koszty-dostawy/1$ koszty-dostawy [R=301,L]
|
||||
RewriteRule ^zwroty-i-reklamacje$ index.php?a=page&id=15&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^zwroty-i-reklamacje/([0-9]+)$ index.php?a=page&id=15&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^zwroty-i-reklamacje/1$ zwroty-i-reklamacje [R=301,L]
|
||||
RewriteRule ^o-nas$ index.php?a=page&id=4&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^o-nas/([0-9]+)$ index.php?a=page&id=4&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^o-nas/1$ o-nas [R=301,L]
|
||||
RewriteRule ^blog$ index.php?a=page&id=9&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^blog/([0-9]+)$ index.php?a=page&id=9&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^blog/1$ blog [R=301,L]
|
||||
RewriteRule ^kontakt$ index.php?a=page&id=5&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^kontakt/([0-9]+)$ index.php?a=page&id=5&lang=pl&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^kontakt/1$ kontakt [R=301,L]
|
||||
RewriteRule ^kolka-u-niemowlat-przyczyny-objawy-leczenie$ index.php?article=11&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^spacery-z-niemowlakiem-jak-sie-do-nich-przygotowac$ index.php?article=12&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^jak-wybrac-kocyk-i-poduszke-niemowlaka$ index.php?article=10&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteRule ^jak-wzmocnic-odpornosc-dziecka-w-trakcie-zimy-sprawdzone-sposoby-na-odpornosc$ index.php?article=13&lang=pl&%{QUERY_STRING} [L]
|
||||
RewriteCond %{REQUEST_URI} ^/home-en$
|
||||
RewriteRule ^(.*)$ http://www.shoppro.project-dc.pl/en/ [R=permanent,L]
|
||||
RewriteCond %{REQUEST_URI} ^/home-en-1$
|
||||
RewriteRule ^(.*)$ http://www.shoppro.project-dc.pl/en/ [R=permanent,L]
|
||||
RewriteRule ^$ index.php?a=page&id=6&lang=en [L]
|
||||
RewriteRule ^en/home-en$ index.php?a=page&id=6&lang=en&%{QUERY_STRING} [L]
|
||||
RewriteRule ^en/home-en/([0-9]+)$ index.php?a=page&id=6&lang=en&bs=$1&%{QUERY_STRING} [L]
|
||||
RewriteRule ^en/home-en/1$ en/home-en [R=301,L]
|
||||
RewriteRule ^en/tytul-en$ index.php?article=13&lang=en&%{QUERY_STRING} [L]
|
||||
RewriteCond %{REQUEST_FILENAME} !-f
|
||||
RewriteCond %{REQUEST_FILENAME} !-d
|
||||
RewriteRule ^ index.php [L]
|
||||
# <FilesMatch "\.(php4|php5|php3|php2|php|phtml)$">
|
||||
# SetHandler application/x-lsphp83 /opt/alt/php83 usr/bin/lsphp
|
||||
# </FilesMatch>
|
||||
RewriteRule ^ index.php [L]
|
||||
File diff suppressed because one or more lines are too long
@@ -102,7 +102,6 @@ Custom autoloader in each entry point (not Composer autoload at runtime). Tries
|
||||
- `\Domain\` → `autoload/Domain/` (uppercase D)
|
||||
- `\admin\Controllers\` → `autoload/admin/Controllers/` (lowercase a)
|
||||
- `\Shared\` → `autoload/Shared/`
|
||||
- `\front\` → `autoload/front/`
|
||||
- `\api\` → `autoload/api/`
|
||||
- Do NOT use `\Admin\` (uppercase A) — the server directory is `admin/` (lowercase)
|
||||
- `\shop\` namespace is **deleted** — all 12 legacy classes migrated to `\Domain\`, `autoload/shop/` directory removed
|
||||
@@ -211,6 +210,8 @@ When user says **"KONIEC PRACY"**, execute in order:
|
||||
3. SQL migrations (if DB changes): place in `migrations/{version}.sql` (e.g. `migrations/0.304.sql`). **NOT** in `updates/` — build script reads from `migrations/` automatically
|
||||
4. Commit
|
||||
5. Push
|
||||
6. Build update package: `git tag v0.XXX && powershell.exe -ExecutionPolicy Bypass -File build-update.ps1 -FromTag v0.PREV -ToTag v0.XXX -ChangelogEntry "opis"` — skrypt automatycznie aktualizuje `versions.php`
|
||||
7. Commit i push plików paczki (`updates/0.30/ver_0.XXX.zip`, `ver_0.XXX_manifest.json`, `updates/versions.php`, `updates/changelog-data.html`)
|
||||
|
||||
Before starting implementation, review current state of docs (see AGENTS.md for full list).
|
||||
|
||||
@@ -224,4 +225,6 @@ Before starting implementation, review current state of docs (see AGENTS.md for
|
||||
- `docs/API.md` — REST API documentation (ordersPRO)
|
||||
- `docs/UPDATE_INSTRUCTIONS.md` — how to build client update packages
|
||||
|
||||
## Za każdym razem jak próbujesz sprawdzić jakiś plik z logami spróbuj go najpierw pobrać z serwera FTP
|
||||
## Za każdym razem jak próbujesz sprawdzić jakiś plik z logami spróbuj go najpierw pobrać z serwera FTP
|
||||
|
||||
## Wszystkie pliki które tworzysz jako pomocnicze, np build_0330.ps1 czy build-update.ps1 twórz w folderze temp
|
||||
@@ -1,3 +1,30 @@
|
||||
<style type="text/css">
|
||||
.attr-copy-btn {
|
||||
display: inline-block;
|
||||
padding: 1px 5px;
|
||||
font-size: 11px;
|
||||
line-height: 1.5;
|
||||
background: transparent;
|
||||
border: 1px solid #d0d0d0;
|
||||
border-radius: 3px;
|
||||
color: #999;
|
||||
cursor: pointer;
|
||||
vertical-align: middle;
|
||||
margin-left: 4px;
|
||||
transition: background .12s, color .12s, border-color .12s;
|
||||
}
|
||||
.attr-copy-btn:hover {
|
||||
background: #f4f4f4;
|
||||
border-color: #aaa;
|
||||
color: #555;
|
||||
}
|
||||
.attr-copy-btn--copied {
|
||||
background: #d4edda !important;
|
||||
border-color: #28a745 !important;
|
||||
color: #28a745 !important;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script type="text/javascript">
|
||||
(function() {
|
||||
var orderId = <?= (int)($this->order_id ?? 0);?>;
|
||||
@@ -378,6 +405,68 @@
|
||||
});
|
||||
}
|
||||
|
||||
$(function() {
|
||||
function fallbackCopy(text) {
|
||||
var $tmp = $('<textarea>').css({position: 'fixed', top: 0, left: 0, opacity: 0}).val(text);
|
||||
$('body').append($tmp);
|
||||
$tmp[0].select();
|
||||
try { document.execCommand('copy'); } catch (e) {}
|
||||
$tmp.remove();
|
||||
}
|
||||
|
||||
$('.atributes').each(function() {
|
||||
var $div = $(this);
|
||||
var html = $.trim($div.html());
|
||||
if (!html) { return; }
|
||||
|
||||
var parts = html.split(/<br\s*\/?>/i);
|
||||
var newParts = [];
|
||||
|
||||
for (var i = 0; i < parts.length; i++) {
|
||||
var part = $.trim(parts[i]);
|
||||
if (!part) { continue; }
|
||||
|
||||
var match = part.match(/^(<b>[^<]*<\/b>\s*:\s*)(.+)$/);
|
||||
if (match) {
|
||||
var labelHtml = match[1];
|
||||
var value = $.trim(match[2]);
|
||||
var escapedValue = $('<div>').text(value).html();
|
||||
part = labelHtml + escapedValue
|
||||
+ ' <button type="button" class="js-attr-copy-btn attr-copy-btn" data-value="'
|
||||
+ escapedValue + '" title="Kopiuj: ' + escapedValue + '">'
|
||||
+ '<i class="fa fa-copy"></i></button>';
|
||||
}
|
||||
newParts.push(part);
|
||||
}
|
||||
|
||||
$div.html(newParts.join('<br>'));
|
||||
});
|
||||
|
||||
$(document).on('click', '.js-attr-copy-btn', function() {
|
||||
var $btn = $(this);
|
||||
var value = String($btn.data('value'));
|
||||
|
||||
function showCopied() {
|
||||
$btn.addClass('attr-copy-btn--copied');
|
||||
$btn.find('i').removeClass('fa-copy').addClass('fa-check');
|
||||
setTimeout(function() {
|
||||
$btn.removeClass('attr-copy-btn--copied');
|
||||
$btn.find('i').removeClass('fa-check').addClass('fa-copy');
|
||||
}, 1500);
|
||||
}
|
||||
|
||||
if (navigator.clipboard && navigator.clipboard.writeText) {
|
||||
navigator.clipboard.writeText(value).then(showCopied, function() {
|
||||
fallbackCopy(value);
|
||||
showCopied();
|
||||
});
|
||||
} else {
|
||||
fallbackCopy(value);
|
||||
showCopied();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
$('body').on('click', '.btn-toggle-trustmate', function(e) {
|
||||
e.preventDefault();
|
||||
|
||||
|
||||
BIN
autoload/.DS_Store
vendored
BIN
autoload/.DS_Store
vendored
Binary file not shown.
@@ -360,6 +360,9 @@ class ArticleRepository
|
||||
public function archive(int $articleId): bool
|
||||
{
|
||||
$result = $this->db->update('pp_articles', ['status' => -1], ['id' => $articleId]);
|
||||
if ($result) {
|
||||
$this->db->delete('pp_routes', ['article_id' => $articleId]);
|
||||
}
|
||||
return (bool)$result;
|
||||
}
|
||||
|
||||
@@ -381,6 +384,7 @@ class ArticleRepository
|
||||
$this->db->delete('pp_articles_langs', ['article_id' => $articleId]);
|
||||
$this->db->delete('pp_articles_images', ['article_id' => $articleId]);
|
||||
$this->db->delete('pp_articles_files', ['article_id' => $articleId]);
|
||||
$this->db->delete('pp_routes', ['article_id' => $articleId]);
|
||||
$this->db->delete('pp_articles', ['id' => $articleId]);
|
||||
|
||||
\Shared\Helpers\Helpers::delete_dir('../upload/article_images/article_' . $articleId . '/');
|
||||
|
||||
@@ -174,6 +174,7 @@ class CategoryRepository
|
||||
|
||||
$deleted = (bool)$this->db->delete('pp_shop_categories', ['id' => $id]);
|
||||
if ($deleted) {
|
||||
$this->db->delete('pp_routes', ['category_id' => $id]);
|
||||
$this->refreshCategoryArtifacts();
|
||||
}
|
||||
|
||||
|
||||
@@ -296,7 +296,7 @@ class LayoutsRepository
|
||||
if (is_array($layoutRows) && isset($layoutRows[0])) {
|
||||
$layout = $layoutRows[0];
|
||||
} else {
|
||||
$layout = $this->db->get('pp_layouts', '*', ['categories_default' => 1]);
|
||||
$layout = $this->db->get('pp_layouts', '*', ['status' => 1]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -134,7 +134,11 @@ class PagesRepository
|
||||
return false;
|
||||
}
|
||||
|
||||
return (bool)$this->db->delete('pp_pages', ['id' => $pageId]);
|
||||
$deleted = (bool)$this->db->delete('pp_pages', ['id' => $pageId]);
|
||||
if ($deleted) {
|
||||
$this->db->delete('pp_routes', ['page_id' => $pageId]);
|
||||
}
|
||||
return $deleted;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -654,6 +654,10 @@ class ProductRepository
|
||||
'custom_label_2' => $product['custom_label_2'],
|
||||
'custom_label_3' => $product['custom_label_3'],
|
||||
'custom_label_4' => $product['custom_label_4'],
|
||||
'new_to_date' => $product['new_to_date'],
|
||||
'additional_message' => (int)($product['additional_message'] ?? 0),
|
||||
'additional_message_required' => (int)($product['additional_message_required'] ?? 0),
|
||||
'additional_message_text' => $product['additional_message_text'],
|
||||
'set_id' => $product['set_id'] !== null ? (int)$product['set_id'] : null,
|
||||
'product_unit_id' => $product['product_unit_id'] !== null ? (int)$product['product_unit_id'] : null,
|
||||
'producer_id' => $product['producer_id'] !== null ? (int)$product['producer_id'] : null,
|
||||
|
||||
@@ -425,42 +425,206 @@ class Helpers
|
||||
$site_map .= '<priority>1</priority>' . PHP_EOL;
|
||||
$site_map .= '</url>' . PHP_EOL;
|
||||
|
||||
$htaccess_data = file_get_contents( $dir . 'libraries/htaccess.conf' );
|
||||
$htaccess_data = str_replace( '{PAGE}', $url, $htaccess_data );
|
||||
//
|
||||
// SYSTEM ROUTES — delete all and reinsert
|
||||
//
|
||||
$mdb->delete( 'pp_routes', [ 'type' => 'system' ] );
|
||||
|
||||
$results = $mdb -> select( 'pp_langs', [ 'id' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
|
||||
// Static system routes (hardcoded, never change)
|
||||
$systemRoutes = [
|
||||
// Wyszukiwarka
|
||||
[ 'pattern' => '^wyszukiwarka/([^/]+)/([0-9]+)$', 'destination' => 'index.php?module=search&action=search_results&query=$1&bs=$2' ],
|
||||
[ 'pattern' => '^wyszukiwarka/([^/]+)$', 'destination' => 'index.php?module=search&action=search_results&query=$1&bs=1' ],
|
||||
// Zamowienia
|
||||
[ 'pattern' => '^zamowienie/([a-zA-Z0-9-]+)$', 'destination' => 'index.php?module=shop_order&action=order_details&order_hash=$1' ],
|
||||
[ 'pattern' => '^potwierdzenie-platnosci/([a-zA-Z0-9-]+)$', 'destination' => 'index.php?module=shop_order&action=payment_confirmation&order_hash=$1' ],
|
||||
// Platnosci
|
||||
[ 'pattern' => '^tpay-status$', 'destination' => 'index.php?module=shop_order&action=payment_status_tpay' ],
|
||||
[ 'pattern' => '^platnosc-status$', 'destination' => 'index.php?module=shop_order&action=payment_status_hotpay' ],
|
||||
[ 'pattern' => '^przelewy24-status$', 'destination' => 'index.php?module=shop_order&action=payment_status_przelewy24pl' ],
|
||||
// Koszyk
|
||||
[ 'pattern' => '^koszyk$', 'destination' => 'index.php?module=shop_basket&action=main_view' ],
|
||||
[ 'pattern' => '^koszyk-podsumowanie$', 'destination' => 'index.php?module=shop_basket&action=summary_view' ],
|
||||
[ 'pattern' => '^zloz-zamowienie$', 'destination' => 'index.php?module=shop_basket&action=basket_save' ],
|
||||
// Klient
|
||||
[ 'pattern' => '^rejestracja$', 'destination' => 'index.php?module=shop_client&action=register_form' ],
|
||||
[ 'pattern' => '^logowanie$', 'destination' => 'index.php?module=shop_client&action=login_form' ],
|
||||
[ 'pattern' => '^wylogowanie$', 'destination' => 'index.php?module=shop_client&action=logout' ],
|
||||
[ 'pattern' => '^odzyskiwanie-hasla$', 'destination' => 'index.php?module=shop_client&action=recover_password' ],
|
||||
[ 'pattern' => '^panel-klienta/zamowienia$', 'destination' => 'index.php?module=shop_client&action=client_orders' ],
|
||||
[ 'pattern' => '^panel-klienta/adresy$', 'destination' => 'index.php?module=shop_client&action=client_addresses' ],
|
||||
[ 'pattern' => '^panel-klienta/nowy-adres$', 'destination' => 'index.php?module=shop_client&action=address_edit' ],
|
||||
[ 'pattern' => '^panel-klienta/edytuj-adres/([0-9]+)$', 'destination' => 'index.php?module=shop_client&action=address_edit&id=$1' ],
|
||||
[ 'pattern' => '^panel-klienta/usun-adres/([0-9]+)$', 'destination' => 'index.php?module=shop_client&action=address_delete&id=$1' ],
|
||||
// Newsletter
|
||||
[ 'pattern' => '^newsletter/signin$', 'destination' => 'index.php?module=newsletter&action=signin' ],
|
||||
[ 'pattern' => '^newsletter/confirm/hash=(.+)$', 'destination' => 'index.php?module=newsletter&action=confirm&hash=$1' ],
|
||||
[ 'pattern' => '^newsletter/unsubscribe/hash=(.+)$', 'destination' => 'index.php?module=newsletter&action=unsubscribe&hash=$1' ],
|
||||
// Moduły AJAX (shopBasket, shopClient, shopProduct, shopCoupon, search)
|
||||
[ 'pattern' => '^shopBasket/([^/]+)/(.+)$', 'destination' => 'index.php?module=shopBasket&action=$1&$2' ],
|
||||
[ 'pattern' => '^shopBasket/([^/]+)$', 'destination' => 'index.php?module=shopBasket&action=$1' ],
|
||||
[ 'pattern' => '^shopClient/([^/]+)/(.+)$', 'destination' => 'index.php?module=shopClient&action=$1&$2' ],
|
||||
[ 'pattern' => '^shopClient/([^/]+)$', 'destination' => 'index.php?module=shopClient&action=$1' ],
|
||||
[ 'pattern' => '^shopProduct/([^/]+)/(.+)$', 'destination' => 'index.php?module=shopProduct&action=$1&$2' ],
|
||||
[ 'pattern' => '^shopProduct/([^/]+)$', 'destination' => 'index.php?module=shopProduct&action=$1' ],
|
||||
[ 'pattern' => '^shopCoupon/([^/]+)/(.+)$', 'destination' => 'index.php?module=shopCoupon&action=$1&$2' ],
|
||||
[ 'pattern' => '^shopCoupon/([^/]+)$', 'destination' => 'index.php?module=shopCoupon&action=$1' ],
|
||||
[ 'pattern' => '^search/([^/]+)/(.+)$', 'destination' => 'index.php?module=search&action=$1&$2' ],
|
||||
[ 'pattern' => '^search/([^/]+)$', 'destination' => 'index.php?module=search&action=$1' ],
|
||||
];
|
||||
|
||||
foreach ( $systemRoutes as $route )
|
||||
{
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'type' => 'system',
|
||||
'lang_id' => 0,
|
||||
'pattern' => $route['pattern'],
|
||||
'destination' => $route['destination'],
|
||||
] );
|
||||
}
|
||||
|
||||
// Dynamic system routes — languages
|
||||
$results = $mdb->select( 'pp_langs', [ 'id' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
|
||||
if ( is_array( $results ) ) foreach ( $results as $row )
|
||||
{
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^' . $row['id'] . '/$ index.php?a=change_language&id=' . $row['id'] . ' [L]';
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'type' => 'system',
|
||||
'lang_id' => 0,
|
||||
'pattern' => '^' . $row['id'] . '$',
|
||||
'destination' => 'index.php?a=change_language&id=' . $row['id'],
|
||||
] );
|
||||
}
|
||||
|
||||
//
|
||||
// INNE
|
||||
//
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^newsletter/signin/$ index.php?module=newsletter&action=signin [L]' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^newsletter/confirm/hash=(.*)$ index.php?module=newsletter&action=confirm&hash=$1 [L]' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^newsletter/unsubscribe/hash=(.*)$ index.php?module=newsletter&action=unsubscribe&hash=$1 [L]' . PHP_EOL;
|
||||
|
||||
//
|
||||
// PRODUCENCI
|
||||
//
|
||||
// Dynamic system routes — producenci
|
||||
$categoryDefaultLayoutId = ( new \Domain\Layouts\LayoutsRepository( $mdb ) )->categoryDefaultLayoutId();
|
||||
$htaccess_data .= 'RewriteRule ^producenci$ index.php?module=shop_producer&action=list&layout_id=' . $categoryDefaultLayoutId . '&%{QUERY_STRING} [L]' . PHP_EOL;
|
||||
|
||||
$rows = $mdb -> select( 'pp_shop_producer', '*', [ 'status' => 1 ] );
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'type' => 'system',
|
||||
'lang_id' => 0,
|
||||
'pattern' => '^producenci$',
|
||||
'destination' => 'index.php?module=shop_producer&action=list&layout_id=' . $categoryDefaultLayoutId,
|
||||
] );
|
||||
|
||||
$rows = $mdb->select( 'pp_shop_producer', '*', [ 'status' => 1 ] );
|
||||
if ( self::is_array_fix( $rows ) ) foreach ( $rows as $row )
|
||||
{
|
||||
$htaccess_data .= 'RewriteRule ^producent/' . self::seo( $row['name'] ) . '$ index.php?module=shop_producer&action=products&producer_id=' . $row['id'] . '&layout_id=' . $categoryDefaultLayoutId . '&%{QUERY_STRING} [L]' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^producent/' . self::seo( $row['name'] ) . '/([0-9]+)$ index.php?module=shop_producer&action=products&producer_id=' . $row['id'] . '&layout_id=' . $categoryDefaultLayoutId . '&bs=$1&%{QUERY_STRING} [L]' . PHP_EOL;
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'type' => 'system',
|
||||
'lang_id' => 0,
|
||||
'pattern' => '^producent/' . self::seo( $row['name'] ) . '$',
|
||||
'destination' => 'index.php?module=shop_producer&action=products&producer_id=' . $row['id'] . '&layout_id=' . $categoryDefaultLayoutId,
|
||||
] );
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'type' => 'system',
|
||||
'lang_id' => 0,
|
||||
'pattern' => '^producent/' . self::seo( $row['name'] ) . '/([0-9]+)$',
|
||||
'destination' => 'index.php?module=shop_producer&action=products&producer_id=' . $row['id'] . '&layout_id=' . $categoryDefaultLayoutId . '&bs=$1',
|
||||
] );
|
||||
}
|
||||
|
||||
$results = $mdb -> select( 'pp_langs', [ 'id', 'start' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
|
||||
//
|
||||
// HTACCESS — generuj z PHP (bez szablonu htaccess.conf)
|
||||
//
|
||||
$htaccess_data = 'RewriteEngine On' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteBase /' . PHP_EOL;
|
||||
$htaccess_data .= 'Options +FollowSymlinks' . PHP_EOL;
|
||||
$htaccess_data .= 'Options -Indexes' . PHP_EOL;
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= '# Przekierowanie z www na bez www i z http na https w jednym kroku' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^ https://%1%{REQUEST_URI} [R=301,L]' . PHP_EOL;
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= '# Przekierowanie z http na https, jesli nie zawiera www' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{HTTPS} off' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{REQUEST_URI} !^/(tpay-status|platnosc-status|przelewy24-status)$ [NC]' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]' . PHP_EOL;
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= '# Usuwanie koncowego slasha dla niekatalogów' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{REQUEST_FILENAME} !-d' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{REQUEST_URI} !^/admin/.*$ [NC]' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{REQUEST_URI} (.+)/$' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^ %1 [R=301,L]' . PHP_EOL;
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{REQUEST_URI} !^(.*)/libraries/(.*) [NC]' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{REQUEST_URI} !^(.*)/layout/(.*) [NC]' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^admin/([^/]*)/([^/]*)/(.*)$ admin/index.php?module=$1&action=$2&$3 [L]' . PHP_EOL;
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^admin/$ admin/index.php [L]' . PHP_EOL;
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^thumb/([0-9]*)/([0-9]*)/(.*)$ /libraries/thumb.php?img=$3&w=$1&h=$2 [L]' . PHP_EOL;
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{THE_REQUEST} ^[A-Z]{3,9}\ /index.php' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^ /%1 [R=301,L]' . PHP_EOL;
|
||||
|
||||
/* cache block */
|
||||
if ( $settings['htaccess_cache'] )
|
||||
{
|
||||
$htaccess_data .= '<IfModule mod_deflate.c>' . PHP_EOL
|
||||
. 'AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml application/xhtml+xml text/css text/javascript application/javascript application/x-javascript' . PHP_EOL
|
||||
. '</IfModule>' . PHP_EOL
|
||||
. '<IfModule mod_headers.c>' . PHP_EOL
|
||||
. 'Header set Access-Control-Allow-Origin "*"' . PHP_EOL
|
||||
. '</IfModule>' . PHP_EOL
|
||||
. '<IfModule mod_expires.c>' . PHP_EOL
|
||||
. 'ExpiresActive on' . PHP_EOL
|
||||
. 'ExpiresDefault "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType text/css "access plus 1 year"' . PHP_EOL
|
||||
. 'ExpiresByType application/json "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType application/xml "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType text/xml "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType image/x-icon "access plus 1 week"' . PHP_EOL
|
||||
. 'ExpiresByType text/x-component "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType text/html "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType application/javascript "access plus 1 year"' . PHP_EOL
|
||||
. 'ExpiresByType application/x-web-app-manifest+json "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType text/cache-manifest "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType audio/ogg "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType image/gif "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType image/jpeg "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType image/png "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType video/mp4 "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType video/ogg "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType video/webm "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType application/atom+xml "access plus 1 hour"' . PHP_EOL
|
||||
. 'ExpiresByType application/rss+xml "access plus 1 hour"' . PHP_EOL
|
||||
. 'ExpiresByType application/font-woff "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType application/vnd.ms-fontobject "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType application/x-font-ttf "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType font/opentype "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType image/svg+xml "access plus 1 month"' . PHP_EOL
|
||||
. '</IfModule>' . PHP_EOL;
|
||||
}
|
||||
else
|
||||
{
|
||||
$htaccess_data .= '<IfModule mod_headers.c>' . PHP_EOL
|
||||
. 'Header set Cache-Control "no-cache, no-store, must-revalidate"' . PHP_EOL
|
||||
. 'Header set Pragma "no-cache"' . PHP_EOL
|
||||
. 'Header set Expires 0' . PHP_EOL
|
||||
. '</IfModule>' . PHP_EOL;
|
||||
}
|
||||
|
||||
$htaccess_data .= '<Files *.conf>' . PHP_EOL;
|
||||
$htaccess_data .= ' Order Deny,Allow' . PHP_EOL;
|
||||
$htaccess_data .= ' Deny from all' . PHP_EOL;
|
||||
$htaccess_data .= '</Files>' . PHP_EOL;
|
||||
$htaccess_data .= '<Files *.log>' . PHP_EOL;
|
||||
$htaccess_data .= ' Order Deny,Allow' . PHP_EOL;
|
||||
$htaccess_data .= ' Deny from all' . PHP_EOL;
|
||||
$htaccess_data .= '</Files>' . PHP_EOL;
|
||||
$htaccess_data .= '<Files *.ini>' . PHP_EOL;
|
||||
$htaccess_data .= ' Order Deny,Allow' . PHP_EOL;
|
||||
$htaccess_data .= ' Deny from all' . PHP_EOL;
|
||||
$htaccess_data .= '</Files>' . PHP_EOL;
|
||||
|
||||
//
|
||||
// KATEGORIE — sitemap + pp_routes (bez zmian)
|
||||
//
|
||||
$results = $mdb->select( 'pp_langs', [ 'id', 'start' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
|
||||
if ( is_array( $results ) ) foreach ( $results as $row )
|
||||
{
|
||||
!$row['start'] ? $language_link = $row['id'] . '/' : $language_link = '';
|
||||
|
||||
$results2 = $mdb -> select( 'pp_shop_categories_langs', [ '[><]pp_shop_categories' => [ 'category_id' => 'id' ] ], [ 'seo_link', 'title', 'category_id' ], [ 'lang_id' => $row['id'], 'ORDER' => [ 'o' => 'ASC' ] ] );
|
||||
$results2 = $mdb->select( 'pp_shop_categories_langs', [ '[><]pp_shop_categories' => [ 'category_id' => 'id' ] ], [ 'seo_link', 'title', 'category_id' ], [ 'lang_id' => $row['id'], 'ORDER' => [ 'o' => 'ASC' ] ] );
|
||||
if ( is_array( $results2 ) ) foreach ( $results2 as $row2 )
|
||||
{
|
||||
if ( $row2['title'] )
|
||||
@@ -475,35 +639,42 @@ class Helpers
|
||||
$site_map .= '<priority>1</priority>' . PHP_EOL;
|
||||
$site_map .= '</url>' . PHP_EOL;
|
||||
|
||||
if ( $row2['seo_link'] )
|
||||
{
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '/([0-9]+)$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '/1$ ' . $language_link . self::seo( $row2['seo_link'] ) . ' [R=301,L]';
|
||||
}
|
||||
else
|
||||
{
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] ) . '$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] ) . '/([0-9]+)$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] ) . '/1$ ' . $language_link . 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] ) . ' [R=301,L]';
|
||||
}
|
||||
$seoSlug = $row2['seo_link'] ? self::seo( $row2['seo_link'] ) : 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] );
|
||||
|
||||
$mdb->delete( 'pp_routes', [ 'AND' => [ 'category_id' => $row2['category_id'], 'lang_id' => $row['id'] ] ] );
|
||||
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'category_id' => $row2['category_id'],
|
||||
'lang_id' => $row['id'],
|
||||
'pattern' => '^' . $language_link . $seoSlug . '$',
|
||||
'destination' => 'index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'],
|
||||
] );
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'category_id' => $row2['category_id'],
|
||||
'lang_id' => $row['id'],
|
||||
'pattern' => '^' . $language_link . $seoSlug . '/([0-9]+)$',
|
||||
'destination' => 'index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&bs=$1',
|
||||
] );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$results = $mdb -> select( 'pp_langs', [ 'id', 'start' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
|
||||
//
|
||||
// PRODUKTY — sitemap + pp_routes (bez zmian)
|
||||
//
|
||||
$results = $mdb->select( 'pp_langs', [ 'id', 'start' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
|
||||
if ( is_array( $results ) )
|
||||
{
|
||||
foreach ( $results as $row )
|
||||
{
|
||||
!$row['start'] ? $language_link = $row['id'] . '/' : $language_link = '';
|
||||
|
||||
$results2 = $mdb -> select( 'pp_shop_products_langs', [ '[><]pp_shop_products' => [ 'product_id' => 'id' ] ], [ 'seo_link', 'name', 'product_id' ], [ 'lang_id' => $row['id'], 'ORDER' => [ 'name' => 'ASC' ] ] );
|
||||
$results2 = $mdb->select( 'pp_shop_products_langs', [ '[><]pp_shop_products' => [ 'product_id' => 'id' ] ], [ 'seo_link', 'name', 'product_id' ], [ 'lang_id' => $row['id'], 'ORDER' => [ 'name' => 'ASC' ] ] );
|
||||
if ( is_array( $results2 ) )
|
||||
{
|
||||
foreach ( $results2 as $row2 )
|
||||
{
|
||||
$mdb -> delete( 'pp_routes', [ 'AND' => [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'] ] ] );
|
||||
$mdb->delete( 'pp_routes', [ 'AND' => [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'] ] ] );
|
||||
|
||||
if ( $row2['name'] )
|
||||
{
|
||||
@@ -519,27 +690,13 @@ class Helpers
|
||||
|
||||
if ( $row2['seo_link'] )
|
||||
{
|
||||
$pattern = '^' . $language_link . self::seo( $row2['seo_link'] ) . '$';
|
||||
$destination = 'index.php?product=' . $row2['product_id'];
|
||||
|
||||
$mdb -> insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => $pattern, 'destination' => $destination ] );
|
||||
|
||||
$pattern = '^' . $language_link . self::seo( $row2['seo_link'] ) . '/([0-9-]+)$';
|
||||
$destination = 'index.php?product=' . $row2['product_id'] . '&permutation_hash=$1';
|
||||
|
||||
$mdb -> insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => $pattern, 'destination' => $destination ] );
|
||||
$mdb->insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => '^' . $language_link . self::seo( $row2['seo_link'] ) . '$', 'destination' => 'index.php?product=' . $row2['product_id'] ] );
|
||||
$mdb->insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => '^' . $language_link . self::seo( $row2['seo_link'] ) . '/([0-9-]+)$', 'destination' => 'index.php?product=' . $row2['product_id'] . '&permutation_hash=$1' ] );
|
||||
}
|
||||
else
|
||||
{
|
||||
$pattern = '^' . $language_link . 'p-' . $row2['product_id'] . '-' . self::seo( $row2['name'] ) . '$';
|
||||
$destination = 'index.php?product=' . $row2['product_id'];
|
||||
|
||||
$mdb -> insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => $pattern, 'destination' => $destination ] );
|
||||
|
||||
$pattern = '^' . $language_link . 'p-' . $row2['product_id'] . '-' . self::seo( $row2['name'] ) . '/([0-9-]+)$';
|
||||
$destination = 'index.php?product=' . $row2['product_id'] . '&permutation_hash=$1';
|
||||
|
||||
$mdb -> insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => $pattern, 'destination' => $destination ] );
|
||||
$mdb->insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => '^' . $language_link . 'p-' . $row2['product_id'] . '-' . self::seo( $row2['name'] ) . '$', 'destination' => 'index.php?product=' . $row2['product_id'] ] );
|
||||
$mdb->insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => '^' . $language_link . 'p-' . $row2['product_id'] . '-' . self::seo( $row2['name'] ) . '/([0-9-]+)$', 'destination' => 'index.php?product=' . $row2['product_id'] . '&permutation_hash=$1' ] );
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -547,13 +704,16 @@ class Helpers
|
||||
}
|
||||
}
|
||||
|
||||
$results = $mdb -> select( 'pp_langs', [ 'id', 'start' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
|
||||
//
|
||||
// STRONY + ARTYKULY — sitemap + pp_routes (bez zmian)
|
||||
//
|
||||
$results = $mdb->select( 'pp_langs', [ 'id', 'start' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
|
||||
if ( is_array( $results ) )
|
||||
foreach ( $results as $row )
|
||||
{
|
||||
( !$row['start'] and count( $results ) > 1 ) ? $language_link = $row['id'] . '/' : $language_link = '';
|
||||
|
||||
$results2 = $mdb -> select( 'pp_pages_langs', [ '[><]pp_pages' => [ 'page_id' => 'id' ] ], [ 'seo_link', 'title', 'page_id', 'noindex', 'start', 'link', 'page_type' ], [ 'lang_id' => $row['id'], 'ORDER' => [ 'start' => 'DESC', 'o' => 'ASC' ] ] );
|
||||
$results2 = $mdb->select( 'pp_pages_langs', [ '[><]pp_pages' => [ 'page_id' => 'id' ] ], [ 'seo_link', 'title', 'page_id', 'noindex', 'start', 'link', 'page_type' ], [ 'lang_id' => $row['id'], 'ORDER' => [ 'start' => 'DESC', 'o' => 'ASC' ] ] );
|
||||
if ( is_array( $results2 ) )
|
||||
foreach ( $results2 as $row2 )
|
||||
{
|
||||
@@ -590,44 +750,39 @@ class Helpers
|
||||
{
|
||||
$htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/s-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '$';
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^(.*)$ http://www.' . $url . '/' . $language_link . ' [R=permanent,L]';
|
||||
|
||||
$htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/s-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '-1$';
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^(.*)$ http://www.' . $url . '/' . $language_link . ' [R=permanent,L]';
|
||||
}
|
||||
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . ' [L]';
|
||||
}
|
||||
|
||||
if ( $row2['seo_link'] )
|
||||
{
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '/([0-9]+)$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '/1$ ' . $language_link . self::seo( $row2['seo_link'] ) . ' [R=301,L]';
|
||||
}
|
||||
else
|
||||
{
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 's-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 's-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '/([0-9]+)$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 's-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '/1$ ' . $language_link . 's-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . ' [R=301,L]';
|
||||
}
|
||||
$seoSlug = $row2['seo_link'] ? self::seo( $row2['seo_link'] ) : 's-' . $row2['page_id'] . '-' . self::seo( $row2['title'] );
|
||||
$langPrefix = $row2['start'] ? '' : $language_link;
|
||||
|
||||
$mdb->delete( 'pp_routes', [ 'AND' => [ 'page_id' => $row2['page_id'], 'lang_id' => $row['id'] ] ] );
|
||||
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'page_id' => $row2['page_id'],
|
||||
'lang_id' => $row['id'],
|
||||
'pattern' => '^' . $langPrefix . $seoSlug . '$',
|
||||
'destination' => 'index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'],
|
||||
] );
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'page_id' => $row2['page_id'],
|
||||
'lang_id' => $row['id'],
|
||||
'pattern' => '^' . $langPrefix . $seoSlug . '/([0-9]+)$',
|
||||
'destination' => 'index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&bs=$1',
|
||||
] );
|
||||
}
|
||||
}
|
||||
|
||||
$results2 = $mdb -> select( 'pp_articles_langs', [ '[><]pp_articles' => [ 'article_id' => 'id' ] ], [ 'seo_link', 'title', 'article_id', 'noindex', 'copy_from' ], [ 'AND' => [ 'status' => 1, 'lang_id' => $row['id'], 'block_direct_access' => 0 ] ] );
|
||||
$results2 = $mdb->select( 'pp_articles_langs', [ '[><]pp_articles' => [ 'article_id' => 'id' ] ], [ 'seo_link', 'title', 'article_id', 'noindex', 'copy_from' ], [ 'AND' => [ 'status' => 1, 'lang_id' => $row['id'], 'block_direct_access' => 0 ] ] );
|
||||
if ( is_array( $results2 ) )
|
||||
foreach ( $results2 as $row2 )
|
||||
{
|
||||
if ( $row2['copy_from'] != null )
|
||||
{
|
||||
$results_tmp = $mdb -> get( 'pp_articles_langs', [
|
||||
'seo_link',
|
||||
'title'
|
||||
], [
|
||||
'AND' => [
|
||||
'article_id' => $row2['article_id'],
|
||||
'lang_id' => $row2['copy_from']
|
||||
]
|
||||
] );
|
||||
$results_tmp = $mdb->get( 'pp_articles_langs', [ 'seo_link', 'title' ], [ 'AND' => [ 'article_id' => $row2['article_id'], 'lang_id' => $row2['copy_from'] ] ] );
|
||||
$row2['seo_link'] = $results_tmp['seo_link'];
|
||||
$row2['title'] = $results_tmp['title'];
|
||||
}
|
||||
@@ -650,81 +805,52 @@ class Helpers
|
||||
$robots .= 'Disallow: /' . $row2['seo_link'] . PHP_EOL;
|
||||
}
|
||||
|
||||
$mdb->delete( 'pp_routes', [ 'AND' => [ 'article_id' => $row2['article_id'], 'lang_id' => $row['id'] ] ] );
|
||||
|
||||
if ( $row2['seo_link'] )
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '$ index.php?article=' . $row2['article_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
|
||||
{
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'article_id' => $row2['article_id'],
|
||||
'lang_id' => $row['id'],
|
||||
'pattern' => '^' . $language_link . self::seo( $row2['seo_link'] ) . '$',
|
||||
'destination' => 'index.php?article=' . $row2['article_id'] . '&lang=' . $row['id'],
|
||||
] );
|
||||
}
|
||||
else if ( $row2['title'] != null )
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'a-' . $row2['article_id'] . '-' . self::seo( $row2['title'] ) . '$ index.php?article=' . $row2['article_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
|
||||
{
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'article_id' => $row2['article_id'],
|
||||
'lang_id' => $row['id'],
|
||||
'pattern' => '^' . $language_link . 'a-' . $row2['article_id'] . '-' . self::seo( $row2['title'] ) . '$',
|
||||
'destination' => 'index.php?article=' . $row2['article_id'] . '&lang=' . $row['id'],
|
||||
] );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$results = $mdb -> get( 'pp_settings', 'value', [ 'param' => 'htaccess' ] );
|
||||
// Invalidacja cache tras
|
||||
try {
|
||||
( new \Shared\Cache\CacheHandler() )->delete( 'pp_routes:all' );
|
||||
} catch ( \Exception $e ) {
|
||||
// Redis niedostepny — ignorujemy
|
||||
}
|
||||
|
||||
$results = $mdb->get( 'pp_settings', 'value', [ 'param' => 'htaccess' ] );
|
||||
if ( $results )
|
||||
$htaccess_data .= PHP_EOL . $results;
|
||||
|
||||
$results = $mdb -> get( 'pp_settings', 'value', [ 'param' => 'robots' ] );
|
||||
$results = $mdb->get( 'pp_settings', 'value', [ 'param' => 'robots' ] );
|
||||
if ( $results )
|
||||
$robots .= PHP_EOL . $results;
|
||||
$robots .= PHP_EOL . $results;
|
||||
|
||||
$site_map .= '</urlset>';
|
||||
|
||||
/* cache */
|
||||
if ( $settings['htaccess_cache'] )
|
||||
{
|
||||
$htaccess_data = str_replace( '{HTACCESS_CACHE}',
|
||||
'<IfModule mod_deflate.c>' . PHP_EOL
|
||||
. 'AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml application/xhtml+xml text/css text/javascript application/javascript application/x-javascript' . PHP_EOL
|
||||
. '</IfModule>' . PHP_EOL
|
||||
. '<IfModule mod_headers.c>' . PHP_EOL
|
||||
. 'Header set Access-Control-Allow-Origin "*"' . PHP_EOL
|
||||
. '</IfModule>' . PHP_EOL
|
||||
. '<IfModule mod_expires.c>' . PHP_EOL
|
||||
. 'ExpiresActive on' . PHP_EOL
|
||||
. 'ExpiresDefault "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType text/css "access plus 1 year"' . PHP_EOL
|
||||
. 'ExpiresByType application/json "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType application/xml "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType text/xml "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType image/x-icon "access plus 1 week"' . PHP_EOL
|
||||
. 'ExpiresByType text/x-component "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType text/html "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType application/javascript "access plus 1 year"' . PHP_EOL
|
||||
. 'ExpiresByType application/x-web-app-manifest+json "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType text/cache-manifest "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType audio/ogg "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType image/gif "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType image/jpeg "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType image/png "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType video/mp4 "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType video/ogg "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType video/webm "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType application/atom+xml "access plus 1 hour"' . PHP_EOL
|
||||
. 'ExpiresByType application/rss+xml "access plus 1 hour"' . PHP_EOL
|
||||
. 'ExpiresByType application/font-woff "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType application/vnd.ms-fontobject "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType application/x-font-ttf "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType font/opentype "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType image/svg+xml "access plus 1 month"' . PHP_EOL
|
||||
. '</IfModule>'
|
||||
, $htaccess_data );
|
||||
}
|
||||
else
|
||||
{
|
||||
$htaccess_data = str_replace( '{HTACCESS_CACHE}',
|
||||
'<IfModule mod_headers.c>' . PHP_EOL
|
||||
. 'Header set Cache-Control "no-cache, no-store, must-revalidate"' . PHP_EOL
|
||||
. 'Header set Pragma "no-cache"' . PHP_EOL
|
||||
. 'Header set Expires 0' . PHP_EOL
|
||||
. '</IfModule>',
|
||||
$htaccess_data );
|
||||
}
|
||||
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{REQUEST_FILENAME} !-f' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{REQUEST_FILENAME} !-d' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^ index.php [L]';
|
||||
|
||||
// Niektore hostingi blokuja zmiane wersji PHP przez .htaccess.
|
||||
// Automatycznie komentujemy niedozwolone dyrektywy, aby generowany plik byl kompatybilny.
|
||||
$htaccess_data = preg_replace( '/^(\\s*)(AddHandler|SetHandler|ForceType)\\b/im', '$1# $2', $htaccess_data );
|
||||
|
||||
$fp = fopen( $dir . '.htaccess', 'w' );
|
||||
|
||||
@@ -437,7 +437,7 @@ class ProductsApiController
|
||||
// String fields — direct mapping
|
||||
$stringFields = [
|
||||
'sku', 'ean', 'custom_label_0', 'custom_label_1', 'custom_label_2',
|
||||
'custom_label_3', 'custom_label_4', 'wp',
|
||||
'custom_label_3', 'custom_label_4', 'wp', 'new_to_date', 'additional_message_text',
|
||||
];
|
||||
foreach ($stringFields as $field) {
|
||||
if (isset($body[$field])) {
|
||||
@@ -447,6 +447,18 @@ class ProductsApiController
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($body['additional_message'])) {
|
||||
$d['additional_message'] = !empty($body['additional_message']) ? 'on' : '';
|
||||
} elseif ($existing !== null) {
|
||||
$d['additional_message'] = !empty($existing['additional_message']) ? 'on' : '';
|
||||
}
|
||||
|
||||
if (isset($body['additional_message_required'])) {
|
||||
$d['additional_message_required'] = !empty($body['additional_message_required']) ? 'on' : '';
|
||||
} elseif ($existing !== null) {
|
||||
$d['additional_message_required'] = !empty($existing['additional_message_required']) ? 'on' : '';
|
||||
}
|
||||
|
||||
// Foreign keys
|
||||
if (isset($body['set_id'])) {
|
||||
$d['set'] = $body['set_id'];
|
||||
|
||||
BIN
autoload/front/.DS_Store
vendored
BIN
autoload/front/.DS_Store
vendored
Binary file not shown.
13
docs/API.md
13
docs/API.md
@@ -216,6 +216,10 @@ Odpowiedz:
|
||||
"weight": 0.5,
|
||||
"stock_0_buy": 0,
|
||||
"custom_label_0": null,
|
||||
"new_to_date": null,
|
||||
"additional_message": 0,
|
||||
"additional_message_required": 0,
|
||||
"additional_message_text": null,
|
||||
"set_id": null,
|
||||
"product_unit_id": 1,
|
||||
"producer_id": 3,
|
||||
@@ -294,6 +298,10 @@ Content-Type: application/json
|
||||
"status": 1,
|
||||
"sku": "PROD-001",
|
||||
"ean": "5901234123457",
|
||||
"new_to_date": null,
|
||||
"additional_message": 0,
|
||||
"additional_message_required": 0,
|
||||
"additional_message_text": null,
|
||||
"weight": 0.5,
|
||||
"languages": {
|
||||
"pl": {
|
||||
@@ -330,6 +338,10 @@ Content-Type: application/json
|
||||
{
|
||||
"price_brutto": 129.99,
|
||||
"status": 1,
|
||||
"new_to_date": "2026-12-31",
|
||||
"additional_message": 1,
|
||||
"additional_message_required": 0,
|
||||
"additional_message_text": "Dodaj tresc do personalizacji",
|
||||
"languages": {
|
||||
"pl": {
|
||||
"name": "Zaktualizowana nazwa"
|
||||
@@ -339,6 +351,7 @@ Content-Type: application/json
|
||||
```
|
||||
|
||||
Partial update — wystarczy przeslac tylko zmienione pola. Pola nieprzeslane zachowuja aktualna wartosc.
|
||||
Pola ustawien produktu obslugiwane przez API: `new_to_date`, `additional_message`, `additional_message_required`, `additional_message_text`.
|
||||
|
||||
Odpowiedz: pelne dane produktu (jak w `get`).
|
||||
|
||||
|
||||
@@ -4,6 +4,53 @@ Logi zmian z migracji na Domain-Driven Architecture. Najnowsze na gorze.
|
||||
|
||||
---
|
||||
|
||||
## ver. 0.332 (2026-03-01) - API produktów: nowe pola new_to_date i additional_message
|
||||
|
||||
- **NEW**: `ProductRepository::getProductForApi()` — eksportuje 4 nowe pola: `new_to_date`, `additional_message` (int 0/1), `additional_message_required` (int 0/1), `additional_message_text`
|
||||
- **NEW**: `ProductsApiController` — obsługa nowych pól w PUT/PATCH (aktualizacja `new_to_date`, `additional_message`, `additional_message_required`, `additional_message_text`)
|
||||
- **DOCS**: `docs/API.md` — zaktualizowane przykłady GET/PUT dla nowych pól produktu
|
||||
|
||||
---
|
||||
|
||||
## ver. 0.331 (2026-03-01) - Bugfix: strona produktu używała layoutu kategorii zamiast domyślnego
|
||||
|
||||
- **FIX**: `LayoutsRepository::getProductLayout()` — fallback gdy produkt i jego kategorie nie mają przypisanego layoutu zmieniany z `categories_default = 1` na `status = 1`; wcześniej produkty bez layoutu pobierały szablon "Podstrony - kategorie" zamiast właściwego domyślnego
|
||||
|
||||
---
|
||||
|
||||
## ver. 0.330 (2026-02-27) - Eliminacja htaccess.conf — wszystkie trasy URL w pp_routes
|
||||
|
||||
- **REFACTOR**: `Helpers::htacces()` — generowanie `.htaccess` w całości z PHP (usunięty `file_get_contents('htaccess.conf')` i placeholder `{HTACCESS_CACHE}`)
|
||||
- **NEW**: 32 statyczne trasy systemowe wstawiane do `pp_routes` z `type='system'` przy każdym `htacces()` (koszyk, logowanie, wylogowanie, panel klienta, newsletter, zamówienia, płatności, moduły AJAX: shopBasket/shopClient/shopProduct/shopCoupon/search)
|
||||
- **NEW**: Dynamiczne trasy językowe i producentów (producenci + per-producent z paginacją) przenoszone do `pp_routes` zamiast `.htaccess`
|
||||
- **NEW**: Kolumna `type VARCHAR(20) NULL` w `pp_routes` — `NULL` dla encji, `'system'` dla tras systemowych
|
||||
- **REMOVED**: `libraries/htaccess.conf` — plik szablonu usunięty, treść wbudowana w PHP
|
||||
- **PERF**: Invalidacja cache Redis `pp_routes:all` po każdym `htacces()` — świeże trasy przy kolejnym żądaniu
|
||||
- **MIGRATION**: `migrations/0.329.sql` (dodano `type` column)
|
||||
- **DOCS**: `docs/DATABASE_STRUCTURE.md` — zaktualizowana sekcja `pp_routes` o kolumnę `type`
|
||||
|
||||
---
|
||||
|
||||
## ver. 0.329 (2026-02-27) - Routing kategorii, stron i artykułów przez pp_routes
|
||||
|
||||
- **REFACTOR**: `index.php` — blok routingu przez `pp_routes` przeniesiony PRZED `checkUrlParams()` (poprawna kolejność: lang/a=page dostępne w checkUrlParams)
|
||||
- **PERF**: Cache Redis dla tras (`pp_routes:all`, TTL 86400s) w `index.php` — jeden SELECT na 24h zamiast przy każdym żądaniu
|
||||
- **NEW**: Kategorie, strony i artykuły zapisywane do `pp_routes` zamiast `.htaccess` w `Helpers::htacces()`
|
||||
- **NEW**: `CategoryRepository::categoryDelete()` — usuwa powiązane `pp_routes` przed odświeżeniem
|
||||
- **NEW**: `PagesRepository::pageDelete()` — usuwa powiązane `pp_routes`
|
||||
- **NEW**: `ArticleRepository::archive()` i `deletePermanently()` — usuwa powiązane `pp_routes`
|
||||
- **MIGRATION**: `migrations/0.329.sql` — `ALTER TABLE pp_routes ADD COLUMN category_id, page_id, article_id`
|
||||
- **TESTS**: Zaktualizowane `CategoryRepositoryTest` i `ArticleRepositoryTest` (nowe asercje na `pp_routes` delete)
|
||||
|
||||
---
|
||||
|
||||
## ver. 0.328 (2026-02-27) - Ikona kopiowania wartości atrybutów w szczegółach zamówienia
|
||||
|
||||
- **NEW**: `order-details-custom-script.php` — JS parsuje `.atributes` div i wstrzykuje przycisk `fa-copy` przy każdej wartości atrybutu
|
||||
- **UX**: Kliknięcie kopiuje wartość do schowka (Clipboard API + fallback execCommand), ikona zmienia się na `fa-check` z zielonym tłem przez 1,5s
|
||||
|
||||
---
|
||||
|
||||
## ver. 0.327 (2026-02-27) - Masowe usuwanie w archiwum produktów
|
||||
|
||||
- **NEW**: `ProductArchiveController::bulk_delete_permanent()` — endpoint POST `product_archive/bulk_delete_permanent/`, przyjmuje `ids[]`, usuwa każdy produkt przez `ProductRepository::delete()`, zwraca JSON `{success, deleted, errors[]}`
|
||||
|
||||
@@ -700,3 +700,28 @@ Harmonogram cyklicznych zadań cron.
|
||||
**Używane w:** `Domain\CronJob\CronJobRepository`, `Domain\CronJob\CronJobProcessor`
|
||||
|
||||
**Dodano w wersji 0.324.**
|
||||
|
||||
## pp_routes
|
||||
Tabela tras URL — mapowanie wzorców URL (regex) na parametry GET. Zastępuje reguły `RewriteRule` w `.htaccess` dla wszystkich URL-i aplikacji: produktów, kategorii, stron, artykułów oraz systemowych (koszyk, logowanie, newsletter, itp.).
|
||||
|
||||
| Kolumna | Opis |
|
||||
|---------|------|
|
||||
| id | Klucz główny (AUTO_INCREMENT) |
|
||||
| product_id | ID produktu (INT NULL) — wypełnione dla tras produktów |
|
||||
| category_id | ID kategorii (INT NULL) — wypełnione dla tras kategorii |
|
||||
| page_id | ID strony (INT NULL) — wypełnione dla tras stron |
|
||||
| article_id | ID artykułu (INT NULL) — wypełnione dla tras artykułów |
|
||||
| type | Typ trasy: NULL = encja (produkt/kategoria/strona/artykuł), `'system'` = trasa systemowa (koszyk, logowanie, newsletter, AJAX moduły, itp.) |
|
||||
| lang_id | ID języka (0 dla tras systemowych niezwiązanych z językiem) |
|
||||
| pattern | Wyrażenie regularne dopasowywane do REQUEST_URI |
|
||||
| destination | Docelowy query string, np. `index.php?category=5&lang=1` |
|
||||
|
||||
**Mechanizm:** `index.php` ładuje wszystkie trasy (z cache Redis `pp_routes:all`) przed `checkUrlParams()`, dopasowuje `pattern` do ścieżki żądania i ustawia `$_GET` z `destination`. Obsługuje grupy przechwytujące (np. `$1` dla paginacji).
|
||||
|
||||
**Trasy systemowe:** Przy każdym wywołaniu `Helpers::htacces()` wszystkie rekordy z `type='system'` są usuwane i wstawiane na nowo (32 statycznych + dynamiczne trasy językowe i producentów). Zarządzane automatycznie — nie edytować ręcznie.
|
||||
|
||||
**Cache:** Redis klucz `pp_routes:all`, TTL 86400s. Invalidowany automatycznie przy każdym wywołaniu `Helpers::htacces()`.
|
||||
|
||||
**Używane w:** `index.php`, `Shared\Helpers\Helpers::htacces()`, `Domain\Product\ProductRepository`, `Domain\Category\CategoryRepository`, `Domain\Pages\PagesRepository`, `Domain\Article\ArticleRepository`
|
||||
|
||||
**Dodano w wersji 0.329. Kolumna `type` i trasy systemowe dodane w wersji 0.330.**
|
||||
|
||||
@@ -23,10 +23,10 @@ composer test # standard
|
||||
## Aktualny stan
|
||||
|
||||
```text
|
||||
OK (805 tests, 2253 assertions)
|
||||
OK (807 tests, 2258 assertions)
|
||||
```
|
||||
|
||||
Zweryfikowano: 2026-02-24 (ver. 0.318)
|
||||
Zweryfikowano: 2026-03-01 (ver. 0.332)
|
||||
|
||||
## Konfiguracja
|
||||
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
1. Dodać przycisk kopiowania przy atrybutach produktu w zamówieniu
|
||||
2. Poprawić htaccess, żeby w nim nie było w ogóle adresów strona wszystko z bazy.
|
||||
3. Dodać uwierzytelnienie dwuskładnikowe za pomocą aplikacji.
|
||||
3. Dodać uwierzytelnienie dwuskładnikowe za pomocą aplikacji.
|
||||
4. Dodać zarządzanie uprawnieniami na poziomie urzytkownika, na razie uprawnienia do poszczególnych modułów.
|
||||
naprawić działanie newslettera i zapis do bazy newslettera
|
||||
program lojalnościowy
|
||||
proponowane produkty w koszyku
|
||||
Do zamówień w statusie: realizowane lub oczekuje na wpłatę. Opcja tylko dla zarejestrowanych klientów. https://royal-stone.pl/pl/order1.html
|
||||
|
||||
658
docs/plans/2026-02-27-htaccess-conf-elimination.md
Normal file
658
docs/plans/2026-02-27-htaccess-conf-elimination.md
Normal file
@@ -0,0 +1,658 @@
|
||||
# htaccess.conf Elimination — Implementation Plan
|
||||
|
||||
> **For Claude:** REQUIRED SUB-SKILL: Use superpowers:executing-plans to implement this plan task-by-task.
|
||||
|
||||
**Goal:** Eliminate `libraries/htaccess.conf` as a template file and move all remaining hardcoded URL routes into `pp_routes`, leaving only true Apache-level directives in the generated `.htaccess`.
|
||||
|
||||
**Architecture:** `Helpers::htacces()` generates the full `.htaccess` content from PHP strings instead of loading a template. All URL→PHP mappings (static system routes + dynamic per language/producer) are inserted into `pp_routes` with `type='system'`, deleted and reinserted on every `htacces()` call. Apache-level rules (HTTPS redirect, admin routing, thumb.php) stay in `.htaccess` only.
|
||||
|
||||
**Tech Stack:** PHP 7.4, Medoo ORM (`$mdb`), Redis (CacheHandler), PHPUnit 9.6
|
||||
|
||||
---
|
||||
|
||||
## Context
|
||||
|
||||
### Current `Helpers::htacces()` structure (before this plan)
|
||||
1. Loads `libraries/htaccess.conf` template (contains many hardcoded URL routes)
|
||||
2. Appends language switch rules to `$htaccess_data`
|
||||
3. Appends newsletter and producer rules to `$htaccess_data`
|
||||
4. Inserts category/product/page/article routes into `pp_routes` (done in v0.329)
|
||||
5. Replaces `{HTACCESS_CACHE}` placeholder
|
||||
6. Appends catch-all, writes files
|
||||
|
||||
### What stays in `.htaccess` after this plan
|
||||
- `RewriteEngine On`, `RewriteBase /`, `Options`
|
||||
- www→https redirect
|
||||
- http→https redirect (with tpay/przelewy24/hotpay exclusion)
|
||||
- Trailing slash removal (excluding `/admin/`)
|
||||
- Admin routing: `^admin/([^/]*)/([^/]*)/(.*)$`
|
||||
- `^admin/$`
|
||||
- Thumbnail: `^thumb/([0-9]*)/([0-9]*)/(.*)$` → `/libraries/thumb.php` (different PHP file, cannot use pp_routes)
|
||||
- `THE_REQUEST` index.php redirect
|
||||
- Cache headers block (gzip/expires or no-cache based on `$settings['htaccess_cache']`)
|
||||
- File protection: `<Files *.conf>`, `<Files *.log>`, `<Files *.ini>`
|
||||
- Start page 301 redirects (generated dynamically in pages loop)
|
||||
- Custom htaccess from `pp_settings` (param=htaccess)
|
||||
- Catch-all: `RewriteRule ^ index.php [L]`
|
||||
|
||||
### New `type` column in `pp_routes`
|
||||
- `NULL` = entity route (product/category/page/article)
|
||||
- `'system'` = system route (all routes in this plan)
|
||||
- On every `htacces()` call: `DELETE WHERE type='system'`, then reinsert all
|
||||
|
||||
---
|
||||
|
||||
## Task 1: Update SQL migration — add `type` column
|
||||
|
||||
**Files:**
|
||||
- Modify: `migrations/0.329.sql`
|
||||
|
||||
**Step 1: Add `type` column to the migration**
|
||||
|
||||
Open `migrations/0.329.sql` (currently has 4 lines). Append the `type` column:
|
||||
|
||||
```sql
|
||||
ALTER TABLE pp_routes
|
||||
ADD COLUMN category_id INT NULL AFTER product_id,
|
||||
ADD COLUMN page_id INT NULL AFTER category_id,
|
||||
ADD COLUMN article_id INT NULL AFTER page_id,
|
||||
ADD COLUMN type VARCHAR(20) NULL AFTER article_id;
|
||||
```
|
||||
|
||||
**Step 2: Apply migration on server**
|
||||
|
||||
Run on the production/staging database:
|
||||
```sql
|
||||
ALTER TABLE pp_routes ADD COLUMN type VARCHAR(20) NULL AFTER article_id;
|
||||
```
|
||||
(The other 3 columns from 0.329 should already be applied from the previous deployment.)
|
||||
|
||||
**Step 3: No test needed** — pure schema change, verified when routes are inserted in Task 2.
|
||||
|
||||
---
|
||||
|
||||
## Task 2: Refactor `Helpers::htacces()` — replace template + move all routes to pp_routes
|
||||
|
||||
**Files:**
|
||||
- Modify: `autoload/Shared/Helpers/Helpers.php` (method `htacces()`, lines ~408–773)
|
||||
|
||||
This is the core task. The entire method is refactored. Here is the complete new body:
|
||||
|
||||
**Step 1: Replace the method body**
|
||||
|
||||
Find the opening of `htacces()` at line ~408. Replace everything from the start of the method body through the end (line ~773) with the code below.
|
||||
|
||||
The key structural changes:
|
||||
- Remove `file_get_contents(htaccess.conf)` and `str_replace('{PAGE}', ...)`
|
||||
- Remove `str_replace('{HTACCESS_CACHE}', ...)` — cache block is now inline
|
||||
- Build `$htaccess_data` directly as PHP string
|
||||
- Delete all `type='system'` routes, then reinsert static + dynamic ones
|
||||
- Language switch → `pp_routes` (remove from `$htaccess_data`)
|
||||
- Newsletter → `pp_routes` (remove from `$htaccess_data`)
|
||||
- Producenci/producent → `pp_routes` (remove from `$htaccess_data`)
|
||||
|
||||
**New `htacces()` method body** — replace lines 409–773 with:
|
||||
|
||||
```php
|
||||
{
|
||||
global $mdb;
|
||||
|
||||
$settings = ( new \Domain\Settings\SettingsRepository( $mdb ) )->allSettings( true );
|
||||
|
||||
$url = preg_replace( '#^(http(s)?://)?w{3}\.#', '$1', $_SERVER['SERVER_NAME'] );
|
||||
|
||||
$robots = 'User-agent: *' . PHP_EOL;
|
||||
$robots .= 'Allow: /' . PHP_EOL;
|
||||
|
||||
$site_map = '<?xml version="1.0" encoding="UTF-8"?>' . PHP_EOL;
|
||||
$site_map .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">' . PHP_EOL;
|
||||
$site_map .= '<url>' . PHP_EOL;
|
||||
$site_map .= '<loc>https://' . $url . '</loc>' . PHP_EOL;
|
||||
$site_map .= '<lastmod>' . date( 'Y-m-d' ) . '</lastmod>' . PHP_EOL;
|
||||
$site_map .= '<changefreq>daily</changefreq>' . PHP_EOL;
|
||||
$site_map .= '<priority>1</priority>' . PHP_EOL;
|
||||
$site_map .= '</url>' . PHP_EOL;
|
||||
|
||||
//
|
||||
// SYSTEM ROUTES — delete all and reinsert
|
||||
//
|
||||
$mdb->delete( 'pp_routes', [ 'type' => 'system' ] );
|
||||
|
||||
// Static system routes (hardcoded, never change)
|
||||
$systemRoutes = [
|
||||
// Wyszukiwarka
|
||||
[ 'pattern' => '^wyszukiwarka/([^/]+)/([0-9]+)$', 'destination' => 'index.php?module=search&action=search_results&query=$1&bs=$2' ],
|
||||
[ 'pattern' => '^wyszukiwarka/([^/]+)$', 'destination' => 'index.php?module=search&action=search_results&query=$1&bs=1' ],
|
||||
// Zamowienia
|
||||
[ 'pattern' => '^zamowienie/([a-zA-Z0-9-]+)$', 'destination' => 'index.php?module=shop_order&action=order_details&order_hash=$1' ],
|
||||
[ 'pattern' => '^potwierdzenie-platnosci/([a-zA-Z0-9-]+)$', 'destination' => 'index.php?module=shop_order&action=payment_confirmation&order_hash=$1' ],
|
||||
// Platnosci
|
||||
[ 'pattern' => '^tpay-status$', 'destination' => 'index.php?module=shop_order&action=payment_status_tpay' ],
|
||||
[ 'pattern' => '^platnosc-status$', 'destination' => 'index.php?module=shop_order&action=payment_status_hotpay' ],
|
||||
[ 'pattern' => '^przelewy24-status$', 'destination' => 'index.php?module=shop_order&action=payment_status_przelewy24pl' ],
|
||||
// Koszyk
|
||||
[ 'pattern' => '^koszyk$', 'destination' => 'index.php?module=shop_basket&action=main_view' ],
|
||||
[ 'pattern' => '^koszyk-podsumowanie$', 'destination' => 'index.php?module=shop_basket&action=summary_view' ],
|
||||
[ 'pattern' => '^zloz-zamowienie$', 'destination' => 'index.php?module=shop_basket&action=basket_save' ],
|
||||
// Klient
|
||||
[ 'pattern' => '^rejestracja$', 'destination' => 'index.php?module=shop_client&action=register_form' ],
|
||||
[ 'pattern' => '^logowanie$', 'destination' => 'index.php?module=shop_client&action=login_form' ],
|
||||
[ 'pattern' => '^wylogowanie$', 'destination' => 'index.php?module=shop_client&action=logout' ],
|
||||
[ 'pattern' => '^odzyskiwanie-hasla$', 'destination' => 'index.php?module=shop_client&action=recover_password' ],
|
||||
[ 'pattern' => '^panel-klienta/zamowienia$', 'destination' => 'index.php?module=shop_client&action=client_orders' ],
|
||||
[ 'pattern' => '^panel-klienta/adresy$', 'destination' => 'index.php?module=shop_client&action=client_addresses' ],
|
||||
[ 'pattern' => '^panel-klienta/nowy-adres$', 'destination' => 'index.php?module=shop_client&action=address_edit' ],
|
||||
[ 'pattern' => '^panel-klienta/edytuj-adres/([0-9]+)$', 'destination' => 'index.php?module=shop_client&action=address_edit&id=$1' ],
|
||||
[ 'pattern' => '^panel-klienta/usun-adres/([0-9]+)$', 'destination' => 'index.php?module=shop_client&action=address_delete&id=$1' ],
|
||||
// Newsletter
|
||||
[ 'pattern' => '^newsletter/signin$', 'destination' => 'index.php?module=newsletter&action=signin' ],
|
||||
[ 'pattern' => '^newsletter/confirm/hash=(.+)$', 'destination' => 'index.php?module=newsletter&action=confirm&hash=$1' ],
|
||||
[ 'pattern' => '^newsletter/unsubscribe/hash=(.+)$', 'destination' => 'index.php?module=newsletter&action=unsubscribe&hash=$1' ],
|
||||
// Moduły AJAX (shopBasket, shopClient, shopProduct, shopCoupon, search)
|
||||
[ 'pattern' => '^shopBasket/([^/]+)/(.+)$', 'destination' => 'index.php?module=shopBasket&action=$1&$2' ],
|
||||
[ 'pattern' => '^shopBasket/([^/]+)$', 'destination' => 'index.php?module=shopBasket&action=$1' ],
|
||||
[ 'pattern' => '^shopClient/([^/]+)/(.+)$', 'destination' => 'index.php?module=shopClient&action=$1&$2' ],
|
||||
[ 'pattern' => '^shopClient/([^/]+)$', 'destination' => 'index.php?module=shopClient&action=$1' ],
|
||||
[ 'pattern' => '^shopProduct/([^/]+)/(.+)$', 'destination' => 'index.php?module=shopProduct&action=$1&$2' ],
|
||||
[ 'pattern' => '^shopProduct/([^/]+)$', 'destination' => 'index.php?module=shopProduct&action=$1' ],
|
||||
[ 'pattern' => '^shopCoupon/([^/]+)/(.+)$', 'destination' => 'index.php?module=shopCoupon&action=$1&$2' ],
|
||||
[ 'pattern' => '^shopCoupon/([^/]+)$', 'destination' => 'index.php?module=shopCoupon&action=$1' ],
|
||||
[ 'pattern' => '^search/([^/]+)/(.+)$', 'destination' => 'index.php?module=search&action=$1&$2' ],
|
||||
[ 'pattern' => '^search/([^/]+)$', 'destination' => 'index.php?module=search&action=$1' ],
|
||||
];
|
||||
|
||||
foreach ( $systemRoutes as $route )
|
||||
{
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'type' => 'system',
|
||||
'lang_id' => 0,
|
||||
'pattern' => $route['pattern'],
|
||||
'destination' => $route['destination'],
|
||||
] );
|
||||
}
|
||||
|
||||
// Dynamic system routes — languages
|
||||
$results = $mdb->select( 'pp_langs', [ 'id' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
|
||||
if ( is_array( $results ) ) foreach ( $results as $row )
|
||||
{
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'type' => 'system',
|
||||
'lang_id' => 0,
|
||||
'pattern' => '^' . $row['id'] . '$',
|
||||
'destination' => 'index.php?a=change_language&id=' . $row['id'],
|
||||
] );
|
||||
}
|
||||
|
||||
// Dynamic system routes — producenci
|
||||
$categoryDefaultLayoutId = ( new \Domain\Layouts\LayoutsRepository( $mdb ) )->categoryDefaultLayoutId();
|
||||
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'type' => 'system',
|
||||
'lang_id' => 0,
|
||||
'pattern' => '^producenci$',
|
||||
'destination' => 'index.php?module=shop_producer&action=list&layout_id=' . $categoryDefaultLayoutId,
|
||||
] );
|
||||
|
||||
$rows = $mdb->select( 'pp_shop_producer', '*', [ 'status' => 1 ] );
|
||||
if ( self::is_array_fix( $rows ) ) foreach ( $rows as $row )
|
||||
{
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'type' => 'system',
|
||||
'lang_id' => 0,
|
||||
'pattern' => '^producent/' . self::seo( $row['name'] ) . '$',
|
||||
'destination' => 'index.php?module=shop_producer&action=products&producer_id=' . $row['id'] . '&layout_id=' . $categoryDefaultLayoutId,
|
||||
] );
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'type' => 'system',
|
||||
'lang_id' => 0,
|
||||
'pattern' => '^producent/' . self::seo( $row['name'] ) . '/([0-9]+)$',
|
||||
'destination' => 'index.php?module=shop_producer&action=products&producer_id=' . $row['id'] . '&layout_id=' . $categoryDefaultLayoutId . '&bs=$1',
|
||||
] );
|
||||
}
|
||||
|
||||
//
|
||||
// HTACCESS — generuj z PHP (bez szablonu htaccess.conf)
|
||||
//
|
||||
$htaccess_data = 'RewriteEngine On' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteBase /' . PHP_EOL;
|
||||
$htaccess_data .= 'Options +FollowSymlinks' . PHP_EOL;
|
||||
$htaccess_data .= 'Options -Indexes' . PHP_EOL;
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= '# Przekierowanie z www na bez www i z http na https w jednym kroku' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^ https://%1%{REQUEST_URI} [R=301,L]' . PHP_EOL;
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= '# Przekierowanie z http na https, jesli nie zawiera www' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{HTTPS} off' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{REQUEST_URI} !^/(tpay-status|platnosc-status|przelewy24-status)$ [NC]' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]' . PHP_EOL;
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= '# Usuwanie koncowego slasha dla niekatalogów' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{REQUEST_FILENAME} !-d' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{REQUEST_URI} !^/admin/.*$ [NC]' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{REQUEST_URI} (.+)/$' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^ %1 [R=301,L]' . PHP_EOL;
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{REQUEST_URI} !^(.*)/libraries/(.*) [NC]' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{REQUEST_URI} !^(.*)/layout/(.*) [NC]' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^admin/([^/]*)/([^/]*)/(.*)$ admin/index.php?module=$1&action=$2&$3 [L]' . PHP_EOL;
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^admin/$ admin/index.php [L]' . PHP_EOL;
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^thumb/([0-9]*)/([0-9]*)/(.*)$ /libraries/thumb.php?img=$3&w=$1&h=$2 [L]' . PHP_EOL;
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{THE_REQUEST} ^[A-Z]{3,9}\ /index.php' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^ /%1 [R=301,L]' . PHP_EOL;
|
||||
|
||||
/* cache — zastąpienie placeholdera {HTACCESS_CACHE} */
|
||||
if ( $settings['htaccess_cache'] )
|
||||
{
|
||||
$htaccess_data .= '<IfModule mod_deflate.c>' . PHP_EOL
|
||||
. 'AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml application/xhtml+xml text/css text/javascript application/javascript application/x-javascript' . PHP_EOL
|
||||
. '</IfModule>' . PHP_EOL
|
||||
. '<IfModule mod_headers.c>' . PHP_EOL
|
||||
. 'Header set Access-Control-Allow-Origin "*"' . PHP_EOL
|
||||
. '</IfModule>' . PHP_EOL
|
||||
. '<IfModule mod_expires.c>' . PHP_EOL
|
||||
. 'ExpiresActive on' . PHP_EOL
|
||||
. 'ExpiresDefault "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType text/css "access plus 1 year"' . PHP_EOL
|
||||
. 'ExpiresByType application/json "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType application/xml "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType text/xml "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType image/x-icon "access plus 1 week"' . PHP_EOL
|
||||
. 'ExpiresByType text/x-component "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType text/html "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType application/javascript "access plus 1 year"' . PHP_EOL
|
||||
. 'ExpiresByType application/x-web-app-manifest+json "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType text/cache-manifest "access plus 0 seconds"' . PHP_EOL
|
||||
. 'ExpiresByType audio/ogg "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType image/gif "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType image/jpeg "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType image/png "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType video/mp4 "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType video/ogg "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType video/webm "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType application/atom+xml "access plus 1 hour"' . PHP_EOL
|
||||
. 'ExpiresByType application/rss+xml "access plus 1 hour"' . PHP_EOL
|
||||
. 'ExpiresByType application/font-woff "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType application/vnd.ms-fontobject "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType application/x-font-ttf "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType font/opentype "access plus 1 month"' . PHP_EOL
|
||||
. 'ExpiresByType image/svg+xml "access plus 1 month"' . PHP_EOL
|
||||
. '</IfModule>' . PHP_EOL;
|
||||
}
|
||||
else
|
||||
{
|
||||
$htaccess_data .= '<IfModule mod_headers.c>' . PHP_EOL
|
||||
. 'Header set Cache-Control "no-cache, no-store, must-revalidate"' . PHP_EOL
|
||||
. 'Header set Pragma "no-cache"' . PHP_EOL
|
||||
. 'Header set Expires 0' . PHP_EOL
|
||||
. '</IfModule>' . PHP_EOL;
|
||||
}
|
||||
|
||||
$htaccess_data .= '<Files *.conf>' . PHP_EOL;
|
||||
$htaccess_data .= ' Order Deny,Allow' . PHP_EOL;
|
||||
$htaccess_data .= ' Deny from all' . PHP_EOL;
|
||||
$htaccess_data .= '</Files>' . PHP_EOL;
|
||||
$htaccess_data .= '<Files *.log>' . PHP_EOL;
|
||||
$htaccess_data .= ' Order Deny,Allow' . PHP_EOL;
|
||||
$htaccess_data .= ' Deny from all' . PHP_EOL;
|
||||
$htaccess_data .= '</Files>' . PHP_EOL;
|
||||
$htaccess_data .= '<Files *.ini>' . PHP_EOL;
|
||||
$htaccess_data .= ' Order Deny,Allow' . PHP_EOL;
|
||||
$htaccess_data .= ' Deny from all' . PHP_EOL;
|
||||
$htaccess_data .= '</Files>' . PHP_EOL;
|
||||
|
||||
//
|
||||
// KATEGORIE — sitemap + pp_routes (bez zmian)
|
||||
//
|
||||
$results = $mdb->select( 'pp_langs', [ 'id', 'start' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
|
||||
if ( is_array( $results ) ) foreach ( $results as $row )
|
||||
{
|
||||
!$row['start'] ? $language_link = $row['id'] . '/' : $language_link = '';
|
||||
|
||||
$results2 = $mdb->select( 'pp_shop_categories_langs', [ '[><]pp_shop_categories' => [ 'category_id' => 'id' ] ], [ 'seo_link', 'title', 'category_id' ], [ 'lang_id' => $row['id'], 'ORDER' => [ 'o' => 'ASC' ] ] );
|
||||
if ( is_array( $results2 ) ) foreach ( $results2 as $row2 )
|
||||
{
|
||||
if ( $row2['title'] )
|
||||
{
|
||||
$site_map .= '<url>' . PHP_EOL;
|
||||
if ( $row2['seo_link'] )
|
||||
$site_map .= '<loc>https://' . $url . '/' . $language_link . self::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
|
||||
else
|
||||
$site_map .= '<loc>https://' . $url . '/' . $language_link . 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] ) . '</loc>' . PHP_EOL;
|
||||
$site_map .= '<lastmod>' . date( 'Y-m-d' ) . '</lastmod>' . PHP_EOL;
|
||||
$site_map .= '<changefreq>daily</changefreq>' . PHP_EOL;
|
||||
$site_map .= '<priority>1</priority>' . PHP_EOL;
|
||||
$site_map .= '</url>' . PHP_EOL;
|
||||
|
||||
$seoSlug = $row2['seo_link'] ? self::seo( $row2['seo_link'] ) : 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] );
|
||||
|
||||
$mdb->delete( 'pp_routes', [ 'AND' => [ 'category_id' => $row2['category_id'], 'lang_id' => $row['id'] ] ] );
|
||||
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'category_id' => $row2['category_id'],
|
||||
'lang_id' => $row['id'],
|
||||
'pattern' => '^' . $language_link . $seoSlug . '$',
|
||||
'destination' => 'index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'],
|
||||
] );
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'category_id' => $row2['category_id'],
|
||||
'lang_id' => $row['id'],
|
||||
'pattern' => '^' . $language_link . $seoSlug . '/([0-9]+)$',
|
||||
'destination' => 'index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&bs=$1',
|
||||
] );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// PRODUKTY — sitemap + pp_routes (bez zmian)
|
||||
//
|
||||
$results = $mdb->select( 'pp_langs', [ 'id', 'start' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
|
||||
if ( is_array( $results ) )
|
||||
{
|
||||
foreach ( $results as $row )
|
||||
{
|
||||
!$row['start'] ? $language_link = $row['id'] . '/' : $language_link = '';
|
||||
|
||||
$results2 = $mdb->select( 'pp_shop_products_langs', [ '[><]pp_shop_products' => [ 'product_id' => 'id' ] ], [ 'seo_link', 'name', 'product_id' ], [ 'lang_id' => $row['id'], 'ORDER' => [ 'name' => 'ASC' ] ] );
|
||||
if ( is_array( $results2 ) )
|
||||
{
|
||||
foreach ( $results2 as $row2 )
|
||||
{
|
||||
$mdb->delete( 'pp_routes', [ 'AND' => [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'] ] ] );
|
||||
|
||||
if ( $row2['name'] )
|
||||
{
|
||||
$site_map .= '<url>' . PHP_EOL;
|
||||
if ( $row2['seo_link'] )
|
||||
$site_map .= '<loc>https://' . $url . '/' . $language_link . self::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
|
||||
else
|
||||
$site_map .= '<loc>https://' . $url . '/' . $language_link . 'p-' . $row2['product_id'] . '-' . self::seo( $row2['name'] ) . '</loc>' . PHP_EOL;
|
||||
$site_map .= '<lastmod>' . date( 'Y-m-d' ) . '</lastmod>' . PHP_EOL;
|
||||
$site_map .= '<changefreq>daily</changefreq>' . PHP_EOL;
|
||||
$site_map .= '<priority>1</priority>' . PHP_EOL;
|
||||
$site_map .= '</url>' . PHP_EOL;
|
||||
|
||||
if ( $row2['seo_link'] )
|
||||
{
|
||||
$mdb->insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => '^' . $language_link . self::seo( $row2['seo_link'] ) . '$', 'destination' => 'index.php?product=' . $row2['product_id'] ] );
|
||||
$mdb->insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => '^' . $language_link . self::seo( $row2['seo_link'] ) . '/([0-9-]+)$', 'destination' => 'index.php?product=' . $row2['product_id'] . '&permutation_hash=$1' ] );
|
||||
}
|
||||
else
|
||||
{
|
||||
$mdb->insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => '^' . $language_link . 'p-' . $row2['product_id'] . '-' . self::seo( $row2['name'] ) . '$', 'destination' => 'index.php?product=' . $row2['product_id'] ] );
|
||||
$mdb->insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => '^' . $language_link . 'p-' . $row2['product_id'] . '-' . self::seo( $row2['name'] ) . '/([0-9-]+)$', 'destination' => 'index.php?product=' . $row2['product_id'] . '&permutation_hash=$1' ] );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// STRONY + ARTYKULY — sitemap + pp_routes (bez zmian)
|
||||
//
|
||||
$results = $mdb->select( 'pp_langs', [ 'id', 'start' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
|
||||
if ( is_array( $results ) )
|
||||
foreach ( $results as $row )
|
||||
{
|
||||
( !$row['start'] and count( $results ) > 1 ) ? $language_link = $row['id'] . '/' : $language_link = '';
|
||||
|
||||
$results2 = $mdb->select( 'pp_pages_langs', [ '[><]pp_pages' => [ 'page_id' => 'id' ] ], [ 'seo_link', 'title', 'page_id', 'noindex', 'start', 'link', 'page_type' ], [ 'lang_id' => $row['id'], 'ORDER' => [ 'start' => 'DESC', 'o' => 'ASC' ] ] );
|
||||
if ( is_array( $results2 ) )
|
||||
foreach ( $results2 as $row2 )
|
||||
{
|
||||
if ( $row2['title'] and $row2['page_type'] != 3 and $row2['page_type'] != 5 )
|
||||
{
|
||||
if ( !$row2['noindex'] )
|
||||
{
|
||||
$site_map .= '<url>' . PHP_EOL;
|
||||
if ( $row2['seo_link'] )
|
||||
$site_map .= '<loc>https://' . $url . '/' . self::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
|
||||
else
|
||||
$site_map .= '<loc>https://' . $url . '/s-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '</loc>' . PHP_EOL;
|
||||
$site_map .= '<lastmod>' . date( 'Y-m-d' ) . '</lastmod>' . PHP_EOL;
|
||||
$site_map .= '<changefreq>daily</changefreq>' . PHP_EOL;
|
||||
$site_map .= '<priority>1</priority>' . PHP_EOL;
|
||||
$site_map .= '</url>' . PHP_EOL;
|
||||
}
|
||||
else if ( $row2['noindex'] and $row2['seo_link'] )
|
||||
{
|
||||
$robots .= 'User-agent: GoogleBot' . PHP_EOL;
|
||||
$robots .= 'Disallow: /' . $row2['seo_link'] . PHP_EOL;
|
||||
}
|
||||
|
||||
if ( $row2['start'] )
|
||||
{
|
||||
if ( $row2['seo_link'] )
|
||||
{
|
||||
$htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/' . self::seo( $row2['seo_link'] ) . '$';
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^(.*)$ http://www.' . $url . '/' . $language_link . ' [R=permanent,L]';
|
||||
$htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/' . self::seo( $row2['seo_link'] ) . '-1$';
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^(.*)$ http://www.' . $url . '/' . $language_link . ' [R=permanent,L]';
|
||||
}
|
||||
else
|
||||
{
|
||||
$htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/s-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '$';
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^(.*)$ http://www.' . $url . '/' . $language_link . ' [R=permanent,L]';
|
||||
$htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/s-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '-1$';
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^(.*)$ http://www.' . $url . '/' . $language_link . ' [R=permanent,L]';
|
||||
}
|
||||
$htaccess_data .= PHP_EOL . 'RewriteRule ^$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . ' [L]';
|
||||
}
|
||||
|
||||
$seoSlug = $row2['seo_link'] ? self::seo( $row2['seo_link'] ) : 's-' . $row2['page_id'] . '-' . self::seo( $row2['title'] );
|
||||
$langPrefix = $row2['start'] ? '' : $language_link;
|
||||
|
||||
$mdb->delete( 'pp_routes', [ 'AND' => [ 'page_id' => $row2['page_id'], 'lang_id' => $row['id'] ] ] );
|
||||
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'page_id' => $row2['page_id'],
|
||||
'lang_id' => $row['id'],
|
||||
'pattern' => '^' . $langPrefix . $seoSlug . '$',
|
||||
'destination' => 'index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'],
|
||||
] );
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'page_id' => $row2['page_id'],
|
||||
'lang_id' => $row['id'],
|
||||
'pattern' => '^' . $langPrefix . $seoSlug . '/([0-9]+)$',
|
||||
'destination' => 'index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&bs=$1',
|
||||
] );
|
||||
}
|
||||
}
|
||||
|
||||
$results2 = $mdb->select( 'pp_articles_langs', [ '[><]pp_articles' => [ 'article_id' => 'id' ] ], [ 'seo_link', 'title', 'article_id', 'noindex', 'copy_from' ], [ 'AND' => [ 'status' => 1, 'lang_id' => $row['id'], 'block_direct_access' => 0 ] ] );
|
||||
if ( is_array( $results2 ) )
|
||||
foreach ( $results2 as $row2 )
|
||||
{
|
||||
if ( $row2['copy_from'] != null )
|
||||
{
|
||||
$results_tmp = $mdb->get( 'pp_articles_langs', [ 'seo_link', 'title' ], [ 'AND' => [ 'article_id' => $row2['article_id'], 'lang_id' => $row2['copy_from'] ] ] );
|
||||
$row2['seo_link'] = $results_tmp['seo_link'];
|
||||
$row2['title'] = $results_tmp['title'];
|
||||
}
|
||||
|
||||
if ( !$row2['noindex'] )
|
||||
{
|
||||
$site_map .= '<url>' . PHP_EOL;
|
||||
if ( $row2['seo_link'] )
|
||||
$site_map .= '<loc>https://' . $url . '/' . self::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
|
||||
else
|
||||
$site_map .= '<loc>https://' . $url . '/a-' . $row2['article_id'] . '-' . self::seo( $row2['title'] ) . '</loc>' . PHP_EOL;
|
||||
$site_map .= '<lastmod>' . date( 'Y-m-d' ) . '</lastmod>' . PHP_EOL;
|
||||
$site_map .= '<changefreq>daily</changefreq>' . PHP_EOL;
|
||||
$site_map .= '<priority>1</priority>' . PHP_EOL;
|
||||
$site_map .= '</url>' . PHP_EOL;
|
||||
}
|
||||
else if ( $row2['noindex'] and $row2['seo_link'] )
|
||||
{
|
||||
$robots .= 'User-agent: GoogleBot' . PHP_EOL;
|
||||
$robots .= 'Disallow: /' . $row2['seo_link'] . PHP_EOL;
|
||||
}
|
||||
|
||||
$mdb->delete( 'pp_routes', [ 'AND' => [ 'article_id' => $row2['article_id'], 'lang_id' => $row['id'] ] ] );
|
||||
|
||||
if ( $row2['seo_link'] )
|
||||
{
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'article_id' => $row2['article_id'],
|
||||
'lang_id' => $row['id'],
|
||||
'pattern' => '^' . $language_link . self::seo( $row2['seo_link'] ) . '$',
|
||||
'destination' => 'index.php?article=' . $row2['article_id'] . '&lang=' . $row['id'],
|
||||
] );
|
||||
}
|
||||
else if ( $row2['title'] != null )
|
||||
{
|
||||
$mdb->insert( 'pp_routes', [
|
||||
'article_id' => $row2['article_id'],
|
||||
'lang_id' => $row['id'],
|
||||
'pattern' => '^' . $language_link . 'a-' . $row2['article_id'] . '-' . self::seo( $row2['title'] ) . '$',
|
||||
'destination' => 'index.php?article=' . $row2['article_id'] . '&lang=' . $row['id'],
|
||||
] );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Invalidacja cache tras
|
||||
try {
|
||||
( new \Shared\Cache\CacheHandler() )->delete( 'pp_routes:all' );
|
||||
} catch ( \Exception $e ) {
|
||||
// Redis niedostepny — ignorujemy
|
||||
}
|
||||
|
||||
$results = $mdb->get( 'pp_settings', 'value', [ 'param' => 'htaccess' ] );
|
||||
if ( $results )
|
||||
$htaccess_data .= PHP_EOL . $results;
|
||||
|
||||
$results = $mdb->get( 'pp_settings', 'value', [ 'param' => 'robots' ] );
|
||||
if ( $results )
|
||||
$robots .= PHP_EOL . $results;
|
||||
|
||||
$site_map .= '</urlset>';
|
||||
|
||||
$htaccess_data .= PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{REQUEST_FILENAME} !-f' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteCond %{REQUEST_FILENAME} !-d' . PHP_EOL;
|
||||
$htaccess_data .= 'RewriteRule ^ index.php [L]';
|
||||
|
||||
// Niektore hostingi blokuja zmiane wersji PHP przez .htaccess.
|
||||
$htaccess_data = preg_replace( '/^(\\s*)(AddHandler|SetHandler|ForceType)\\b/im', '$1# $2', $htaccess_data );
|
||||
|
||||
$fp = fopen( $dir . '.htaccess', 'w' );
|
||||
fwrite( $fp, $htaccess_data );
|
||||
fclose( $fp );
|
||||
|
||||
$fp = fopen( $dir . 'sitemap.xml', 'w' );
|
||||
fwrite( $fp, $site_map );
|
||||
fclose( $fp );
|
||||
|
||||
$fp = fopen( $dir . 'robots.txt', 'w' );
|
||||
fwrite( $fp, $robots );
|
||||
fclose( $fp );
|
||||
}
|
||||
```
|
||||
|
||||
**Step 2: Run tests**
|
||||
```
|
||||
php phpunit.phar --configuration phpunit.xml
|
||||
```
|
||||
Expected: all tests pass (htacces() has no unit tests, covered by integration).
|
||||
|
||||
---
|
||||
|
||||
## Task 3: Delete `libraries/htaccess.conf`
|
||||
|
||||
**Files:**
|
||||
- Delete: `libraries/htaccess.conf`
|
||||
|
||||
**Step 1: Verify htacces() no longer references the file**
|
||||
|
||||
Search for any remaining `file_get_contents` referencing `htaccess.conf`:
|
||||
```bash
|
||||
grep -r "htaccess.conf" autoload/
|
||||
```
|
||||
Expected: no results.
|
||||
|
||||
**Step 2: Delete the file**
|
||||
```bash
|
||||
rm libraries/htaccess.conf
|
||||
```
|
||||
|
||||
**Step 3: Run tests**
|
||||
```
|
||||
php phpunit.phar --configuration phpunit.xml
|
||||
```
|
||||
Expected: all tests still pass.
|
||||
|
||||
---
|
||||
|
||||
## Task 4: Update `docs/DATABASE_STRUCTURE.md`
|
||||
|
||||
**Files:**
|
||||
- Modify: `docs/DATABASE_STRUCTURE.md` (section `## pp_routes`)
|
||||
|
||||
**Step 1: Add `type` column to the pp_routes table description**
|
||||
|
||||
Find the `## pp_routes` section and add the `type` row to the column table:
|
||||
|
||||
```markdown
|
||||
| type | Typ trasy: NULL = encja (produkt/kategoria/strona/artykuł), 'system' = trasa systemowa |
|
||||
```
|
||||
|
||||
Also update the description paragraph to mention that system routes are managed automatically.
|
||||
|
||||
---
|
||||
|
||||
## Task 5: Manual integration test on server
|
||||
|
||||
**Step 1: Apply migration**
|
||||
```sql
|
||||
ALTER TABLE pp_routes ADD COLUMN type VARCHAR(20) NULL AFTER article_id;
|
||||
```
|
||||
|
||||
**Step 2: Trigger `htacces()` regeneration**
|
||||
|
||||
Log in to admin panel → save any product or category → this calls `htacces()`.
|
||||
|
||||
**Step 3: Verify pp_routes has system routes**
|
||||
```sql
|
||||
SELECT COUNT(*) FROM pp_routes WHERE type = 'system';
|
||||
```
|
||||
Expected: ~35+ rows (32 static + language rows + producer rows).
|
||||
|
||||
**Step 4: Verify .htaccess was generated correctly**
|
||||
|
||||
Open `.htaccess` — should NOT contain `RewriteRule ^koszyk$`, `^logowanie$`, etc. Should contain HTTPS redirect, admin routing, thumb routing, cache block.
|
||||
|
||||
**Step 5: Test URLs in browser**
|
||||
- `/koszyk` → koszyk page ✓
|
||||
- `/logowanie` → login page ✓
|
||||
- `/wyszukiwarka/test` → search results ✓
|
||||
- `/zamowienie/abc123` → order details ✓
|
||||
- `/shopClient/confirm/hash=xyz` → client confirm action ✓
|
||||
- Category URL → category page ✓
|
||||
- Product URL → product page ✓
|
||||
|
||||
**Step 6: Run full test suite**
|
||||
```
|
||||
php phpunit.phar --configuration phpunit.xml
|
||||
```
|
||||
Expected: 807 tests, all pass.
|
||||
|
||||
---
|
||||
|
||||
## Task 6: Commit
|
||||
|
||||
**Step 1: Stage and commit**
|
||||
```bash
|
||||
git add migrations/0.329.sql
|
||||
git add autoload/Shared/Helpers/Helpers.php
|
||||
git add docs/DATABASE_STRUCTURE.md
|
||||
git add docs/plans/2026-02-27-htaccess-conf-elimination.md
|
||||
git add docs/plans/2026-02-27-htaccess-to-routes-design.md
|
||||
git rm libraries/htaccess.conf
|
||||
git commit -m "feat: eliminate htaccess.conf, move all routes to pp_routes (v0.330)"
|
||||
```
|
||||
121
docs/plans/2026-02-27-htaccess-to-routes-design.md
Normal file
121
docs/plans/2026-02-27-htaccess-to-routes-design.md
Normal file
@@ -0,0 +1,121 @@
|
||||
# Design: Eliminacja htaccess.conf i przeniesienie wszystkich tras do pp_routes
|
||||
|
||||
**Data:** 2026-02-27
|
||||
**Wersja docelowa:** 0.330
|
||||
|
||||
---
|
||||
|
||||
## Cel
|
||||
|
||||
Wyeliminowanie pliku `libraries/htaccess.conf` jako szablonu i przeniesienie wszystkich URL-i, które dotychczas były wpisane na sztywno w `.htaccess`, do tabeli `pp_routes`. Logika generowania `.htaccess` zostaje w całości w `Helpers::htacces()`.
|
||||
|
||||
---
|
||||
|
||||
## Co zostaje w `.htaccess` (reguły Apache-level)
|
||||
|
||||
Tylko dyrektywy, których PHP nie może obsłużyć:
|
||||
|
||||
- `RewriteEngine On`, `Options`
|
||||
- Redirect HTTPS/www
|
||||
- Redirect HTTP→HTTPS (z wyłączeniem tpay-status, platnosc-status, przelewy24-status)
|
||||
- Usuwanie trailing slash (z wyłączeniem `/admin/`)
|
||||
- Routing `/admin/` → `admin/index.php`
|
||||
- `thumb/([0-9]*)/([0-9]*)/(.*)` → `/libraries/thumb.php` (inny plik PHP — niemożliwe przez pp_routes)
|
||||
- `RewriteCond %{THE_REQUEST} ^[A-Z]{3,9}\ /index.php` — redirect z index.php
|
||||
- Blok cache headers (gzip, expires) — zależny od `$settings['htaccess_cache']`
|
||||
- Ochrona plików: `<Files *.conf>`, `<Files *.log>`, `<Files *.ini>`
|
||||
- Przekierowania 301 stron startowych (generowane dynamicznie w pętli pages)
|
||||
- Niestandardowe reguły z `pp_settings` (param=htaccess)
|
||||
- Catch-all: `RewriteCond !-f`, `!-d`, `RewriteRule ^ index.php [L]`
|
||||
|
||||
---
|
||||
|
||||
## Co przechodzi do `pp_routes`
|
||||
|
||||
### Statyczne trasy systemowe (hardcoded, niezmienne)
|
||||
|
||||
| Pattern | Destination |
|
||||
|---------|-------------|
|
||||
| `^wyszukiwarka/([^/]+)/([0-9]+)$` | `index.php?module=search&action=search_results&query=$1&bs=$2` |
|
||||
| `^wyszukiwarka/([^/]+)$` | `index.php?module=search&action=search_results&query=$1&bs=1` |
|
||||
| `^zamowienie/([a-zA-Z0-9-]+)$` | `index.php?module=shop_order&action=order_details&order_hash=$1` |
|
||||
| `^potwierdzenie-platnosci/([a-zA-Z0-9-]+)$` | `index.php?module=shop_order&action=payment_confirmation&order_hash=$1` |
|
||||
| `^tpay-status$` | `index.php?module=shop_order&action=payment_status_tpay` |
|
||||
| `^platnosc-status$` | `index.php?module=shop_order&action=payment_status_hotpay` |
|
||||
| `^przelewy24-status$` | `index.php?module=shop_order&action=payment_status_przelewy24pl` |
|
||||
| `^koszyk$` | `index.php?module=shop_basket&action=main_view` |
|
||||
| `^koszyk-podsumowanie$` | `index.php?module=shop_basket&action=summary_view` |
|
||||
| `^zloz-zamowienie$` | `index.php?module=shop_basket&action=basket_save` |
|
||||
| `^rejestracja$` | `index.php?module=shop_client&action=register_form` |
|
||||
| `^logowanie$` | `index.php?module=shop_client&action=login_form` |
|
||||
| `^wylogowanie$` | `index.php?module=shop_client&action=logout` |
|
||||
| `^odzyskiwanie-hasla$` | `index.php?module=shop_client&action=recover_password` |
|
||||
| `^panel-klienta/zamowienia$` | `index.php?module=shop_client&action=client_orders` |
|
||||
| `^panel-klienta/adresy$` | `index.php?module=shop_client&action=client_addresses` |
|
||||
| `^panel-klienta/nowy-adres$` | `index.php?module=shop_client&action=address_edit` |
|
||||
| `^panel-klienta/edytuj-adres/([0-9]+)$` | `index.php?module=shop_client&action=address_edit&id=$1` |
|
||||
| `^panel-klienta/usun-adres/([0-9]+)$` | `index.php?module=shop_client&action=address_delete&id=$1` |
|
||||
| `^newsletter/signin$` | `index.php?module=newsletter&action=signin` |
|
||||
| `^newsletter/confirm/hash=(.+)$` | `index.php?module=newsletter&action=confirm&hash=$1` |
|
||||
| `^newsletter/unsubscribe/hash=(.+)$` | `index.php?module=newsletter&action=unsubscribe&hash=$1` |
|
||||
|
||||
### Trasy modułów AJAX (shopBasket, shopClient, shopProduct, shopCoupon, search)
|
||||
|
||||
Dwa wzorce na moduł — 3-segmentowy (z parametrami) i 2-segmentowy:
|
||||
|
||||
| Pattern | Destination |
|
||||
|---------|-------------|
|
||||
| `^shopBasket/([^/]+)/(.+)$` | `index.php?module=shopBasket&action=$1&$2` |
|
||||
| `^shopBasket/([^/]+)$` | `index.php?module=shopBasket&action=$1` |
|
||||
| `^shopClient/([^/]+)/(.+)$` | `index.php?module=shopClient&action=$1&$2` |
|
||||
| `^shopClient/([^/]+)$` | `index.php?module=shopClient&action=$1` |
|
||||
| `^shopProduct/([^/]+)/(.+)$` | `index.php?module=shopProduct&action=$1&$2` |
|
||||
| `^shopProduct/([^/]+)$` | `index.php?module=shopProduct&action=$1` |
|
||||
| `^shopCoupon/([^/]+)/(.+)$` | `index.php?module=shopCoupon&action=$1&$2` |
|
||||
| `^shopCoupon/([^/]+)$` | `index.php?module=shopCoupon&action=$1` |
|
||||
| `^search/([^/]+)/(.+)$` | `index.php?module=search&action=$1&$2` |
|
||||
| `^search/([^/]+)$` | `index.php?module=search&action=$1` |
|
||||
|
||||
### Dynamiczne trasy systemowe (wstawiane przy każdym `htacces()`)
|
||||
|
||||
- **Języki:** `^{lang_id}$` → `index.php?a=change_language&id={lang_id}` (per każdy aktywny język)
|
||||
- **Producenci lista:** `^producenci$` → `index.php?module=shop_producer&action=list&layout_id={id}`
|
||||
- **Producent detail:** `^producent/{slug}$` i `^producent/{slug}/([0-9]+)$` (per producent z DB)
|
||||
|
||||
---
|
||||
|
||||
## Nowa kolumna `type` w `pp_routes`
|
||||
|
||||
```sql
|
||||
ADD COLUMN type VARCHAR(20) NULL AFTER article_id
|
||||
```
|
||||
|
||||
| Wartość | Znaczenie |
|
||||
|---------|-----------|
|
||||
| `NULL` | Trasa encji (produkt, kategoria, strona, artykuł) |
|
||||
| `'system'` | Trasa systemowa (wszystkie powyższe) |
|
||||
|
||||
**Zarządzanie:** przy każdym `htacces()`:
|
||||
```php
|
||||
$mdb->delete('pp_routes', ['type' => 'system']); // usuń wszystkie
|
||||
// ... wstaw na nowo (statyczne + dynamiczne)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Eliminacja `htaccess.conf`
|
||||
|
||||
`file_get_contents($dir . 'libraries/htaccess.conf')` zastąpione PHP stringiem z tą samą treścią (tylko Apache-level reguły). Placeholder `{HTACCESS_CACHE}` zastąpiony bezpośrednim `if ($settings['htaccess_cache']) { ... } else { ... }` wbudowanym w odpowiednim miejscu.
|
||||
|
||||
Plik `libraries/htaccess.conf` zostaje usunięty.
|
||||
|
||||
---
|
||||
|
||||
## Pliki do modyfikacji
|
||||
|
||||
| Plik | Zmiana |
|
||||
|------|--------|
|
||||
| `migrations/0.329.sql` | Dodać `ADD COLUMN type VARCHAR(20) NULL` |
|
||||
| `Helpers::htacces()` | Usunąć `file_get_contents`, wbudować statyczny header, dodać inserty system routes, usunąć htaccess rules dla języków/newsletter/producenci |
|
||||
| `libraries/htaccess.conf` | Usunąć plik |
|
||||
| `docs/DATABASE_STRUCTURE.md` | Dodać kolumnę `type` do opisu pp_routes |
|
||||
76
index.php
76
index.php
@@ -59,6 +59,49 @@ $mdb = new medoo( [
|
||||
'time_debug' => $database['time_debug']
|
||||
] );
|
||||
|
||||
// check routes
|
||||
$parsed_url = parse_url($_SERVER['REQUEST_URI']);
|
||||
$request_uri = ltrim($parsed_url['path'], '/');
|
||||
$query_string = isset($parsed_url['query']) ? $parsed_url['query'] : '';
|
||||
parse_str($query_string, $query_params);
|
||||
|
||||
if ($request_uri != '')
|
||||
{
|
||||
$cache = new \Shared\Cache\CacheHandler();
|
||||
$cacheKey = 'pp_routes:all';
|
||||
$routesCached = $cache->get($cacheKey);
|
||||
|
||||
if ($routesCached === false || $routesCached === null)
|
||||
{
|
||||
$routes = $mdb->select('pp_routes', '*');
|
||||
$cache->set($cacheKey, $routes, 86400);
|
||||
}
|
||||
else
|
||||
{
|
||||
$routes = unserialize($routesCached);
|
||||
}
|
||||
|
||||
foreach ($routes as $route)
|
||||
{
|
||||
$pattern = $route['pattern'];
|
||||
$destination = $route['destination'];
|
||||
|
||||
if (preg_match("#^" . $pattern . "#", $request_uri, $matches))
|
||||
{
|
||||
// Replace placeholders in the destination with matches from the request URI
|
||||
$destination = preg_replace("#^" . $pattern . "#", $destination, $request_uri);
|
||||
|
||||
// Parse the destination string to extract GET parameters
|
||||
parse_str(parse_url($destination, PHP_URL_QUERY), $destination_params);
|
||||
|
||||
// Merge the destination params with query params from the URL
|
||||
$_GET = array_merge($destination_params, $query_params);
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
\front\App::checkUrlParams();
|
||||
|
||||
$langRepo = new \Domain\Languages\LanguagesRepository( $mdb );
|
||||
@@ -99,39 +142,6 @@ if ( $request_uri != '' )
|
||||
}
|
||||
}
|
||||
|
||||
// check routes
|
||||
$parsed_url = parse_url($_SERVER['REQUEST_URI']);
|
||||
$request_uri = ltrim($parsed_url['path'], '/');
|
||||
$query_string = isset($parsed_url['query']) ? $parsed_url['query'] : '';
|
||||
parse_str($query_string, $query_params);
|
||||
|
||||
if ($request_uri != '')
|
||||
{
|
||||
$matched = false;
|
||||
|
||||
$routes = $mdb->select('pp_routes', '*');
|
||||
foreach ($routes as $route)
|
||||
{
|
||||
$pattern = $route['pattern'];
|
||||
$destination = $route['destination'];
|
||||
|
||||
if (preg_match("#^" . $pattern . "#", $request_uri, $matches))
|
||||
{
|
||||
// Replace placeholders in the destination with matches from the request URI
|
||||
$destination = preg_replace("#^" . $pattern . "#", $destination, $request_uri);
|
||||
|
||||
// Parse the destination string to extract GET parameters
|
||||
parse_str(parse_url($destination, PHP_URL_QUERY), $destination_params);
|
||||
|
||||
// Merge the destination params with query params from the URL
|
||||
$_GET = array_merge($destination_params, $query_params);
|
||||
|
||||
$matched = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$pagesRepo = new \Domain\Pages\PagesRepository( $mdb );
|
||||
|
||||
if ( \Shared\Helpers\Helpers::get( 'a' ) == 'page' and \Shared\Helpers\Helpers::get( 'id' ) )
|
||||
|
||||
@@ -1,84 +0,0 @@
|
||||
RewriteEngine On
|
||||
RewriteBase /
|
||||
Options +FollowSymlinks
|
||||
Options -Indexes
|
||||
|
||||
# Przekierowanie z www na bez www i z http na https w jednym kroku
|
||||
RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
|
||||
RewriteRule ^ https://%1%{REQUEST_URI} [R=301,L]
|
||||
|
||||
# Przekierowanie z http na https, jeśli nie zawiera www
|
||||
RewriteCond %{HTTPS} off
|
||||
RewriteCond %{REQUEST_URI} !^/(tpay-status|platnosc-status|przelewy24-status)$ [NC]
|
||||
RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
|
||||
|
||||
# Usuwanie końcowego slash'a dla niekatalogów
|
||||
RewriteCond %{REQUEST_FILENAME} !-d
|
||||
RewriteCond %{REQUEST_URI} !^/admin/.*$ [NC] # Wyklucza ścieżki rozpoczynające się od "admin/"
|
||||
RewriteCond %{REQUEST_URI} (.+)/$
|
||||
RewriteRule ^ %1 [R=301,L]
|
||||
|
||||
RewriteCond %{REQUEST_URI} !^(.*)/libraries/(.*) [NC]
|
||||
RewriteCond %{REQUEST_URI} !^(.*)/layout/(.*) [NC]
|
||||
RewriteRule ^admin/([^/]*)/([^/]*)/(.*)$ admin/index.php?module=$1&action=$2&$3 [L]
|
||||
|
||||
RewriteRule ^admin/$ admin/index.php [L]
|
||||
|
||||
RewriteRule ^wyszukiwarka/(.*)/([0-9]*)$ index.php?module=search&action=search_results&query=$1&bs=$2 [L]
|
||||
RewriteRule ^wyszukiwarka/(.*)$ index.php?module=search&action=search_results&query=$1&bs=1 [L]
|
||||
RewriteRule ^zamowienie/([a-zA-Z0-9-]*)$ index.php?module=shop_order&action=order_details&order_hash=$1 [L]
|
||||
RewriteRule ^potwierdzenie-platnosci/([a-zA-Z0-9-]*)$ index.php?module=shop_order&action=payment_confirmation&order_hash=$1 [L]
|
||||
RewriteRule ^tpay-status$ index.php?module=shop_order&action=payment_status_tpay [QSA,L]
|
||||
RewriteRule ^platnosc-status$ index.php?module=shop_order&action=payment_status_hotpay [QSA,L]
|
||||
RewriteRule ^przelewy24-status$ index.php?module=shop_order&action=payment_status_przelewy24pl [QSA,L]
|
||||
RewriteRule ^koszyk$ index.php?module=shop_basket&action=main_view [L]
|
||||
RewriteRule ^koszyk-podsumowanie$ index.php?module=shop_basket&action=summary_view [L]
|
||||
RewriteRule ^zloz-zamowienie$ index.php?module=shop_basket&action=basket_save [L]
|
||||
RewriteRule ^rejestracja$ index.php?module=shop_client&action=register_form [L]
|
||||
RewriteRule ^logowanie$ index.php?module=shop_client&action=login_form [L]
|
||||
RewriteRule ^wylogowanie$ index.php?module=shop_client&action=logout [L]
|
||||
RewriteRule ^odzyskiwanie-hasla$ index.php?module=shop_client&action=recover_password [L]
|
||||
RewriteRule ^panel-klienta/zamowienia$ index.php?module=shop_client&action=client_orders [L]
|
||||
RewriteRule ^panel-klienta/adresy$ index.php?module=shop_client&action=client_addresses [L]
|
||||
RewriteRule ^panel-klienta/nowy-adres$ index.php?module=shop_client&action=address_edit [L]
|
||||
RewriteRule ^panel-klienta/edytuj-adres/([0-9]*)$ index.php?module=shop_client&action=address_edit&id=$1 [L]
|
||||
RewriteRule ^panel-klienta/usun-adres/([0-9]*)$ index.php?module=shop_client&action=address_delete&id=$1 [L]
|
||||
RewriteRule ^thumb/([0-9]*)/([0-9]*)/(.*)$ /libraries/thumb.php?img=$3&w=$1&h=$2 [L]
|
||||
|
||||
RewriteCond %{REQUEST_URI} ^/shopBasket/(.*)/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)/(.*)$ index.php?module=$1&action=$2&$3 [L]
|
||||
RewriteCond %{REQUEST_URI} ^/shopClient/(.*)/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)/(.*)$ index.php?module=$1&action=$2&$3 [L]
|
||||
RewriteCond %{REQUEST_URI} ^/shopProduct/(.*)/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)/(.*)$ index.php?module=$1&action=$2&$3 [L]
|
||||
RewriteCond %{REQUEST_URI} ^/shopCoupon/(.*)/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)/(.*)$ index.php?module=$1&action=$2&$3 [L]
|
||||
RewriteCond %{REQUEST_URI} ^/search/(.*)/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)/(.*)$ index.php?module=$1&action=$2&$3 [L]
|
||||
|
||||
RewriteCond %{REQUEST_URI} ^/shopBasket/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)$ index.php?module=$1&action=$2 [L]
|
||||
RewriteCond %{REQUEST_URI} ^/shopClient/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)$ index.php?module=$1&action=$2 [L]
|
||||
RewriteCond %{REQUEST_URI} ^/shopProduct/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)$ index.php?module=$1&action=$2 [L]
|
||||
RewriteCond %{REQUEST_URI} ^/shopCoupon/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)$ index.php?module=$1&action=$2 [L]
|
||||
RewriteCond %{REQUEST_URI} ^/search/(.*) [NC]
|
||||
RewriteRule ^([^/]*)/([^/]*)$ index.php?module=$1&action=$2 [L]
|
||||
|
||||
RewriteCond %{THE_REQUEST} ^[A-Z]{3,9}\ /index.php
|
||||
RewriteRule ^ /%1 [R=301,L]
|
||||
{HTACCESS_CACHE}
|
||||
<Files *.conf>
|
||||
Order Deny,Allow
|
||||
Deny from all
|
||||
</Files>
|
||||
<Files *.log>
|
||||
Order Deny,Allow
|
||||
Deny from all
|
||||
</Files>
|
||||
<Files *.ini>
|
||||
Order Deny,Allow
|
||||
Deny from all
|
||||
</Files>
|
||||
5
migrations/0.329.sql
Normal file
5
migrations/0.329.sql
Normal file
@@ -0,0 +1,5 @@
|
||||
ALTER TABLE pp_routes
|
||||
ADD COLUMN category_id INT NULL AFTER product_id,
|
||||
ADD COLUMN page_id INT NULL AFTER category_id,
|
||||
ADD COLUMN article_id INT NULL AFTER page_id,
|
||||
ADD COLUMN type VARCHAR(20) NULL AFTER article_id;
|
||||
@@ -513,7 +513,7 @@ class ArticleRepositoryTest extends TestCase
|
||||
$mockDb = $this->createMock(\medoo::class);
|
||||
$deleteCalls = [];
|
||||
|
||||
$mockDb->expects($this->exactly(5))
|
||||
$mockDb->expects($this->exactly(6))
|
||||
->method('delete')
|
||||
->willReturnCallback(function ($table, $where) use (&$deleteCalls) {
|
||||
$deleteCalls[] = ['table' => $table, 'where' => $where];
|
||||
@@ -524,12 +524,13 @@ class ArticleRepositoryTest extends TestCase
|
||||
$result = $repository->deletePermanently(77);
|
||||
|
||||
$this->assertTrue($result);
|
||||
$this->assertCount(5, $deleteCalls);
|
||||
$this->assertCount(6, $deleteCalls);
|
||||
$this->assertSame('pp_articles_pages', $deleteCalls[0]['table']);
|
||||
$this->assertSame('pp_articles_langs', $deleteCalls[1]['table']);
|
||||
$this->assertSame('pp_articles_images', $deleteCalls[2]['table']);
|
||||
$this->assertSame('pp_articles_files', $deleteCalls[3]['table']);
|
||||
$this->assertSame('pp_articles', $deleteCalls[4]['table']);
|
||||
$this->assertSame('pp_routes', $deleteCalls[4]['table']);
|
||||
$this->assertSame('pp_articles', $deleteCalls[5]['table']);
|
||||
}
|
||||
|
||||
public function testPagesSummaryForArticlesBuildsLabels(): void
|
||||
|
||||
@@ -175,14 +175,19 @@ class CategoryRepositoryTest extends TestCase
|
||||
$mockDb = $this->createMock(\medoo::class);
|
||||
|
||||
$mockDb->method('count')->willReturn(0);
|
||||
$mockDb->expects($this->once())
|
||||
$deleteCalls = [];
|
||||
$mockDb->expects($this->exactly(2))
|
||||
->method('delete')
|
||||
->with('pp_shop_categories', ['id' => 8])
|
||||
->willReturn(true);
|
||||
->willReturnCallback(function ($table, $where) use (&$deleteCalls) {
|
||||
$deleteCalls[] = ['table' => $table, 'where' => $where];
|
||||
return true;
|
||||
});
|
||||
|
||||
$repository = new CategoryRepository($mockDb);
|
||||
|
||||
$this->assertTrue($repository->categoryDelete(8));
|
||||
$this->assertSame('pp_shop_categories', $deleteCalls[0]['table']);
|
||||
$this->assertSame('pp_routes', $deleteCalls[1]['table']);
|
||||
}
|
||||
|
||||
public function testCategoryTitleReturnsEmptyWhenNotFound(): void
|
||||
|
||||
BIN
updates/0.30/ver_0.327.zip
Normal file
BIN
updates/0.30/ver_0.327.zip
Normal file
Binary file not shown.
25
updates/0.30/ver_0.327_manifest.json
Normal file
25
updates/0.30/ver_0.327_manifest.json
Normal file
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"changelog": "NEW - masowe usuwanie produktow w archiwum",
|
||||
"version": "0.327",
|
||||
"files": {
|
||||
"added": [
|
||||
|
||||
],
|
||||
"deleted": [
|
||||
|
||||
],
|
||||
"modified": [
|
||||
"admin/templates/product-archive/products-list-custom-script.php",
|
||||
"admin/templates/product-archive/products-list.php",
|
||||
"autoload/admin/Controllers/ProductArchiveController.php"
|
||||
]
|
||||
},
|
||||
"checksum_zip": "sha256:02e43a9b4bf13eab08d739cf710dcdc37ee242c62e991427980dc0f88e60e96a",
|
||||
"sql": [
|
||||
|
||||
],
|
||||
"date": "2026-02-27",
|
||||
"directories_deleted": [
|
||||
|
||||
]
|
||||
}
|
||||
BIN
updates/0.30/ver_0.328.zip
Normal file
BIN
updates/0.30/ver_0.328.zip
Normal file
Binary file not shown.
23
updates/0.30/ver_0.328_manifest.json
Normal file
23
updates/0.30/ver_0.328_manifest.json
Normal file
@@ -0,0 +1,23 @@
|
||||
{
|
||||
"changelog": "NEW - ikona kopiowania wartosci atrybutow w szczegolach zamowienia",
|
||||
"version": "0.328",
|
||||
"files": {
|
||||
"added": [
|
||||
|
||||
],
|
||||
"deleted": [
|
||||
|
||||
],
|
||||
"modified": [
|
||||
"admin/templates/shop-order/order-details-custom-script.php"
|
||||
]
|
||||
},
|
||||
"checksum_zip": "sha256:db8ddf18bc08ab7d194fbb8a9949f2366185f13cbfd64bec4ad7c600736ded20",
|
||||
"sql": [
|
||||
|
||||
],
|
||||
"date": "2026-02-27",
|
||||
"directories_deleted": [
|
||||
|
||||
]
|
||||
}
|
||||
BIN
updates/0.30/ver_0.329.zip
Normal file
BIN
updates/0.30/ver_0.329.zip
Normal file
Binary file not shown.
1
updates/0.30/ver_0.329_files.txt
Normal file
1
updates/0.30/ver_0.329_files.txt
Normal file
@@ -0,0 +1 @@
|
||||
F: ../libraries/htaccess.conf
|
||||
27
updates/0.30/ver_0.329_manifest.json
Normal file
27
updates/0.30/ver_0.329_manifest.json
Normal file
@@ -0,0 +1,27 @@
|
||||
{
|
||||
"changelog": "REFACT - routing kategorii, stron i artykulow przez pp_routes; blok routingu w index.php przed checkUrlParams(); Redis cache tras; nowe kolumny category_id/page_id/article_id/type w pp_routes",
|
||||
"version": "0.329",
|
||||
"files": {
|
||||
"added": [
|
||||
|
||||
],
|
||||
"deleted": [
|
||||
"libraries/htaccess.conf"
|
||||
],
|
||||
"modified": [
|
||||
"autoload/Domain/Article/ArticleRepository.php",
|
||||
"autoload/Domain/Category/CategoryRepository.php",
|
||||
"autoload/Domain/Pages/PagesRepository.php",
|
||||
"autoload/Shared/Helpers/Helpers.php",
|
||||
"index.php"
|
||||
]
|
||||
},
|
||||
"checksum_zip": "sha256:73b225b9d68d985ce44d79320350b6ef6fe602c30126a6bf322b8ab44eaab230",
|
||||
"sql": [
|
||||
"ALTER TABLE pp_routes\n ADD COLUMN category_id INT NULL AFTER product_id,\n ADD COLUMN page_id INT NULL AFTER category_id,\n ADD COLUMN article_id INT NULL AFTER page_id,\n ADD COLUMN type VARCHAR(20) NULL AFTER article_id"
|
||||
],
|
||||
"date": "2026-02-27",
|
||||
"directories_deleted": [
|
||||
|
||||
]
|
||||
}
|
||||
5
updates/0.30/ver_0.329_sql.txt
Normal file
5
updates/0.30/ver_0.329_sql.txt
Normal file
@@ -0,0 +1,5 @@
|
||||
ALTER TABLE pp_routes
|
||||
ADD COLUMN category_id INT NULL AFTER product_id,
|
||||
ADD COLUMN page_id INT NULL AFTER category_id,
|
||||
ADD COLUMN article_id INT NULL AFTER page_id,
|
||||
ADD COLUMN type VARCHAR(20) NULL AFTER article_id
|
||||
BIN
updates/0.30/ver_0.330.zip
Normal file
BIN
updates/0.30/ver_0.330.zip
Normal file
Binary file not shown.
23
updates/0.30/ver_0.330_manifest.json
Normal file
23
updates/0.30/ver_0.330_manifest.json
Normal file
@@ -0,0 +1,23 @@
|
||||
{
|
||||
"changelog": "REFACT - eliminacja htaccess.conf; Helpers::htacces() generuje .htaccess w calosci z PHP; 32 statyczne trasy systemowe w pp_routes (type='system'); dynamiczne trasy jezykowe i producentow w pp_routes; invalidacja cache Redis pp_routes:all po htacces()",
|
||||
"version": "0.330",
|
||||
"files": {
|
||||
"added": [
|
||||
|
||||
],
|
||||
"deleted": [
|
||||
|
||||
],
|
||||
"modified": [
|
||||
"index.php"
|
||||
]
|
||||
},
|
||||
"checksum_zip": "sha256:7e55f52c8d66a38231d3c19b65e70d1201af7a7fef0bfe69b1967fccae798bec",
|
||||
"sql": [
|
||||
|
||||
],
|
||||
"date": "2026-02-27",
|
||||
"directories_deleted": [
|
||||
|
||||
]
|
||||
}
|
||||
BIN
updates/0.30/ver_0.331.zip
Normal file
BIN
updates/0.30/ver_0.331.zip
Normal file
Binary file not shown.
23
updates/0.30/ver_0.331_manifest.json
Normal file
23
updates/0.30/ver_0.331_manifest.json
Normal file
@@ -0,0 +1,23 @@
|
||||
{
|
||||
"changelog": "FIX - getProductLayout: fallback categories_default zmieniony na status (produkty bez layoutu pobieraly szablon kategorii zamiast domyslnego)",
|
||||
"version": "0.331",
|
||||
"files": {
|
||||
"added": [
|
||||
|
||||
],
|
||||
"deleted": [
|
||||
|
||||
],
|
||||
"modified": [
|
||||
"autoload/Domain/Layouts/LayoutsRepository.php"
|
||||
]
|
||||
},
|
||||
"checksum_zip": "sha256:c5246fe62ee19ccdc0424b2836cb18543ef20aa4449eda295a358c6022583ed5",
|
||||
"sql": [
|
||||
|
||||
],
|
||||
"date": "2026-03-01",
|
||||
"directories_deleted": [
|
||||
|
||||
]
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
@@ -1,5 +1,5 @@
|
||||
<?
|
||||
$current_ver = 326;
|
||||
$current_ver = 331;
|
||||
|
||||
for ($i = 1; $i <= $current_ver; $i++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user