Export nicer display names for users and resources via WebDAV.

Conflicts: mnemo/lib/Api.php
horde · Oct 29, 2014 · 934c294 · 934c294
1 parent 755c609
commit 934c294
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/kronolith/lib/Api.php b/kronolith/lib/Api.php
@@ -84,7 +84,10 @@ public function browse($path = '', $properties = array())
             foreach (array_keys($owners) as $owner) {
                 $path = 'kronolith/' . $owner;
                 if (in_array('name', $properties)) {
-                    $results[$path]['name'] = $owner;
+                    $results[$path]['name'] = $injector
+                        ->getInstance('Horde_Core_Factory_Identity')
+                        ->create($owner)
+                        ->getName();
                 }
                 if (in_array('icon', $properties)) {
                     $results[$path]['icon'] = Horde_Themes::img('user.png');

diff --git a/nag/lib/Api.php b/nag/lib/Api.php
@@ -270,7 +270,10 @@ public function browse($path = '', $properties = array())
             $results = array();
             foreach (array_keys($owners) as $owner) {
                 if (in_array('name', $properties)) {
-                    $results['nag/' . $owner]['name'] = $owner;
+                    $results['nag/' . $owner]['name'] = $injector
+                        ->getInstance('Horde_Core_Factory_Identity')
+                        ->create($owner)
+                        ->getName();
                 }
                 if (in_array('icon', $properties)) {
                     $results['nag/' . $owner]['icon'] = Horde_Themes::img('user.png');
@@ -302,6 +305,10 @@ public function browse($path = '', $properties = array())
                     $results[$retpath]['name'] = sprintf(_("Tasks from %s"), Nag::getLabel($tasklist));
                     $results[$retpath . '.ics']['name'] = Nag::getLabel($tasklist);
                 }
+                if (in_array('displayname', $properties)) {
+                    $results[$retpath]['displayname'] = Nag::getLabel($tasklist);
+                    $results[$retpath . '.ics']['displayname'] = Nag::getLabel($tasklist) . '.ics';
+                }
                 if (in_array('owner', $properties)) {
                     $results[$retpath]['owner'] = $tasklist->get('owner') ?: '-system-';
                     $results[$retpath . '.ics']['owner'] = $tasklist->get('owner') ?: '-system-';

diff --git a/turba/lib/Api.php b/turba/lib/Api.php
@@ -216,7 +216,10 @@ public function browse($path = '',
 
             foreach (array_keys($owners) as $owner) {
                 if (in_array('name', $properties)) {
-                    $results['turba/' . $owner]['name'] = $owner;
+                    $results['turba/' . $owner]['name'] = $injector
+                        ->getInstance('Horde_Core_Factory_Identity')
+                        ->create($owner)
+                        ->getName();
                 }
                 if (in_array('icon', $properties)) {
                     $results['turba/' . $owner]['icon'] = Horde_Themes::img('turba.png');
@@ -271,14 +274,15 @@ public function browse($path = '',
             $curpath = 'turba/' . $parts[0] . '/';
 
             foreach ($addressbooks as $addressbook => $info) {
+                $label = ($info instanceof Horde_Share_Object)
+                    ? $info->get('name')
+                    : $info['title'];
                 if (in_array('name', $properties)) {
                     $results[$curpath . $addressbook]['name'] =
-                        sprintf(
-                            _("Contacts from %s"),
-                            ($info instanceof Horde_Share_Object)
-                                ? $info->get('name')
-                                : $info['title']
-                        );
+                        sprintf(_("Contacts from %s"), $label);
+                }
+                if (in_array('displayname', $properties)) {
+                    $results[$curpath . $addressbook]['displayname'] = $label;
                 }
                 if (in_array('owner', $properties)) {
                     $results[$curpath . $addressbook]['owner'] = ($info instanceof Horde_Share_Object)