4 files changed, 71 insertions, 51 deletions

diff --git a/core/helpers/core.php b/core/helpers/core.php
index 944db71f..5e5a12a7 100644
--- a/core/helpers/core.php
+++ b/core/helpers/core.php
@@ -27,53 +27,4 @@ class core_Core {
       Router::$method = "index";
     }
   }
-
-  static function move_item($source, $target) {
-    access::required("edit", $source);
-    access::required("edit", $target);
-
-    $parent = $source->parent();
-    if ($parent->album_cover_item_id == $source->id) {
-      if ($parent->children_count() > 1) {
-        foreach ($parent->children(2) as $child) {
-          if ($child->id != $source->id) {
-            $new_cover_item = $child;
-            break;
-          }
-        }
-        core::make_album_cover($new_cover_item);
-      } else {
-        core::remove_album_cover($parent);
-      }
-    }
-
-    $source->move_to($target);
-
-    // If the target has no cover item, make this it.
-    if ($target->album_cover_item_id == null)  {
-      core::make_album_cover($source);
-    }
-  }
-
-  function make_album_cover($item) {
-    $parent = $item->parent();
-    access::required("edit", $parent);
-
-    $parent->album_cover_item_id = $item->is_album() ? $item->album_cover_item_id : $item->id;
-    $parent->thumb_dirty = 1;
-    $parent->save();
-    graphics::generate($parent);
-  }
-
-  function remove_album_cover($album) {
-    access::required("edit", $album);
-    @unlink($album->thumb_path());
-
-    $album->album_cover_item_id = null;
-    $album->thumb_width = 0;
-    $album->thumb_height = 0;
-    $album->thumb_dirty = 1;
-    $album->save();
-    graphics::generate($album);
-  }
 }
\ No newline at end of file
diff --git a/core/helpers/item.php b/core/helpers/item.php
new file mode 100644
index 00000000..f5dd2cc2
--- /dev/null
+++ b/core/helpers/item.php
@@ -0,0 +1,69 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class item_Core {
+  static function move($source, $target) {
+    access::required("edit", $source);
+    access::required("edit", $target);
+
+    $parent = $source->parent();
+    if ($parent->album_cover_item_id == $source->id) {
+      if ($parent->children_count() > 1) {
+        foreach ($parent->children(2) as $child) {
+          if ($child->id != $source->id) {
+            $new_cover_item = $child;
+            break;
+          }
+        }
+        item::make_album_cover($new_cover_item);
+      } else {
+        item::remove_album_cover($parent);
+      }
+    }
+
+    $source->move_to($target);
+
+    // If the target has no cover item, make this it.
+    if ($target->album_cover_item_id == null)  {
+      item::make_album_cover($source);
+    }
+  }
+
+  function make_album_cover($item) {
+    $parent = $item->parent();
+    access::required("edit", $parent);
+
+    $parent->album_cover_item_id = $item->is_album() ? $item->album_cover_item_id : $item->id;
+    $parent->thumb_dirty = 1;
+    $parent->save();
+    graphics::generate($parent);
+  }
+
+  function remove_album_cover($album) {
+    access::required("edit", $album);
+    @unlink($album->thumb_path());
+
+    $album->album_cover_item_id = null;
+    $album->thumb_width = 0;
+    $album->thumb_height = 0;
+    $album->thumb_dirty = 1;
+    $album->save();
+    graphics::generate($album);
+  }
+}
\ No newline at end of file
diff --git a/core/helpers/movie.php b/core/helpers/movie.php
index 328429fe..30e4e995 100644
--- a/core/helpers/movie.php
+++ b/core/helpers/movie.php
@@ -94,7 +94,7 @@ class movie_Core {
 
     // If the parent has no cover item, make this it.
     if ($parent->album_cover_item_id == null)  {
-      core::make_album_cover($movie);
+      item::make_album_cover($movie);
     }
 
     return $movie;
diff --git a/core/helpers/photo.php b/core/helpers/photo.php
index 0677b7e1..c086393e 100644
--- a/core/helpers/photo.php
+++ b/core/helpers/photo.php
@@ -98,7 +98,7 @@ class photo_Core {
 
     // If the parent has no cover item, make this it.
     if ($parent->album_cover_item_id == null)  {
-      core::make_album_cover($photo);
+      item::make_album_cover($photo);
     }
 
     return $photo;