Add item::validate_url_safe() with a test.

2 files changed, 23 insertions, 0 deletions

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index bf948731..7ce6519e 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -90,6 +90,13 @@ class item_Core {
     }
   }
 
+  static function validate_url_safe($input) {
+    if (preg_match("/[^A-Za-z0-9-_]/", $input->value)) {
+      $input->add_error("not_url_safe", 1);
+    }
+    Kohana::log("alert",print_r($input,1));
+  }
+
   static function validate_no_name_conflict($input) {
     $itemid = Input::instance()->post("item");
     if (is_array($itemid)) {
diff --git a/modules/gallery/tests/Item_Helper_Test.php b/modules/gallery/tests/Item_Helper_Test.php
index 3f80733f..87859565 100644
--- a/modules/gallery/tests/Item_Helper_Test.php
+++ b/modules/gallery/tests/Item_Helper_Test.php
@@ -38,6 +38,16 @@ class Item_Helper_Test extends Unit_Test_Case {
       ORM::factory("item")->viewable()->where("id", $item->id)->count_all());
   }
 
+  public function validate_url_safe_test() {
+    $input = new MockInput();
+    $input->value = "Ab_cd-ef-d9";
+    item::validate_url_safe($input);
+    $this->assert_true(!isset($input->not_url_safe));
+
+    $input->value = "ab&cd";
+    item::validate_url_safe($input);
+    $this->assert_equal(1, $input->not_url_safe);
+  }
 
   private static function _create_random_item($album) {
     // Set all required fields (values are irrelevant)
@@ -47,3 +57,9 @@ class Item_Helper_Test extends Unit_Test_Case {
     return $item->add_to_parent($album);
   }
 }
+
+class MockInput {
+  function add_error($error, $value) {
+    $this->$error = $value;
+  }
+}
\ No newline at end of file