Changed the way album and photo creation guards against duplicate

names.
Added similiar code to insure that path names are not duplicated.

2 files changed, 13 insertions, 0 deletions

diff --git a/core/tests/Album_Helper_Test.php b/core/tests/Album_Helper_Test.php
index d085ca88..75981265 100644
--- a/core/tests/Album_Helper_Test.php
+++ b/core/tests/Album_Helper_Test.php
@@ -43,6 +43,7 @@ class Album_Helper_Test extends Unit_Test_Case {
     $album1 = album::create($root, $rand, $rand, $rand);
     $album2 = album::create($root, $rand, $rand, $rand);
     $this->assert_true($album1->name != $album2->name);
+    $this->assert_true($album1->path != $album2->path);
   }
 
   public function thumb_url_test() {
diff --git a/core/tests/Photo_Helper_Test.php b/core/tests/Photo_Helper_Test.php
index 2219a846..5db63e49 100644
--- a/core/tests/Photo_Helper_Test.php
+++ b/core/tests/Photo_Helper_Test.php
@@ -53,6 +53,18 @@ class Photo_Helper_Test extends Unit_Test_Case {
     $photo1 = photo::create($root, DOCROOT . "core/tests/test.jpg", "$rand.jpg", $rand, $rand);
     $photo2 = photo::create($root, DOCROOT . "core/tests/test.jpg", "$rand.jpg", $rand, $rand);
     $this->assert_true($photo1->name != $photo2->name);
+    $this->assert_true($photo1->path != $photo2->path);
+  }
+
+  public function create_special_characters_in_name_test() {
+    $rand = rand();
+    $rand2 = rand();
+    $name = "$rand & $rand's.jpg";
+    $path = !empty($path) ? $path : preg_replace("/[^A-Za-z0-9\.\-_]/", "_", $name);
+    $root = ORM::factory("item", 1);
+    $photo = photo::create($root, DOCROOT . "core/tests/test.jpg", $name, $rand, $rand);
+    $this->assert_equal($name, $photo->name);
+    $this->assert_equal($path, $photo->path);
   }
 
   public function create_photo_with_no_extension_test() {