summaryrefslogtreecommitdiff
path: root/modules
AgeCommit message (Collapse)Author
2013-02-10#2000 - Make legal_file::smash_extensions more robust.shadlaws
- Fixed legal_file::smash_extensions. - Added new unit test. - Removed duplicated condition in existing unit test.
2013-02-09Merge pull request #130 from shadlaws/fix_1997Bharat Mediratta
#1997 - Correct movie dimensions and mime type improperly set by contributed modules.
2013-02-09Merge pull request #129 from shadlaws/fix_1996Bharat Mediratta
#1996 - Add blacklist to legal_file helper.
2013-02-09Merge pull request #128 from shadlaws/fix_1994Bharat Mediratta
#1994 - Make get_file_metadata throw an exception if photo or movie is unidentifiable/illegal.
2013-02-09#1997 - Update movie dimensions and mime type if previously set without FFmpeg.shadlaws
- Added code to check/correct movie width, height, and mime in graphics::generate. As the comment says in the commit, this isn't ideal, but doing it in an upgrade script wouldn't be very ideal either.
2013-02-08#1996 - Add blacklist to legal_file helper.shadlaws
Adding a blacklist to legal_file could prevent possible security holes arising from a contributed module that adds file types by user input (e.g. an admin screen).
2013-02-08#1994 - Make get_file_metadata throw an exception if photo or movie is ↵shadlaws
unidentifiable/illegal. - photo & movie helpers: modified to throw exceptions when file is known to be unidentifiable/illegal. - item model: revised to work with exceptions and be more explicit when the data file is invalid. - item model: removed duplicate get_file_metadata call for updated items. - admin_watermarks controller: revised to work with exceptions (really cleans up logic here). - graphics helper: revised to handle invalid placeholders (a nearly-impossible corner case, but still...). - photo & movie helper tests: revised to work with exceptions, added new tests for illegal files with valid extensions. - item model tests: revised to work with exceptions, added new tests for illegal files with valid extensions.
2013-02-08#1993 - Remove "failed" query string from upgrader redirect if there are no ↵shadlaws
errors. - Changed redirect if it finished without failures. - No change to Upgrader_Controller::index(), since its behavior with an empty vs. undefined failed query is identical.
2013-02-07Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-02-07Follow-on to 1e4d75c12072b49c3469f18af13bcf3439afc6b0 for #1975.Bharat Mediratta
Don't try to use an array index on a function return, that's not supported in PHP 5.3
2013-02-07#1992 - Improve examples for thumb/resize/file path/url functions in item model.shadlaws
Documentation-only changes to examples used in: - Item_Model::url - Item_Model::abs_url - Item_Model::file_path - Item_Model::file_url - Item_Model::resize_path - Item_Model::resize_url - Item_Model::thumb_path - Item_Model::thumb_url
2013-02-06Merge pull request #124 from shadlaws/fix_1991Bharat Mediratta
#1991 - Add options to graphics::mark_dirty to specify type and/or mime type
2013-02-06#1991 - Add options to graphics::mark_dirty to specify type and/or mime type.shadlaws
- graphics::mark_dirty - added $type and $mime_type as options. - graphics::mark_dirty - used options to set additional where conditions.
2013-02-06Follow-on to 949b8cda14ec037386da34c43248ebd60542f5da for #1982.shadlaws
- Add extra condition to Item_Model_Test::urls_test to test cache busters of missing files. - Previous commit fixes unit test for empty album url, but now no test checks missing files.
2013-02-05Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-02-05Force a sort order no sibling checks. Fixes #1990.Bharat Mediratta
2013-02-03Merge pull request #118 from shadlaws/fix_1982_followonBharat Mediratta
Follow-on to f83ed5f8716663a45c9d8e8118bbcf0e2849c3fb for #1982.
2013-02-02Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-02-02Create gallery::allow_css_and_js_combining() which lets you disable ↵Bharat Mediratta
combining CSS/JS by touching var/DONT_COMBINE. Fixes #1989.
2013-02-02Follow-in to 314e2e67b1d52b7d01a715d7a6680862bf83b987 for #1986.shadlaws
- Update xss_test golden file (change line numbers).
2013-02-02Follow-on to f83ed5f8716663a45c9d8e8118bbcf0e2849c3fb for #1982.shadlaws
- Fix unit test for album url since empty albums now have thumbnails.
2013-02-01 #1987 g2_import module should redirect with a 301, not 302Mike Miller
As the g2_import process is generally assumed to be permanent, the redirect should be a 301, and not a 302.
2013-02-01Fix ctrl-click behavior. Fixes #1986.Bharat Mediratta
2013-01-31Follow-on to 93963422505ecc790af62ae0503f301145debac3 for #1985 whichBharat Mediratta
was breaking all unit tests. Use module::install("gallery") instead of calling gallery_installer::install directly.
2013-01-31Drop the requirement to have the install() function set the moduleBharat Mediratta
version. It's redundant. Fixes #1985.
2013-01-31Merge pull request #115 from shadlaws/fix_1982Bharat Mediratta
#1982 - Add placeholder for albums with no album cover.
2013-01-31Escape the host/username/password arguments to mysqldump. Fixes #1984.Bharat Mediratta
2013-01-31Merge pull request #116 from shadlaws/fix_1983Bharat Mediratta
#1983: Remove item keys changed for/by graphics::generate from significant changes list.
2013-01-31#1983: Remove item keys changed for/by graphics::generate from significant ↵shadlaws
changes list. There's no need to run through all of the item save/validation logic for these entries, which are changed frequently during the course of thumb/resize generation.
2013-01-31#1982 - Add placeholder for albums with no album cover.shadlaws
- Added missing_album_cover.jpg placeholder image. - Modified the graphics helper to use it. Calling graphics::generate will copy it. - Modified item::remove_album_cover and gallery_event::item_created to run graphics::generate. - Added unit test to Graphics_Helper_Test.
2013-01-31Follow-on to 5fca371a616dba16f955087c4477ee229ee222d0 for #1945.shadlaws
Previously skipped admin_watermarks mods to use new functionality of #1945 since there was concurrent work on it with #1970. Now that both are done, we can wrap this up.
2013-01-30Follow-in to cff1e76e8da2055f9faf7449222b43a686014b1c for #1978Bharat Mediratta
Restrict which album cover ids we swap over to the hierarchy of the current album, otherwise we can wind up in sticky situations with hierarchical album cover chains. Eg, you have a hierarchy like this: root -> A1 -> A2 --> A3 -> P1 A4 -> P2 P1 is the album cover for its entire hierarchy. But then you swap A2's album cover for A3 making this: root -> A1 -> A2 + A3 -> P1 \-> A4 -> P2 Since A1, A2 and A3 all had P1 as their album cover item id. Now we're swapping it over to P2 but we want to leave P1 as A3's album cover item id. So only look at A4's hierarchy and ignore its peers.
2013-01-30Support additional where tuples in ORM_MPTT::parents. Fixes #1980.Bharat Mediratta
2013-01-30Actually disable the "make album cover" option when the item is already the ↵Bharat Mediratta
album cover. Fixes #1979.
2013-01-30When changing the album cover, find and retarget any other albums which were ↵Bharat Mediratta
using the old item as their album cover. Fixes #1978.
2013-01-30Merge pull request #112 from shadlaws/fix_1968Bharat Mediratta
#1968 - Improve album cover generation/removal/etc.
2013-01-30Follow-on to 1e4d75c12072b49c3469f18af13bcf3439afc6b0 for #1975.Bharat Mediratta
Create a siblings() function which pulls together the siblings_callback function and makes it a more palatable API.
2013-01-30Protect admins from themselves - in case an admin changed theBharat Mediratta
watermark.name setting to something terrible by accident via Admin > Advanced, we'll just use the basename. Fixes #1977.
2013-01-30Don't concatenate tainted strings in JS. Fixes #1976.Bharat Mediratta
2013-01-30Improve the display context API to return a "siblings_callback" fieldBharat Mediratta
containing a callback that returns all the siblings. Fixes #1975.
2013-01-30Merge pull request #110 from mikeage/g2_importBharat Mediratta
#1973 Handle redirected G2 URLs for tags, including g2_itemId passed
2013-01-30 #1973 Handle redirected G2 URLs for tags, including g2_itemId passedMike Miller
2013-01-30#1968 - Improve album cover generation/removal/etc.shadlaws
- Added stanza to Item_Model::save that handles when cover id is null. - Added logic to graphics::generate to copy/convert album cover thumbs from their item thumbs to ensure they're always jpg, and eliminate the possibility that we copy/convert a dirty thumb. - Redirected other places in code where we want to do one of the above two things to use these two functions instead (gallery_event::item_updated_data_file, item::make_album_cover, item::remove_album_cover). - Improved validation in Item_Model so only albums can have covers and all covers must be non-albums. - Added unit tests to Graphics_Helper_Test.
2013-01-29Merge pull request #108 from shadlaws/fix_1970Bharat Mediratta
#1970 - Make add watermarks more secure and add unit tests.
2013-01-29#1970 - Make add watermarks more secure and add unit tests.shadlaws
This follows #1855 and #1951... - Ensured that invalid or illegal files are not added even if they have valid extensions. - Added unit tests (currently there aren't any...)
2013-01-29#1967 - Improve how graphics::generate handles missing/bad images.shadlaws
- Made missing_photo match the image format (jpg, png, etc.). - Swapped missing_photo.png for missing_photo.jpg since it's likely to require less conversion to match. - Improved error messages to user when things go wrong. - Ensured that missing image placeholders are always copied when there's an error. - Ensured we don't mistake no file output for a correct file output (delete target before attempt). - Restructured graphics::generate a bit to work better with above changes. - Added unit tests for graphics::generate.
2013-01-29Merge pull request #106 from shadlaws/fix_1945Bharat Mediratta
#1945 - Extend legal_file helper functions.
2013-01-29Merge pull request #107 from shadlaws/fix_1969Bharat Mediratta
#1969 - Give graphics events the ability to override the standard process
2013-01-28#1945 - Extend legal_file helper functions.shadlaws
- Added get_types_by_extension function, which is a merged version of get...types_by_extension functions (similar to get_extensions). - Added optional extension argument to get...extensions functions similar to get...types_by_extension functions. - Added unit tests. Now, every legal_file function has one. - Restructured helper file to include caches. - Added array_unique to get...types (derived from get...types_by_extension, which can be many-to-one). - Edited server_add, uploader, and item model to use new functionality.
2013-01-28#1971 - Make resequence_child_weights_test unit test more reliable.shadlaws
- Set the sort_column of the parent album to id, which has no possibility of being identical between the two photos. - Now, the reweighting will reverse the order even if they were created during the same second.