stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-08 12:39:17 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move photo/movie file extension validation into the model. Fixes #1524.

Browse Source
This commit is contained in:
Bharat Mediratta
2010-12-14 21:18:40 -08:00
parent d686654414
commit 79740a2c77
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/gallery/tests/Item_Model_Test.php
View File

@@ -431,4 +431,27 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
preg_match("|http://./var/thumbs/name_\d+/\.album\.jpg\?m=\d+|", $album->thumb_url()),
$album->thumb_url() . " is malformed");
}
public function legal_extension_test() {
foreach (array("test.gif", "test.GIF", "test.Gif", "test.jpeg", "test.JPG") as $name) {
$photo = test::random_photo_unsaved(item::root());
$photo->name = $name;
$photo->save();
}
}
public function illegal_extension_test() {
foreach (array("test.php", "test.PHP", "test.php5", "test.php4", "test.pl") as $name) {
try {
$photo = test::random_photo_unsaved(item::root());
$photo->name = $name;
$photo->save();
} catch (ORM_Validation_Exception $e) {
$this->assert_equal(array("name" => "illegal_data_file_extension"),
$e->validation->errors());
continue;
}
$this->assert_true(false, "Shouldn't get here");
}
}
}