stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-30 11:40:43 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

#2057 - Revise item name and slug validation - backslashes, refactor, error messages.

Browse Source 
- disallowed backslashes in item validation.
- refactored the validation logic in the item model a bit.
- added no_backslash error messages in edit album/photo/movie forms.
- fixed error messages in add album forum (some missing, some text different from edit)
- added unit tests
- updated to v58 to correct any existing backslashes in item names
This commit is contained in:
shadlaws
2013-03-12 12:14:34 +01:00
parent cb8a63bb48
commit ed20798b99
8 changed files with 104 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/tests/Item_Model_Test.php
+44 -1
View File
@@ -124,13 +124,56 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
$this->assert_equal($fullsize_file, file_get_contents($photo->file_path()));
}
public function item_rename_wont_accept_slash_test() {
public function photo_rename_wont_accept_slash_test() {
$item = test::random_photo();
$item->name = "/no_slashes/allowed/";
$item->save();
$this->assert_equal("no_slashes_allowed.jpg", $item->name);
}
public function photo_rename_wont_accept_backslash_test() {
$item = test::random_photo();
$item->name = "\\no_backslashes\\allowed\\";
$item->save();
$this->assert_equal("no_backslashes_allowed.jpg", $item->name);
}
public function album_rename_wont_accept_slash_test() {
try {
$item = test::random_album();
$item->name = "/no_album_slashes/allowed/";
$item->save();
} catch (ORM_Validation_Exception $e) {
$this->assert_same(array("name" => "no_slashes"), $e->validation->errors());
return; // pass
}
$this->assert_true(false, "Shouldn't get here");
}
public function album_rename_wont_accept_backslash_test() {
try {
$item = test::random_album();
$item->name = "\\no_album_backslashes\\allowed\\";
$item->save();
} catch (ORM_Validation_Exception $e) {
$this->assert_same(array("name" => "no_backslashes"), $e->validation->errors());
return; // pass
}
$this->assert_true(false, "Shouldn't get here");
}
public function album_rename_wont_accept_trailing_period_test() {
try {
$item = test::random_album();
$item->name = ".no_trailing_period.allowed.";
$item->save();
} catch (ORM_Validation_Exception $e) {
$this->assert_same(array("name" => "no_trailing_period"), $e->validation->errors());
return; // pass
}
$this->assert_true(false, "Shouldn't get here");
}
public function move_album_test() {
$album2 = test::random_album();
$album1 = test::random_album($album2);