Skip to content

Refactor "strpos" and "substr" calls in federatedfilesharing app to improve code readability #39213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristophWurst merged 1 commit into from
Sep 27, 2023
Merged

Refactor "strpos" and "substr" calls in federatedfilesharing app to improve code readability #39213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions apps/federatedfilesharing/lib/AddressHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ public function compareAddresses($user1, $server1, $user2, $server2) {
* @return string
*/
public function removeProtocolFromUrl($url) {
if (strpos($url, 'https://') === 0) {
if (str_starts_with($url, 'https://')) {
return substr($url, strlen('https://'));
} elseif (strpos($url, 'http://') === 0) {
} elseif (str_starts_with($url, 'http://')) {
return substr($url, strlen('http://'));
}

Expand All @@ -146,8 +146,8 @@ public function removeProtocolFromUrl($url) {
* @return bool
*/
public function urlContainProtocol($url) {
if (strpos($url, 'https://') === 0 ||
strpos($url, 'http://') === 0) {
if (str_starts_with($url, 'https://') ||
str_starts_with($url, 'http://')) {
return true;
}

Expand Down
4 changes: 2 additions & 2 deletions apps/federatedfilesharing/lib/Notifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@ protected function createRemoteUser(string $cloudId, string $displayName = '') {
protected function getDisplayName(ICloudId $cloudId): string {
$server = $cloudId->getRemote();
$user = $cloudId->getUser();
if (strpos($server, 'http://') === 0) {
if (str_starts_with($server, 'http://')) {
$server = substr($server, strlen('http://'));
} elseif (strpos($server, 'https://') === 0) {
} elseif (str_starts_with($server, 'https://')) {
$server = substr($server, strlen('https://'));
}

Expand Down
2 changes: 1 addition & 1 deletion apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public function shareReceived(ICloudFederationShare $share) {
[$ownerUid, $remote] = $this->addressHandler->splitUserRemote($share->getOwner());
// for backward compatibility make sure that the remote url stored in the
// database ends with a trailing slash
if (substr($remote, -1) !== '/') {
if (!str_ends_with($remote, '/')) {
$remote = $remote . '/';
}

Expand Down