Skip to content

Add additional user profile attributes from LDAP #41793

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

Closed
slapcat wants to merge 12 commits into from
Closed

Add additional user profile attributes from LDAP #41793

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
932f979
Add additional user profile attributes from LDAP
slapcat Nov 28, 2023
5851625
remove extra spaces after line
slapcat Nov 28, 2023
a72c9b2
Remove adding X-NC-SCOPE to bday/anniversary in Contact card
slapcat Nov 29, 2023
aae76c0
change item3 to item1
slapcat Dec 2, 2023
3d11b21
resolve other conflicts
slapcat Dec 2, 2023
4a8ef67
Add new properties to AccountManagerTest
slapcat Dec 5, 2023
0a42734
- Convert biography to carddav NOTE field
slapcat Dec 27, 2023
dac4817
Add back scope as requested by @ChristophWurst
slapcat Dec 27, 2023
459355f
Fixing merged code
slapcat Feb 5, 2024
1a6ea57
Undo partial UI changes
slapcat Feb 5, 2024
7d0eef4
Clean up code merge markers
slapcat Feb 5, 2024
8868e52
Fix Anniversary carddav label
slapcat Feb 5, 2024
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
Prev Previous commit
Next Next commit
Remove adding X-NC-SCOPE to bday/anniversary in Contact card 
Signed-off-by: Jake Nabasny <[email protected]>
  • Loading branch information
@slapcat
slapcat committed Feb 5, 2024
commit a72c9b2bae164ebc1da205452363ac21a2a71b90
6 changes: 3 additions & 3 deletions apps/dav/lib/CardDAV/Converter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,12 @@ public function createCardFromUser(IUser $user): ?VCard {
$vCard->add(new Text($vCard, 'TITLE', $property->getValue(), ['X-NC-SCOPE' => $scope]));
break;
case IAccountManager::PROPERTY_BIRTHDATE:
$vCard->add(new Text($vCard, 'BDAY;VALUE=DATE', substr($property->getValue(), 0, 8), ['X-NC-SCOPE' => $scope]));
$vCard->add(new Text($vCard, 'BDAY', substr($property->getValue(), 0, 8), ['VALUE' => 'DATE']));
break;
case IAccountManager::PROPERTY_ANNIVERSARYDATE:
$vCard->add(new Text($vCard, 'ANNIVERSARY;VALUE=DATE', substr($property->getValue(), 0, 8), ['X-NC-SCOPE' => $scope]));
$vCard->add(new Text($vCard, 'ANNIVERSARY', substr($property->getValue(), 0, 8), ['VALUE' => 'DATE']));
/* iOS compatibility */
$vCard->add(new Text($vCard, 'ITEM3.X-ABDATE;TYPE=pref', substr($property->getValue(), 0, 8), ['X-NC-SCOPE' => $scope]));
$vCard->add(new Text($vCard, 'ITEM3.X-ABDATE', substr($property->getValue(), 0, 8), ['TYPE' => 'pref']));
$vCard->add(new Text($vCard, 'ITEM3.X-ABLABEL:_$!<Anniversary>!$_'));
break;
}
Expand Down