Add support for a per-item "slug" which will be the user-visible url

component for that given item.  Album hierarchies are represented by
nested slugs.  By default, we convert the filename to a slug when you
create an album, photo or movie.

1 files changed, 14 insertions, 3 deletions

diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index ec975cb0..59bf5c19 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -31,10 +31,11 @@ class movie_Core {
    * @param string  $name the filename to use for this photo in the album
    * @param integer $title the title of the new photo
    * @param string  $description (optional) the longer description of this photo
+   * @param string  $slug (optional) the url component for this photo
    * @return Item_Model
    */
   static function create($parent, $filename, $name, $title,
-                         $description=null, $owner_id=null) {
+                         $description=null, $owner_id=null, $slug=null) {
     if (!$parent->loaded || !$parent->is_album()) {
       throw new Exception("@todo INVALID_PARENT");
     }
@@ -67,6 +68,10 @@ class movie_Core {
       $name .= "." . $pi["extension"];
     }
 
+    if (empty($slug)) {
+      $slug = item::convert_filename_to_slug($name);
+    }
+
     $movie = ORM::factory("item");
     $movie->type = "movie";
     $movie->title = $title;
@@ -79,15 +84,21 @@ class movie_Core {
     $movie->thumb_dirty = 1;
     $movie->resize_dirty = 1;
     $movie->sort_column = "weight";
+    $movie->slug = $slug;
     $movie->rand_key = ((float)mt_rand()) / (float)mt_getrandmax();
 
     // Randomize the name if there's a conflict
+    // @todo Improve this.  Random numbers are not user friendly
     while (ORM::factory("item")
            ->where("parent_id", $parent->id)
+           ->open_paren()
            ->where("name", $movie->name)
+           ->orwhere("slug", $movie->slug)
+           ->close_paren()
            ->find()->id) {
-      // @todo Improve this.  Random numbers are not user friendly
-      $movie->name = rand() . "." . $pi["extension"];
+      $rand = rand();
+      $movie->name = "{$name}.$rand.{$pi['extension']}";
+      $movie->slug = "{$slug}-$rand";
     }
 
     // This saves the photo