Update to image_block based on bharat's feedback

1) move the rand_key column into core
2) don't do a max rand, just try to a get a random number less than
the current random number if that doesn't successd look the other way

4 files changed, 7 insertions, 2 deletions

diff --git a/core/helpers/album.php b/core/helpers/album.php
index 620d5f14..c75095be 100644
--- a/core/helpers/album.php
+++ b/core/helpers/album.php
@@ -45,6 +45,7 @@ class album_Core {
     $album->owner_id = $owner_id;
     $album->thumb_dirty = 1;
     $album->resize_dirty = 1;
+    $album->rand_key = ((float)mt_rand()) / (float)mt_getrandmax();
 
     while (ORM::factory("item")
            ->where("parent_id", $parent->id)
diff --git a/core/helpers/core_installer.php b/core/helpers/core_installer.php
index 68b03a30..bf83c339 100644
--- a/core/helpers/core_installer.php
+++ b/core/helpers/core_installer.php
@@ -77,9 +77,11 @@ class core_installer {
                    `updated` int(9) default NULL,
                    `view_count` int(9) default 0,
                    `width` int(9) default NULL,
+                   `rand_key` float default NULL,
                    PRIMARY KEY (`id`),
                    KEY `parent_id` (`parent_id`),
-                   KEY `type` (`type`))
+                   KEY `type` (`type`),
+                   KEY `random` (`rand_key` DESC))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
       $db->query("CREATE TABLE `logs` (
@@ -119,7 +121,7 @@ class core_installer {
                    PRIMARY KEY (`id`),
                    UNIQUE KEY(`name`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
-
+      
       $db->query("CREATE TABLE `permissions` (
                    `id` int(9) NOT NULL auto_increment,
                    `name` varchar(64) default NULL,
diff --git a/core/helpers/movie.php b/core/helpers/movie.php
index 22a1c62d..b964e383 100644
--- a/core/helpers/movie.php
+++ b/core/helpers/movie.php
@@ -63,6 +63,7 @@ class movie_Core {
     $movie->mime_type = strtolower($pi["extension"]) == "mp4" ? "video/mp4" : "video/x-flv";
     $movie->thumb_dirty = 1;
     $movie->resize_dirty = 1;
+    $movie->rand_key = ((float)mt_rand()) / (float)mt_getrandmax();
 
     // Randomize the name if there's a conflict
     while (ORM::Factory("item")
diff --git a/core/helpers/photo.php b/core/helpers/photo.php
index 423c1973..c98af2f9 100644
--- a/core/helpers/photo.php
+++ b/core/helpers/photo.php
@@ -63,6 +63,7 @@ class photo_Core {
     $photo->mime_type = empty($image_info['mime']) ? "application/unknown" : $image_info['mime'];
     $photo->thumb_dirty = 1;
     $photo->resize_dirty = 1;
+    $photo->rand_key = ((float)mt_rand()) / (float)mt_getrandmax();
 
     // Randomize the name if there's a conflict
     while (ORM::Factory("item")