Return ETags with browse() API method.

horde · Aug 29, 2014 · 5f22852 · 5f22852
1 parent e8380e4
commit 5f22852
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 7 deletions.
diff --git a/ansel/docs/CHANGES b/ansel/docs/CHANGES
@@ -2,6 +2,7 @@
 v3.0.2-git
 ----------
 
+[jan] Return ETags with browse() API method.
 [mjr] Fix fatal divide by zero error due to incorrectly named variable.
 [jan] Fix type of ansel_shares_users.user_uid column.
 [jan] Fix watermark font size preference.

diff --git a/ansel/lib/Api.php b/ansel/lib/Api.php
@@ -153,14 +153,17 @@ public function browse($path = '', array $properties = array())
                     $results[$retpath]['contenttype'] = $image['type'];
                 }
                 if (in_array('contentlength', $properties)) {
-                    $results[$retpath]['contentlength'] = 0;
+                    $results[$retpath]['contentlength'] = 1;
                 }
                 if (in_array('modified', $properties)) {
                     $results[$retpath]['modified'] = $image['uploaded'];
                 }
                 if (in_array('created', $properties)) {
                     $results[$retpath]['created'] = $image['uploaded'];
                 }
+                if (in_array('etag', $properties)) {
+                    $results[$retpath]['etag'] = '"' . md5($imageId . '|' . $image['uploaded']) . '"';
+                }
             }
             return $results;
 

diff --git a/ansel/package.xml b/ansel/package.xml
@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
+* [jan] Return ETags with browse() API method.
 * [mjr] Fix fatal divide by zero error due to incorrectly named variable.
 * [jan] Fix type of ansel_shares_users.user_uid column.
 * [jan] Fix watermark font size preference.
@@ -1349,6 +1350,7 @@
    <date>2014-02-24</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [jan] Return ETags with browse() API method.
 * [mjr] Fix fatal divide by zero error due to incorrectly named variable.
 * [jan] Fix type of ansel_shares_users.user_uid column.
 * [jan] Fix watermark font size preference.

diff --git a/kronolith/docs/CHANGES b/kronolith/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.3.0-git
 ----------
 
+[jan] Return ETags with browse() API method.
 [jan] Add importing of calendar data from a URL.
 
 

diff --git a/kronolith/lib/Api.php b/kronolith/lib/Api.php
@@ -184,6 +184,10 @@ public function browse($path = '', $properties = array())
             foreach ($events as $dayevents) {
                 foreach ($dayevents as $event) {
                     $key = 'kronolith/' . $path . '/' . $event->id;
+                    if (in_array('modified', $properties) ||
+                        in_array('etag', $properties)) {
+                        $modified = $this->modified($event->uid);
+                    }
                     if (in_array('name', $properties)) {
                         $results[$key]['name'] = $event->getTitle();
                     }
@@ -207,11 +211,14 @@ public function browse($path = '', $properties = array())
                         $results[$key]['contentlength'] = 1;
                     }
                     if (in_array('modified', $properties)) {
-                        $results[$key]['modified'] = $this->modified($event->uid);
+                        $results[$key]['modified'] = $modified;
                     }
                     if (in_array('created', $properties)) {
                         $results[$key]['created'] = $this->getActionTimestamp($event->uid, 'add');
                     }
+                    if (in_array('etag', $properties)) {
+                        $results[$key]['etag'] = '"' . md5($event->id . '|' . $modified) . '"';
+                    }
                 }
             }
             return $results;

diff --git a/kronolith/package.xml b/kronolith/package.xml
@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
+* [jan] Return ETags with browse() API method.
 * [jan] Add importing of calendar data from a URL.
  </notes>
  <contents>
@@ -2441,6 +2442,7 @@
    <date>2014-06-04</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [jan] Return ETags with browse() API method.
 * [jan] Add importing of calendar data from a URL.
    </notes>
   </release>

diff --git a/mnemo/docs/CHANGES b/mnemo/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.3.0-git
 ----------
 
+[jan] Return ETags with browse() API method.
 [jan] Add browse(), put(), and path_delete() methods to API to support WebDAV
       access.
 

diff --git a/mnemo/lib/Api.php b/mnemo/lib/Api.php
@@ -189,6 +189,9 @@ public function browse($path = '', $properties = array())
                 if (in_array('created', $properties)) {
                     $results[$key]['created'] = isset($memo['created']) ? $memo['created'] : 0;
                 }
