Commit Graph
7201 Commits
Author SHA1 Message Date
Bharat Mediratta 8d15e5cb2e Follow-in to cff1e76e8d for #1978
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-30 21:42:47 -05:00
Bharat Mediratta 71cf911649 Support additional where tuples in ORM_MPTT::parents. Fixes #1980. 2013-01-30 21:38:32 -05:00
Automatic Build Number Updater fc82f56f4b Automated update of .build_number to 314 for branch master
Last update: 12ea6ad642 (3 commits ago)
2013-01-30 19:19:24 -07:00
Bharat Mediratta 30ec44b3b2 Merge branch 'master' of github.com:gallery/gallery3 2013-01-30 21:19:08 -05:00
Bharat Mediratta 075b95f0ed Actually disable the "make album cover" option when the item is already the album cover. Fixes #1979. 2013-01-30 21:18:26 -05:00
Automatic Build Number Updater ec232f6a47 Automated update of .build_number to 313 for branch master
Last update: 12ea6ad642 (1 commits ago)
2013-01-30 19:09:46 -07:00
Bharat Mediratta cff1e76e8d When changing the album cover, find and retarget any other albums which were using the old item as their album cover. Fixes #1978. 2013-01-30 21:08:36 -05:00
Automatic Build Number Updater 12ea6ad642 Automated update of .build_number to 312 for branch master
Last update: 0ab40de11d (1 commits ago)
2013-01-30 18:17:12 -07:00
Bharat Mediratta d8d01e0aa0 Merge pull request #112 from shadlaws/fix_1968
#1968 - Improve album cover generation/removal/etc.
2013-01-30 17:17:06 -08:00
Automatic Build Number Updater 0ab40de11d Automated update of .build_number to 311 for branch master
Last update: 28cd0ad2c1 (5 commits ago)
2013-01-30 17:37:03 -07:00
Bharat Mediratta b6b269948f Merge branch 'master' of github.com:gallery/gallery3 2013-01-30 19:36:11 -05:00
Bharat Mediratta 49dd0994df Follow-on to 1e4d75c120 for #1975.
Create a siblings() function which pulls together the siblings_callback
function and makes it a more palatable API.
2013-01-30 19:32:35 -05:00
Automatic Build Number Updater 8de70ee7bc Automated update of .build_number to 310 for branch master
Last update: 28cd0ad2c1 (3 commits ago)
2013-01-30 16:47:17 -07:00
Bharat Mediratta ee0a0d7bf7 Merge branch 'master' of github.com:gallery/gallery3 2013-01-30 18:47:04 -05:00
Bharat Mediratta 9ef891858c Protect admins from themselves - in case an admin changed the
watermark.name setting to something terrible by accident via Admin >
Advanced, we'll just use the basename.  Fixes #1977.
2013-01-30 18:45:49 -05:00
Automatic Build Number Updater 8ada16d887 Automated update of .build_number to 309 for branch master
Last update: 28cd0ad2c1 (1 commits ago)
2013-01-30 12:20:27 -07:00
Bharat Mediratta 92c264033a Don't concatenate tainted strings in JS. Fixes #1976. 2013-01-30 14:19:44 -05:00
Automatic Build Number Updater 28cd0ad2c1 Automated update of .build_number to 308 for branch master
Last update: a983e8748e (1 commits ago)
2013-01-30 10:12:06 -07:00
Bharat Mediratta 1e4d75c120 Improve the display context API to return a "siblings_callback" field
containing a callback that returns all the siblings.  Fixes #1975.
2013-01-30 12:10:18 -05:00
Automatic Build Number Updater a983e8748e Automated update of .build_number to 307 for branch master
Last update: 861e8628f5 (1 commits ago)
2013-01-30 08:54:19 -07:00
Bharat Mediratta 6e609c249a Merge pull request #110 from mikeage/g2_import
#1973 Handle redirected G2 URLs for tags, including g2_itemId passed
2013-01-30 07:53:56 -08:00
Mike Miller 91acf812a1 #1973 Handle redirected G2 URLs for tags, including g2_itemId passed 2013-01-30 05:59:08 +02:00
shadlaws cf07742595 #1968 - Improve album cover generation/removal/etc.
- 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-30 01:07:36 +01:00
Automatic Build Number Updater 861e8628f5 Automated update of .build_number to 306 for branch master
Last update: 899590873b (1 commits ago)
2013-01-29 11:29:53 -07:00
Bharat Mediratta ed7e2d5089 Merge pull request #108 from shadlaws/fix_1970
#1970 - Make add watermarks more secure and add unit tests.
2013-01-29 10:29:25 -08:00
Automatic Build Number Updater 899590873b Automated update of .build_number to 305 for branch master
Last update: b7c73ee693 (1 commits ago)
2013-01-29 11:28:41 -07:00
Bharat Mediratta a3478732f9 Merge pull request #105 from shadlaws/fix_1967
#1967 - Improve how graphics::generate handles missing/bad images.
2013-01-29 10:28:38 -08:00
shadlaws 4cf31d8850 #1970 - Make add watermarks more secure and add unit tests.
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 18:48:39 +01:00
shadlaws 536bdaa4db #1967 - Improve how graphics::generate handles missing/bad images.
- 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-29 18:35:10 +01:00
Automatic Build Number Updater b7c73ee693 Automated update of .build_number to 304 for branch master
Last update: cf58e064d4 (1 commits ago)
2013-01-29 10:10:26 -07:00
Bharat Mediratta 2551b31b8f Merge pull request #106 from shadlaws/fix_1945
#1945 - Extend legal_file helper functions.
2013-01-29 09:10:06 -08:00
Automatic Build Number Updater cf58e064d4 Automated update of .build_number to 303 for branch master
Last update: 23c6c50752 (1 commits ago)
2013-01-29 10:01:44 -07:00
Bharat Mediratta 3b0de7791b Merge pull request #107 from shadlaws/fix_1969
#1969 - Give graphics events the ability to override the standard process
2013-01-29 09:01:31 -08:00
shadlaws 5fca371a61 #1945 - Extend legal_file helper functions.
- 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 23:31:18 +01:00
Automatic Build Number Updater 23c6c50752 Automated update of .build_number to 302 for branch master
Last update: daad29e5c3 (1 commits ago)
2013-01-28 10:47:35 -07:00
Bharat Mediratta 785633d910 Merge pull request #109 from shadlaws/fix_1971
#1971 - Make resequence_child_weights_test unit test more reliable.
2013-01-28 09:47:11 -08:00
shadlaws 1313a02bf4 #1971 - Make resequence_child_weights_test unit test more reliable.
- 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.
2013-01-28 14:47:26 +01:00
shadlaws 9e20a30d22 #1969 - Give graphics events the ability to override the standard process.
While graphics_rotate, graphics_resize, and graphics_composite events already exist, they don't have the ability to *override* the standard process.
This makes it a bit tricky when you want to replace the standard procedure with another (e.g. use jpegtran to perform lossless jpg rotation).
Solution:
- make a temp filename.
- tell the events to use it as the output file.
- if an event makes something, use it and skip the standard process.
2013-01-27 21:55:24 +01:00
Automatic Build Number Updater daad29e5c3 Automated update of .build_number to 301 for branch master
Last update: 0c214d85e6 (1 commits ago)
2013-01-27 13:37:08 -07:00
Bharat Mediratta e957c97c94 Add a key on relative_path_cache in the items table to improve performance on installs
that use File_Proxy heavily.  Fixes #1920.
2013-01-27 15:35:42 -05:00
Automatic Build Number Updater 0c214d85e6 Automated update of .build_number to 300 for branch master
Last update: c508fc4a45 (1 commits ago)
2013-01-26 12:01:04 -07:00
Bharat Mediratta b06c0f4890 Merge pull request #104 from shadlaws/fix_1966
#1966 - "Fix your Gallery" shows 60/59 items completed.
2013-01-26 11:00:56 -08:00
Automatic Build Number Updater c508fc4a45 Automated update of .build_number to 299 for branch master
Last update: 847a825b25 (1 commits ago)
2013-01-26 11:59:20 -07:00
Bharat Mediratta 6042bfd1f5 Merge pull request #91 from shadlaws/fix_1946_1947
#1946, 1947 - Make altered names/slugs more user-friendly, make conflict-finding code check filenames with no extensions
2013-01-26 10:59:18 -08:00
shadlaws 603db40459 #1966 - "Fix your Gallery" shows 60/59 items completed.
- Fixed counter in gallery_task::fix that was often one too many.

