Commit Graph

4608 Commits

Author SHA1 Message Date
Bharat Mediratta
97f96bcb48 Merge pull request #150 from shadlaws/fix_zend_guard_loader_issues
#1749, 1754, 1901 - Eliminate incompatibility with Zend Guard Loader.
2013-02-18 10:20:52 -08:00
shadlaws
ab920ae360 #1749, 1754, 1901 - Eliminate incompatibility with Zend Guard Loader.
- added MY_Kohana to provide wrapper for auto_load(), which loads dummy class when none found.
- revised Bootstrap to load MY_Kohana.

This is based on the patch described here: http://blog.teatime.com.tw/1/post/403
2013-02-18 19:12:45 +01:00
shadlaws
58c137c981 #2007 - Change search box text when only looking in the current album.
- search.html.php - updated to use new labels.
- search_link.html.php - updated to use new labels.  Moved code that determines
current album to top, then used it for both the new label and the hidden album
input.  Resulting form code looks more symmetric to search.html.php.
2013-02-18 18:55:03 +01:00
shadlaws
fd0051dab7 #2006 - Add system::mark_file_for_delete API to delete files at shutdown.
- added system::mark_file_for_delete to be called to mark a file
- added system::delete_marked_files to be called at shutdown to delete the list
- amended system::temp_filename to, by default, add the temp name to the list
- updated a few other places in code where this should be used
2013-02-17 23:19:35 +01:00
Bharat Mediratta
96ad7789c8 Follow-on to 7bdccade98 to exclude
directories for now.
2013-02-15 19:17:34 -05:00
Bharat Mediratta
0dd12caa6f Follow-on to 7bdccade98 - point out that there's
duplicated code in gallery_event.
2013-02-15 19:12:08 -05:00
Bharat Mediratta
7bdccade98 Every 500th request prune a single old file from var/tmp and var/logs.
Might not be aggressive enough.  Fixes #2005.
2013-02-15 19:09:06 -05:00
Bharat Mediratta
8b0088fd8d Change gallery/bin -> gallery3/bin in the comment since I suspect most
people don't change the name of the directory.  Follow-on to
1d7f5e3ab1 for #1935
2013-02-15 13:23:05 -05:00
Bharat Mediratta
264e1e82b2 Digibug up and vanished. Move the module to contrib for now. This
will leave the module active in any existing installs that had it
active, but that shouldn't cause any negative impact.  Fixes #2002.
2013-02-15 12:57:42 -05:00
shadlaws
f212f6a794 #2003 - Add admin/movies screen.
Added admin/movies screen analogous to the admin/graphics screen so the user can:
- see how FFmpeg is configured (path and version, similar to toolkits in admin/graphics)
- get some instructions on how to install FFmpeg if not found
- change the movie_allow_uploads setting
- ask Gallery to rebuild their movie thumbs
Specifics:
- admin_movies, admin_movies.html (new) - new Movies admin screen
- ffmpeg.png (new) - logo for admin screen
- movie::get_ffmpeg_version (new) - return version number and date of FFmpeg
- form_uploadify.html - change admin message if movie uploads are disabled
- gallery_event::admin_menu - added Movies link to Settings
- xss_data.txt - updated golden file for unit tests
2013-02-14 23:42:20 +01:00
Bharat Mediratta
72a6a8abaf Follow-on to 9dbe2e15ad for #1999.
Fix an issue where siblings() by itself throws an error.  The problem is that
Theme_View::siblings() passes a null offset and limit to the callback which
gets passed down to search::search_within_album, which creates its query
in raw SQL and doesn't check for a null offset/limit.  We want a reasonable
limit on the size of the set here (and 1000 is probably wayyy too high so
lower that to 100) so amend get_siblings to stop using default parameters
and actually check the inputs.

Author: Bharat Mediratta <bharat@menalto.com>
Date:   Sat Feb 9 14:53:34 2013 -0500

    Extend siblings callbacks to take a $limit and an $offset for navigating
    large sibling sets.  Useful for the thumbnav module since we don't want to
    iterate a thousand siblings to find the one we care about.  Fixes #1999.
