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

fix: potential bug with pretty urls

Browse source
This commit is contained in:
grandeljay 2023-09-20 19:35:42 +02:00
parent 7e951c1d7e
commit 092168e845
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,6 +61,18 @@ class URL
public function __construct(string $url) public function __construct(string $url)
{ {
$this->url = urldecode($url); $this->url = urldecode($url);
$this->url = str_replace('index.php', '', $this->url);
while (\str_contains($this->url, '//')) {
$this->url = \str_replace('//', '/', $this->url);
}
if (1 === \preg_match('/(http|https):\//', $this->url, $matches)) {
$match = $matches[0] ?? '';
$protocol = $matches[1] ?? $_SERVER['REQUEST_SCHEME'] ?? 'http';
$this->url = str_replace($match, $protocol . '://', $this->url);
}
$_GET = $this->getGET(); $_GET = $this->getGET();
} }
@ -87,7 +99,7 @@ class URL
public function getPermalink(): string public function getPermalink(): string
{ {
$htaccess = preg_split('/\r\n|\r|\n/', file_get_contents(ROOT . '/.htaccess')); $htaccess = preg_split('/\r\n|\r|\n/', file_get_contents(ROOT . '/.htaccess'));
$permalink = ''; $permalink = $this->url;
foreach ($htaccess as $index => $line) { foreach ($htaccess as $index => $line) {
$parts = explode(chr(32), trim($line)); $parts = explode(chr(32), trim($line));
@ -95,7 +107,7 @@ class URL
if (count($parts) >= 2) { if (count($parts) >= 2) {
switch ($parts[0]) { switch ($parts[0]) {
case 'RewriteRule': case 'RewriteRule':
$rewriteRule = $parts[1]; $rewriteRule = \substr($parts[1], 1);
$target = $parts[2]; $target = $parts[2];
$regex = str_replace('/', '\/', $rewriteRule); $regex = str_replace('/', '\/', $rewriteRule);