aboutsummaryrefslogtreecommitdiffstats
path: root/core/Controller
diff options
context:
space:
mode:
authorFaraz Samapoor <f.samapoor@gmail.com>2023-06-02 13:13:19 +0330
committerFaraz Samapoor <f.samapoor@gmail.com>2023-06-02 13:13:19 +0330
commita1ef0285f89112b8777eb47f3c34d07f111660b4 (patch)
treebd8791fd09d6c18e3859d44382de9ef0f8ead10e /core/Controller
parent09c5f997c6d185d8b23b37a996e7a1130a426d75 (diff)
downloadnextcloud-server-a1ef0285f89112b8777eb47f3c34d07f111660b4.tar.gz
nextcloud-server-a1ef0285f89112b8777eb47f3c34d07f111660b4.zip
Refactors "strpos" calls in /core to improve code readability.
Signed-off-by: Faraz Samapoor <f.samapoor@gmail.com>
Diffstat (limited to 'core/Controller')
-rw-r--r--core/Controller/ClientFlowLoginController.php4
-rw-r--r--core/Controller/ClientFlowLoginV2Controller.php4
-rw-r--r--core/Controller/CssController.php2
-rw-r--r--core/Controller/JsController.php2
-rw-r--r--core/Controller/LoginController.php2
-rw-r--r--core/Controller/NavigationController.php4
6 files changed, 9 insertions, 9 deletions
diff --git a/core/Controller/ClientFlowLoginController.php b/core/Controller/ClientFlowLoginController.php
index 85a793bd92b..2876621c97b 100644
--- a/core/Controller/ClientFlowLoginController.php
+++ b/core/Controller/ClientFlowLoginController.php
@@ -368,9 +368,9 @@ class ClientFlowLoginController extends Controller {
private function getServerPath(): string {
$serverPostfix = '';
- if (strpos($this->request->getRequestUri(), '/index.php') !== false) {
+ if (str_contains($this->request->getRequestUri(), '/index.php')) {
$serverPostfix = substr($this->request->getRequestUri(), 0, strpos($this->request->getRequestUri(), '/index.php'));
- } elseif (strpos($this->request->getRequestUri(), '/login/flow') !== false) {
+ } elseif (str_contains($this->request->getRequestUri(), '/login/flow')) {
$serverPostfix = substr($this->request->getRequestUri(), 0, strpos($this->request->getRequestUri(), '/login/flow'));
}
diff --git a/core/Controller/ClientFlowLoginV2Controller.php b/core/Controller/ClientFlowLoginV2Controller.php
index ef16cfbd04b..0c12f1a612f 100644
--- a/core/Controller/ClientFlowLoginV2Controller.php
+++ b/core/Controller/ClientFlowLoginV2Controller.php
@@ -363,9 +363,9 @@ class ClientFlowLoginV2Controller extends Controller {
private function getServerPath(): string {
$serverPostfix = '';
- if (strpos($this->request->getRequestUri(), '/index.php') !== false) {
+ if (str_contains($this->request->getRequestUri(), '/index.php')) {
$serverPostfix = substr($this->request->getRequestUri(), 0, strpos($this->request->getRequestUri(), '/index.php'));
- } elseif (strpos($this->request->getRequestUri(), '/login/v2') !== false) {
+ } elseif (str_contains($this->request->getRequestUri(), '/login/v2')) {
$serverPostfix = substr($this->request->getRequestUri(), 0, strpos($this->request->getRequestUri(), '/login/v2'));
}
diff --git a/core/Controller/CssController.php b/core/Controller/CssController.php
index 4cd2996835e..792be71f9e1 100644
--- a/core/Controller/CssController.php
+++ b/core/Controller/CssController.php
@@ -101,7 +101,7 @@ class CssController extends Controller {
private function getFile(ISimpleFolder $folder, string $fileName, bool &$gzip): ISimpleFile {
$encoding = $this->request->getHeader('Accept-Encoding');
- if (strpos($encoding, 'gzip') !== false) {
+ if (str_contains($encoding, 'gzip')) {
try {
$gzip = true;
return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
diff --git a/core/Controller/JsController.php b/core/Controller/JsController.php
index 885de5491e7..6b3e7ff2ed2 100644
--- a/core/Controller/JsController.php
+++ b/core/Controller/JsController.php
@@ -99,7 +99,7 @@ class JsController extends Controller {
private function getFile(ISimpleFolder $folder, string $fileName, bool &$gzip): ISimpleFile {
$encoding = $this->request->getHeader('Accept-Encoding');
- if (strpos($encoding, 'gzip') !== false) {
+ if (str_contains($encoding, 'gzip')) {
try {
$gzip = true;
return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index aa6617c4b6d..9c64204b898 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -275,7 +275,7 @@ class LoginController extends Controller {
$location = $this->urlGenerator->getAbsoluteURL($redirectUrl);
// Deny the redirect if the URL contains a @
// This prevents unvalidated redirects like ?redirect_url=:user@domain.com
- if (strpos($location, '@') === false) {
+ if (!str_contains($location, '@')) {
return new RedirectResponse($location);
}
}
diff --git a/core/Controller/NavigationController.php b/core/Controller/NavigationController.php
index 6b994ca33f1..a1c3f917fe3 100644
--- a/core/Controller/NavigationController.php
+++ b/core/Controller/NavigationController.php
@@ -94,10 +94,10 @@ class NavigationController extends OCSController {
*/
private function rewriteToAbsoluteUrls(array $navigation): array {
foreach ($navigation as &$entry) {
- if (0 !== strpos($entry['href'], $this->urlGenerator->getBaseUrl())) {
+ if (!str_starts_with($entry['href'], $this->urlGenerator->getBaseUrl())) {
$entry['href'] = $this->urlGenerator->getAbsoluteURL($entry['href']);
}
- if (0 !== strpos($entry['icon'], $this->urlGenerator->getBaseUrl())) {
+ if (!str_starts_with($entry['icon'], $this->urlGenerator->getBaseUrl())) {
$entry['icon'] = $this->urlGenerator->getAbsoluteURL($entry['icon']);
}
}