+                if (in_array('etag', $properties)) {
+                    $results[$key]['etag'] = '"' . md5($memo['memo_id'] . '|' . $this->_modified($memo)) . '"';
+                }
             }
             return $results;
         } else {

diff --git a/mnemo/package.xml b/mnemo/package.xml
@@ -27,6 +27,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/apache">ASL</license>
  <notes>
+* [jan] Return ETags with browse() API method.
 * [jan] Add browse(), put(), and path_delete() methods to API to support WebDAV access.
  </notes>
  <contents>
@@ -1246,6 +1247,7 @@
    <date>2014-05-06</date>
    <license uri="http://www.horde.org/licenses/apache">ASL</license>
    <notes>
+* [jan] Return ETags with browse() API method.
 * [jan] Add browse(), put(), and path_delete() methods to API to support WebDAV access.
    </notes>
   </release>

diff --git a/nag/docs/CHANGES b/nag/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.3.0-git
 ----------
 
+[jan] Return ETags with browse() API method.
 
 ----------
 v4.2.1

diff --git a/nag/lib/Api.php b/nag/lib/Api.php
@@ -376,6 +376,10 @@ public function browse($path = '', $properties = array())
             $storage->tasks->reset();
             while ($task = $storage->tasks->each()) {
                 $key = 'nag/' . $parts[0] . '/' . $parts[1] . '/' . $task->id;
+                if (in_array('modified', $properties) ||
+                    in_array('etag', $properties)) {
+                    $modified = $this->modified($task->uid, $parts[1]);
+                }
                 if (in_array('name', $properties)) {
                     $results[$key]['name'] = $task->name;
                 }
@@ -398,11 +402,14 @@ public function browse($path = '', $properties = array())
                     $results[$key]['contentlength'] = 1;
                 }
                 if (in_array('modified', $properties)) {
-                    $results[$key]['modified'] = $this->modified($task->uid, $parts[1]);
+                    $results[$key]['modified'] = $modified;
                 }
                 if (in_array('created', $properties)) {
                     $results[$key]['created'] = $this->getActionTimestamp($task->uid, 'add', $parts[1]);
                 }
+                if (in_array('etag', $properties)) {
+                    $results[$key]['etag'] = '"' . md5($task->id . '|' . $modified) . '"';
+                }
             }
             return $results;
         } else {

diff --git a/nag/package.xml b/nag/package.xml
@@ -33,7 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
-*
+* [jan] Return ETags with browse() API method.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1587,7 +1587,7 @@
    <date>2014-06-04</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
-*
+* [jan] Return ETags with browse() API method.
    </notes>
   </release>
  </changelog>

diff --git a/turba/docs/CHANGES b/turba/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.3.0-git
 ----------
 
+[jan] Return ETags with browse() API method.
 [jan] Support multi-value RDNs in LDAP DN attributes (horde@iotti.biz, Request
       #11889).
 

diff --git a/turba/lib/Api.php b/turba/lib/Api.php
@@ -188,7 +188,7 @@ public function getGalUid()
      * @throws Horde_Exception_NotFound
      */
     public function browse($path = '',
-                          $properties = array('name', 'icon', 'browseable'))
+                           $properties = array('name', 'icon', 'browseable'))
     {
         global $injector, $registry, $session;
 
@@ -360,11 +360,14 @@ public function browse($path = '',
                     $results[$key]['contentlength'] = strlen($data);
                 }
                 if (in_array('modified', $properties)) {
-                    $results[$key]['modified'] = $this->_modified($contact->getValue('__uid'), $parts[1]);
+                    $results[$key]['modified'] = $contact->lastModification();
                 }
                 if (in_array('created', $properties)) {
                     $results[$key]['created'] = $this->getActionTimestamp($contact->getValue('__uid'), 'add', $parts[1]);
                 }
+                if (in_array('etag', $properties)) {
+                    $results[$key]['etag'] = '"' . md5($contact->getValue('__key') . '|' . $contact->lastModification()) . '"';
+                }
             }
 
             return $results;

diff --git a/turba/package.xml b/turba/package.xml
@@ -39,6 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/apache">ASL</license>
  <notes>
+* [jan] Return ETags with browse() API method.
 * [jan] Support multi-value RDNs in LDAP DN attributes (horde@iotti.biz, Request #11889).
  </notes>
  <contents>