PrivateCoffee/wishthis
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: remove caret from rewrite rules

Browse source
This commit is contained in:
grandeljay 2023-09-27 10:19:00 +02:00
parent e0ce28b393
commit eed6a415a7
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.htaccess
View file

@ -8,23 +8,23 @@
RewriteCond %{REQUEST_FILENAME} !-d
# Page
RewriteRule ^([a-z\-]+)$ /index.php?page=$1 [QSA,L]
RewriteRule ([a-z\-]+)$ /index.php?page=$1 [QSA,L]
# Wishlists (My lists)
RewriteRule ^wishlists/([0-9]+)$ /index.php?page=wishlists&id=$1 [QSA,L]
RewriteRule ^wishlists/([0-9]+)/add$ /index.php?page=wishlists&id=$1&wish_add=true [QSA,L]
RewriteRule wishlists/([0-9]+)$ /index.php?page=wishlists&id=$1 [QSA,L]
RewriteRule wishlists/([0-9]+)/add$ /index.php?page=wishlists&id=$1&wish_add=true [QSA,L]
# Wishlist
RewriteRule ^wishlist/([0-9a-f]{40})$ /index.php?page=wishlist&hash=$1 [QSA,L]
RewriteRule wishlist/([0-9a-f]{40})$ /index.php?page=wishlist&hash=$1 [QSA,L]
# Blog Post
RewriteRule ^blog/([a-z\-0-9]+)$ /index.php?page=post&slug=$1 [QSA,L]
RewriteRule blog/([a-z\-0-9]+)$ /index.php?page=post&slug=$1 [QSA,L]
# API
RewriteRule ^api/([a-zA-Z\-0-9=]+)$ /index.php?page=api&module=$1 [QSA,L]
RewriteRule api/([a-zA-Z\-0-9=]+)$ /index.php?page=api&module=$1 [QSA,L]
RewriteRule ^api/statistics/([a-zA-Z0-9=]+)$ /index.php?page=api&module=statistics&table=$1 [QSA,L]
RewriteRule ^api/url/([a-zA-Z0-9=]+)$ /index.php?page=api&module=url&url=$1 [QSA,L]
RewriteRule ^api/wishlists/([0-9]+)$ /index.php?page=api&module=wishlists&wishlist_id=$1 [QSA,L]
RewriteRule ^api/wishlists/([0-9a-f]{40})$ /index.php?page=api&module=wishlists&wishlist_hash=$1 [QSA,L]
RewriteRule api/statistics/([a-zA-Z0-9=]+)$ /index.php?page=api&module=statistics&table=$1 [QSA,L]
RewriteRule api/url/([a-zA-Z0-9=]+)$ /index.php?page=api&module=url&url=$1 [QSA,L]
RewriteRule api/wishlists/([0-9]+)$ /index.php?page=api&module=wishlists&wishlist_id=$1 [QSA,L]
RewriteRule api/wishlists/([0-9a-f]{40})$ /index.php?page=api&module=wishlists&wishlist_hash=$1 [QSA,L]
</IfModule>

2
src/classes/wishthis/URL.php
View file

@ -107,7 +107,7 @@ class URL
if (count($parts) >= 2) {
switch ($parts[0]) {
case 'RewriteRule':
$rewriteRule = \substr($parts[1], 1);
$rewriteRule = $parts[1];
$target = $parts[2];
$regex = str_replace('/', '\/', $rewriteRule);