upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Refactors "strpos" calls in /apps/settings to improve code readability.

Browse source 
Signed-off-by: Faraz Samapoor <f.samapoor@gmail.com>
This commit is contained in:
Faraz Samapoor 2023-06-02 14:33:10 +03:30 committed by Côme Chilliet
parent 91686e014e
commit ff0b3feb2e
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/settings/lib/Controller/CheckSetupController.php
View file

@ -291,7 +291,7 @@ class CheckSetupController extends Controller {
}
// Check if at least OpenSSL after 1.01d or 1.0.2b
if (strpos($versionString, 'OpenSSL/') === 0) {
if (str_starts_with($versionString, 'OpenSSL/')) {
$majorVersion = substr($versionString, 8, 5);
$patchRelease = substr($versionString, 13, 6);
@ -302,7 +302,7 @@ class CheckSetupController extends Controller {
}
// Check if NSS and perform heuristic check
if (strpos($versionString, 'NSS/') === 0) {
if (str_starts_with($versionString, 'NSS/')) {
try {
$firstClient = $this->clientService->newClient();
$firstClient->get('https://nextcloud.com/');
@ -393,7 +393,7 @@ class CheckSetupController extends Controller {
*/
private function isSettimelimitAvailable() {
if (function_exists('set_time_limit')
&& strpos(ini_get('disable_functions'), 'set_time_limit') === false) {
&& !str_contains(ini_get('disable_functions'), 'set_time_limit')) {
return true;
}
@ -577,7 +577,7 @@ Raw output
}
protected function isSqliteUsed() {
return strpos($this->config->getSystemValue('dbtype'), 'sqlite') !== false;
return str_contains($this->config->getSystemValue('dbtype'), 'sqlite');
}
protected function isReadOnlyConfig(): bool {

2
apps/settings/lib/Search/AppSearch.php
View file

@ -83,7 +83,7 @@ class AppSearch implements IProvider {
continue;
}
if (strpos($query->getRoute(), $entry['id'] . '.') === 0) {
if (str_starts_with($query->getRoute(), $entry['id'] . '.')) {
// Skip the current app, unlikely this is intended
continue;
}

4
apps/settings/lib/Settings/Personal/PersonalInfo.php
View file

@ -333,8 +333,8 @@ class PersonalInfo implements ISettings {
$userLocale = reset($userLocale);
}
$localesForLanguage = array_values(array_filter($localeCodes, fn ($localeCode) => strpos($localeCode['code'], $userLang) === 0));
$otherLocales = array_values(array_filter($localeCodes, fn ($localeCode) => strpos($localeCode['code'], $userLang) !== 0));
$localesForLanguage = array_values(array_filter($localeCodes, fn ($localeCode) => str_starts_with($localeCode['code'], $userLang)));
$otherLocales = array_values(array_filter($localeCodes, fn ($localeCode) => !str_starts_with($localeCode['code'], $userLang)));
if (!$userLocale) {
$userLocale = [

2
apps/settings/lib/SetupChecks/SupportedDatabase.php
View file

@ -68,7 +68,7 @@ class SupportedDatabase {
$row = $result->fetch();
$version = strtolower($row['Value']);
if (strpos($version, 'mariadb') !== false) {
if (str_contains($version, 'mariadb')) {
if (version_compare($version, '10.2', '<')) {
$this->description = $this->l10n->t('MariaDB version "%s" is used. Nextcloud 21 and higher do not support this version and require MariaDB 10.2 or higher.', $row['Value']);
return;