beenull/Pico
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Pico::evaluateRequestUrl(): Replace strpos()+substr() with strstr()

Browse source
This commit is contained in:
Daniel Rudolf 2016-10-05 14:17:10 +02:00
parent 3ebb51a55e
commit bea610dbf4
No known key found for this signature in database
GPG key ID: A061F02CD8DE4538
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Pico.php
View file

@ -699,9 +699,7 @@ class Pico
// use QUERY_STRING; e.g. /pico/?sub/page
$pathComponent = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
if (!empty($pathComponent)) {
if (($pathComponentLength = strpos($pathComponent, '&')) !== false) {
$pathComponent = substr($pathComponent, 0, $pathComponentLength);
}
$pathComponent = strstr($pathComponent, '&', true) ?: $pathComponent;
if (strpos($pathComponent, '=') === false) {
$this->requestUrl = trim(rawurldecode($pathComponent), '/');
}
@ -715,9 +713,7 @@ class Pico
$requestUri = $_SERVER['REQUEST_URI'];
if (substr($requestUri, 0, $basePathLength) === $basePath) {
$requestUri = substr($requestUri, $basePathLength);
if (($requestUriLength = strpos($requestUri, '?')) !== false) {
$requestUri = substr($requestUri, 0, $requestUriLength);
}
$requestUri = strstr($requestUri, '?', true) ?: $requestUri;
$this->requestUrl = rtrim(rawurldecode($requestUri), '/');
}
}