Refs #18. Doing an access check on TidypicsAlbum->getImageList() to only return image...

This is a simple fix, but requires an extra DB call for the first getImageList() call.

diff --git a/classes/TidypicsAlbum.php b/classes/TidypicsAlbum.php
index d069117bfe00fc2261a39b7ed59dad4bd32d7f53..3d7d12b32ee39a0a256e53443e28f273eec22d71 100644 (file)
--- a/classes/TidypicsAlbum.php
+++ b/classes/TidypicsAlbum.php
@@ -9,7 +9,6 @@
 
 
 class TidypicsAlbum extends ElggObject {
-
        /**
         * Sets the internal attributes
         */
@@ -186,6 +185,17 @@ class TidypicsAlbum extends ElggObject {
                        return array();
                }
                $list = unserialize($listString);
+
+               // check access levels
+               $guidsString = implode(',', $list);
+               $options = array(
+                       'wheres' => array("e.guid IN ($guidsString)"),
+                       'order_by' => "FIELD (e.guid, $guidsString)",
+                       'callback' => 'tp_guid_callback',
+                       'limit' => ELGG_ENTITIES_NO_VALUE
+               );
+               
+               $list = elgg_get_entities($options);
                return $list;
        }
 
@@ -211,7 +221,7 @@ class TidypicsAlbum extends ElggObject {
        }
 
        /**
-        * Get the previous image in the album
+        * Get the previous image in the album. Wraps around to the last image if given the first.
         *
         * @param int $guid GUID of the current image
         * @return TidypicsImage
@@ -230,7 +240,7 @@ class TidypicsAlbum extends ElggObject {
        }
 
        /**
-        * Get the next image in the album
+        * Get the next image in the album. Wraps around to the first image if given the last.
         *
         * @param int $guid GUID of the current image
         * @return TidypicsImage
@@ -282,9 +292,10 @@ class TidypicsAlbum extends ElggObject {
 
        /**
         * Delete all the images in this album
+        *
+        * @todo ElggBatch?
         */
        protected function deleteImages() {
-               // get all the images from this album as long as less than 999 images
                $images = elgg_get_entities(array(
                        "type=" => "object",
                        "subtype" => "image",

diff --git a/lib/tidypics.php b/lib/tidypics.php
index 7426a048e399726efff58631662dfbd739ffbcf2..38c6b31a8dde43fb2db7209e00d0faec83b2d155 100644 (file)
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -190,6 +190,16 @@ function tidypics_list_photos(array $options = array()) {
        return elgg_view_entity_list($sorted_entities, $options);
 }
 
+/**
+ * Returns just a guid from a database $row. Used in elgg_get_entities()'s callback.
+ *
+ * @param stdClass $row
+ * @return type
+ */
+function tp_guid_callback($row) {
+       return ($row->guid) ? $row->guid : false;
+}
+
 
 /*********************************************************************
  * the functions below replace broken core functions or add functions