For FIX_STATE_RUN_MISSING_ACCESS_CACHES, changed this:
$stack = explode(" ", $task->get("stack"));
To this:
$stack = array_filter(explode(" ", $task->get("stack")));
2013-01-26 09:08:03 +01:00
shadlaws cc2aed656c #1946, 1947 - Make altered names/slugs more user-friendly, make conflict-finding code check filenames with no extensions
- Reduced from four places that alter names/slugs to two (one to populate empty slugs, one to handle conflicting names/slugs).
- For empty slugs, fill with generic human-readable name (e.g. "photo") instead of random value.
- For conflicting names/slugs, add suffix that's sequential (e.g. "-01"), only using random after 99 conflicts.
- Made conflict-finding code check filenames with no extensions.
- Renamed _randomize_name_or_slug_on_conflict to _check_and_fix_conflicts.
- Added unit tests.  Also cleaned up existing unit tests to reflect new logic and removed a redundant test.
- Added installer logic to correct existing items now considered in conflict.
- Revised gallery_task to look for duplicate names based on new criteria.
2013-01-26 08:38:31 +01:00
Automatic Build Number Updater 847a825b25 Automated update of .build_number to 298 for branch master
Last update: 066f4cdf8e (1 commits ago)
2013-01-25 16:26:55 -07:00
Bharat Mediratta 96f4a5ea85 Merge pull request #103 from shadlaws/fix_1965
#1965 - Improve sanity checks and copy/convert/process logic for rotate and resize
2013-01-25 15:26:27 -08:00
Automatic Build Number Updater 066f4cdf8e Automated update of .build_number to 297 for branch master
Last update: 776fe75ceb (1 commits ago)
2013-01-25 16:25:39 -07:00
Bharat Mediratta 3fa7b66585 Merge pull request #96 from shadlaws/fix_1951
#1951 - Make metadata generation more flexible (photo and movie helpers).
2013-01-25 15:25:06 -08:00