1 files changed, 20 insertions, 20 deletions

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index f6181f8a..41d49ce9 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -39,7 +39,8 @@ class item_Core {
       }
     }
 
-    $source->move_to($target);
+    $source->parent_id = $target->id;
+    $source->save();
 
     // If the target has no cover item, make this it.
     if ($target->album_cover_item_id == null)  {
@@ -59,7 +60,8 @@ class item_Core {
     $parent->save();
     graphics::generate($parent);
     $grand_parent = $parent->parent();
-    if ($grand_parent && $grand_parent->album_cover_item_id == null)  {
+    if ($grand_parent && access::can("edit", $grand_parent) &&
+        $grand_parent->album_cover_item_id == null)  {
       item::make_album_cover($parent);
     }
   }
@@ -78,24 +80,6 @@ class item_Core {
     graphics::generate($album);
   }
 
-  static function validate_no_slashes($input) {
-    if (strpos($input->value, "/") !== false) {
-      $input->add_error("no_slashes", 1);
-    }
-  }
-
-  static function validate_no_trailing_period($input) {
-    if (rtrim($input->value, ".") !== $input->value) {
-      $input->add_error("no_trailing_period", 1);
-    }
-  }
-
-  static function validate_url_safe($input) {
-    if (preg_match("/[^A-Za-z0-9-_]/", $input->value)) {
-      $input->add_error("not_url_safe", 1);
-    }
-  }
-
   /**
    * Sanitize a filename into something presentable as an item title
    * @param string $filename
@@ -173,4 +157,20 @@ class item_Core {
   static function root() {
     return model_cache::get("item", 1);
   }
+
+  /**
+   * Return a query to get a random Item_Model, with optional filters
+   *
+   * @param array   (optional) where tuple
+   */
+  static function random_query($where=null) {
+    // Pick a random number and find the item that's got nearest smaller number.
+    // This approach works best when the random numbers in the system are roughly evenly
+    // distributed so this is going to be more efficient with larger data sets.
+    return ORM::factory("item")
+      ->viewable()
+      ->where("rand_key", "<", ((float)mt_rand()) / (float)mt_getrandmax())
+      ->merge_where($where)
+      ->order_by("rand_key", "DESC");
+  }
 }
\ No newline at end of file