diff options
Diffstat (limited to 'apps/federatedfilesharing/lib/AddressHandler.php')
| -rw-r--r-- | apps/federatedfilesharing/lib/AddressHandler.php | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/apps/federatedfilesharing/lib/AddressHandler.php b/apps/federatedfilesharing/lib/AddressHandler.php index 320f65c2b42..4588e6da288 100644 --- a/apps/federatedfilesharing/lib/AddressHandler.php +++ b/apps/federatedfilesharing/lib/AddressHandler.php @@ -11,6 +11,7 @@ use OCP\Federation\ICloudIdManager; use OCP\HintException; use OCP\IL10N; use OCP\IURLGenerator; +use OCP\Util; /** * Class AddressHandler - parse, modify and construct federated sharing addresses @@ -19,30 +20,18 @@ use OCP\IURLGenerator; */ class AddressHandler { - /** @var IL10N */ - private $l; - - /** @var IURLGenerator */ - private $urlGenerator; - - /** @var ICloudIdManager */ - private $cloudIdManager; - /** * AddressHandler constructor. * * @param IURLGenerator $urlGenerator - * @param IL10N $il10n + * @param IL10N $l * @param ICloudIdManager $cloudIdManager */ public function __construct( - IURLGenerator $urlGenerator, - IL10N $il10n, - ICloudIdManager $cloudIdManager + private IURLGenerator $urlGenerator, + private IL10N $l, + private ICloudIdManager $cloudIdManager, ) { - $this->l = $il10n; - $this->urlGenerator = $urlGenerator; - $this->cloudIdManager = $cloudIdManager; } /** @@ -86,12 +75,12 @@ class AddressHandler { if (rtrim($normalizedServer1, '/') === rtrim($normalizedServer2, '/')) { // FIXME this should be a method in the user management instead - \OCP\Util::emitHook( + Util::emitHook( '\OCA\Files_Sharing\API\Server2Server', 'preLoginNameUsedAsUserName', ['uid' => &$user1] ); - \OCP\Util::emitHook( + Util::emitHook( '\OCA\Files_Sharing\API\Server2Server', 'preLoginNameUsedAsUserName', ['uid' => &$user2] @@ -128,8 +117,8 @@ class AddressHandler { * @return bool */ public function urlContainProtocol($url) { - if (str_starts_with($url, 'https://') || - str_starts_with($url, 'http://')) { + if (str_starts_with($url, 'https://') + || str_starts_with($url, 'http://')) { return true; } |