2013-02-14 14:43:03 -05:00
Bharat Mediratta
6c861a014d Merge pull request #133 from shadlaws/followon_1994
Follow-on to 0312d1b071 for #1994.
2013-02-14 11:18:45 -08:00
Bharat Mediratta
3b9eb29d89 Merge pull request #143 from mikeage/g2_import
Replace = with ==
2013-02-13 13:55:27 -08:00
Mike Miller
d3ca2617f2 Replace = with ==
This was my mistake; I didn't test it thoroughly. It results in all g2 mappings being broken!
2013-02-13 23:11:32 +02:00
Bharat Mediratta
8a1133952e Merge pull request #134 from shadlaws/fix_2001
#2001 - Make filename sanitizing more consistent.
2013-02-12 09:24:37 -08:00
shadlaws
d04a6fc87d #2001 - Make filename sanitizing more consistent.
- legal_file - added sanitize_filname() to sanitize photo/movie filenames.
- admin_watermarks - revised add() to use new function.
- item model - added _process_data_file_info() to validate the data file, get its metadata, and sanitize the item name.
- item model - revised save() for new items to use _process_data_file_info *before* the slug is checked.
- item model - revised save() for updated items to use _process_data_file_info.
- item model - revised save() for updated items to sanitize name if changed.
- uploader - removed call to smash_extensions (item model does this when it calls sanitize_filename).
- Legal_File_Helper_Test - added unit tests for sanitize_filename.
- Item_Model_Test - revised existing unit tests based on changes.
- Item_Model_Test - added new unit tests for names with legal but incorrect extensions.
- Averted take over by HAL with fix #2001...
2013-02-12 00:37:33 +01:00
shadlaws
0a2670a19a #1988 - Add movie_allow_uploads option ("always", "never", or "autodetect").
- gallery_installer, module.info, install.sql - add movie_allow_uploads variable
- movie::allow_uploads (new) - return true if movie_allow_uploads is "always" or "autodetect" and FFmpeg found, false otherwise
- legal_file - use movie::allow_uploads instead of movie::find_ffmpeg
- Form_Uploadify - use movie::allow_uploads instead of movie::find_ffmpeg
2013-02-12 00:30:30 +01:00
Bharat Mediratta
33149ef87a Merge pull request #121 from shadlaws/fix_1935_only
#1935 - Make FFmpeg easier to install.
2013-02-10 21:51:05 -08:00
Bharat Mediratta
bb7590152d Merge pull request #132 from shadlaws/fix_2000
#2000 - Make legal_file::smash_extensions more robust.
2013-02-10 21:42:24 -08:00
shadlaws
27be4ae606 Follow-on to 0312d1b071 for #1994.
- Updated function comments to match revisions.
- No functional changes.
2013-02-10 10:10:44 +01:00
shadlaws
bfdf5a00fd #2000 - Make legal_file::smash_extensions more robust.
- Fixed legal_file::smash_extensions.
- Added new unit test.
- Removed duplicated condition in existing unit test.
2013-02-10 02:28:47 +01:00
Bharat Mediratta
9dbe2e15ad Extend siblings callbacks to take a $limit and an $offset for navigating
large sibling sets.  Useful for the thumbnav module since we don't want to
iterate a thousand siblings to find the one we care about.  Fixes #1999.
2013-02-09 14:53:34 -05:00
shadlaws
1d7f5e3ab1 #1935 - Make FFmpeg easier to install.
- system::find_binary - add Gallery's bin subdirectory to search
- system::find_binary - auto-fix permissions if found in Gallery's bin directory
2013-02-09 20:48:02 +01:00
Bharat Mediratta
11e56b29da Merge pull request #130 from shadlaws/fix_1997
#1997 - Correct movie dimensions and mime type improperly set by contributed modules.
2013-02-09 10:36:42 -08:00
Bharat Mediratta
2dc695c606 Merge pull request #129 from shadlaws/fix_1996
#1996 - Add blacklist to legal_file helper.
2013-02-09 10:36:03 -08:00
Bharat Mediratta
7613d886f9 Merge pull request #128 from shadlaws/fix_1994
#1994 - Make get_file_metadata throw an exception if photo or movie is unidentifiable/illegal.
2013-02-09 10:35:04 -08:00
shadlaws
8dcdb3b8e1 #1997 - Update movie dimensions and mime type if previously set without FFmpeg.
- 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-09 18:12:08 +01:00
shadlaws
942233dd26 #1996 - Add blacklist to legal_file helper.
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 15:21:57 +01:00
shadlaws
0312d1b071 #1994 - Make get_file_metadata throw an exception if photo or movie is 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 13:51:41 +01:00
shadlaws
2dc97fab05 #1993 - Remove "failed" query string from upgrader redirect if there are no 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-08 09:03:57 +01:00
Bharat Mediratta
59371077c2 Merge branch 'master' of github.com:gallery/gallery3 2013-02-07 15:09:15 -05:00
Bharat Mediratta
27ec3b4c6c Follow-on to 1e4d75c120 for #1975.
Don't try to use an array index on a function return, that's not supported
in PHP 5.3
2013-02-07 15:08:55 -05:00
shadlaws
2da4d9dd1f #1992 - Improve examples for thumb/resize/file path/url functions in item model.
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-07 09:49:28 +01:00
Bharat Mediratta
d9273038b0 Merge pull request #124 from shadlaws/fix_1991
#1991 - Add options to graphics::mark_dirty to specify type and/or mime type
2013-02-06 14:58:25 -08:00
shadlaws
faa719551d #1991 - Add options to graphics::mark_dirty to specify type and/or mime type.
- graphics::mark_dirty - added $type and $mime_type as options.
- graphics::mark_dirty - used options to set additional where conditions.
2013-02-06 11:04:24 +01:00
shadlaws
1ae1165229 Follow-on to 949b8cda14 for #1982.
- 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-06 10:24:06 +01:00
Bharat Mediratta
428d4f319b Merge branch 'master' of github.com:gallery/gallery3 2013-02-05 13:02:56 -05:00
Bharat Mediratta
c4b2f79a67 Force a sort order no sibling checks. Fixes #1990. 2013-02-05 13:02:26 -05:00
Bharat Mediratta
0d9c4da0ff Merge pull request #118 from shadlaws/fix_1982_followon
Follow-on to f83ed5f871 for #1982.
2013-02-03 09:44:51 -08:00
Bharat Mediratta
3439eb5700 Merge branch 'master' of github.com:gallery/gallery3 2013-02-02 23:41:53 -05:00
Bharat Mediratta
dece6dc5a5 Create gallery::allow_css_and_js_combining() which lets you disable combining CSS/JS
by touching var/DONT_COMBINE.  Fixes #1989.
2013-02-02 23:39:16 -05:00
shadlaws
bc0bf10643 Follow-in to 314e2e67b1 for #1986.
- Update xss_test golden file (change line numbers).
2013-02-02 14:04:15 +01:00
shadlaws
949b8cda14 Follow-on to f83ed5f871 for #1982.
- Fix unit test for album url since empty albums now have thumbnails.
2013-02-02 10:02:37 +01:00
Mike Miller
6e757f9988 #1987 g2_import module should redirect with a 301, not 302
As the g2_import process is generally assumed to be permanent, the
redirect should be a 301, and not a 302.
2013-02-01 15:36:49 +02:00
Bharat Mediratta
314e2e67b1 Fix ctrl-click behavior. Fixes #1986. 2013-02-01 00:52:14 -05:00
Bharat Mediratta
f72c5a87c8 Follow-on to 9396342250 for #1985 which
was breaking all unit tests.  Use module::install("gallery") instead
of calling gallery_installer::install directly.
2013-01-31 23:45:36 -05:00
Bharat Mediratta
9396342250 Drop the requirement to have the install() function set the module
version.  It's redundant.  Fixes #1985.
2013-01-31 19:55:53 -05:00
Bharat Mediratta
cb08f6cc13 Merge pull request #115 from shadlaws/fix_1982
#1982 - Add placeholder for albums with no album cover.
2013-01-31 15:48:18 -08:00
Bharat Mediratta
ea54a88ec8 Escape the host/username/password arguments to mysqldump. Fixes #1984. 2013-01-31 16:29:09 -05:00
Bharat Mediratta
60c37726ce Merge pull request #116 from shadlaws/fix_1983
#1983: Remove item keys changed for/by graphics::generate from significant changes list.
2013-01-31 11:45:10 -08:00