Commit Graph
7314 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
Automatic Build Number Updater e950d2f4ef Automated update of .build_number to 354 for branch master
Last update: afa61f9d0d (1 commits ago)
2013-02-18 11:08:34 -07:00
Bharat Mediratta 788e966226 Merge pull request #149 from shadlaws/fix_2007
#2007 - Change search box text when only looking in the current album.
2013-02-18 10:08:03 -08: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
Automatic Build Number Updater afa61f9d0d Automated update of .build_number to 353 for branch master
Last update: 87d20c63af (1 commits ago)
2013-02-17 16:47:25 -07:00
Bharat Mediratta 9f02011dac Merge pull request #148 from shadlaws/fix_2006
#2006 - Add system::mark_file_for_delete API to delete files at shutdown.
2013-02-17 15:46:52 -08: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
Automatic Build Number Updater 87d20c63af Automated update of .build_number to 352 for branch master
Last update: eb5b99abb4 (1 commits ago)
2013-02-16 12:42:07 -07:00
Bharat Mediratta 971b56ae09 Merge pull request #145 from shadlaws/revert_zend_guard_check
#1749, 1754, 1901 - revert two recent commits that check for Zend Guard code obfuscation.
2013-02-16 11:41:36 -08:00
shadlaws b0180288e0 #1749, 1754, 1901 - revert two recent commits that check for Zend Guard obfuscation level support.
This is not the root of the problem for all installs, and can trigger false positives
that break previously-working installs... we'll have to find a better way.
2013-02-16 08:23:36 +01:00
Automatic Build Number Updater eb5b99abb4 Automated update of .build_number to 351 for branch master
Last update: 9346503c62 (1 commits ago)
2013-02-15 17:17:51 -07:00
Bharat Mediratta 96ad7789c8 Follow-on to 7bdccade98 to exclude
directories for now.
2013-02-15 19:17:34 -05:00
Automatic Build Number Updater 9346503c62 Automated update of .build_number to 350 for branch master
Last update: c97fe4bcdd (1 commits ago)
2013-02-15 17:12:30 -07: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
Automatic Build Number Updater c97fe4bcdd Automated update of .build_number to 349 for branch master
Last update: 5b6c138da1 (4 commits ago)
2013-02-15 17:10:08 -07:00
Bharat Mediratta 346c578f30 Merge branch 'master' of github.com:gallery/gallery3 2013-02-15 19:09:17 -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
Automatic Build Number Updater 016335fb89 Automated update of .build_number to 348 for branch master
Last update: 5b6c138da1 (2 commits ago)
2013-02-15 11:24:48 -07:00
Bharat Mediratta 1748aae9d1 Create an empty and secure gallery3/bin directory for use with the new
system::find_binary code.  Fixes #2004.
2013-02-15 13:23:39 -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
Automatic Build Number Updater 5b6c138da1 Automated update of .build_number to 347 for branch master
Last update: 6089374891 (1 commits ago)
2013-02-15 10:58:25 -07: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
Automatic Build Number Updater 6089374891 Automated update of .build_number to 346 for branch master
Last update: 21acbbf549 (1 commits ago)
2013-02-14 18:40:48 -07:00
Bharat Mediratta ea741a8457 Merge pull request #138 from shadlaws/fix_2003
#2003 - Add admin/movies screen.
2013-02-14 17:40:44 -08: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
Automatic Build Number Updater 21acbbf549 Automated update of .build_number to 345 for branch master
Last update: 3fa08f54a6 (1 commits ago)
2013-02-14 12:44:08 -07:00
Bharat Mediratta 004fb588c6 Merge pull request #139 from shadlaws/followon_zend_guard_debug_message
Follow-on to b01897af8d - add debugging message
2013-02-14 11:43:44 -08:00
Automatic Build Number Updater 3fa08f54a6 Automated update of .build_number to 344 for branch master
Last update: db98101363 (1 commits ago)
2013-02-14 12:43:27 -07: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
Automatic Build Number Updater db98101363 Automated update of .build_number to 343 for branch master
Last update: e5ed05004f (1 commits ago)
2013-02-14 12:18:56 -07: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
Automatic Build Number Updater e5ed05004f Automated update of .build_number to 342 for branch master
Last update: 4fc5396516 (1 commits ago)
2013-02-13 14:55:53 -07: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
shadlaws 0a10f3719a Follow-on to b01897af8d - add debugging message if Zend Guard code obfuscation is enabled to installer, too. 2013-02-12 22:21:50 +01:00
Automatic Build Number Updater 4fc5396516 Automated update of .build_number to 341 for branch master
Last update: 9ed6735033 (1 commits ago)
2013-02-12 10:25:10 -07: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
Automatic Build Number Updater 9ed6735033 Automated update of .build_number to 340 for branch master
Last update: 0302e4ec0e (1 commits ago)
2013-02-12 10:23:59 -07:00
Bharat Mediratta c02152c77c Merge pull request #123 from shadlaws/fix_1988
#1988 - Add movie_allow_uploads option ("always", "never", or "autodetect").
2013-02-12 09:23:27 -08:00
Automatic Build Number Updater 0302e4ec0e Automated update of .build_number to 339 for branch master
Last update: e109f0b511 (1 commits ago)
2013-02-12 10:21:28 -07:00
Bharat Mediratta 93a7722318 Merge pull request #135 from shadlaws/fix_zend_debug_message
#1749, #1754, #1901 - Add debugging message if Zend Guard code obfuscation is enabled.
2013-02-12 09:21:05 -08:00
shadlaws b01897af8d #1749, #1754, #1901 - Add debugging message if Zend Guard code obfuscation is enabled.
Zend Guard code obfuscation is enabled by default on many PHP 5.3+ installations,
but we don't use it and Kohana 2.4 is incompatible with it (see Trac tickets).
Rather than crash and/or hack core Kohana code, we can display an error message
to help the end user disable it.
2013-02-12 11:26:43 +01: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
Automatic Build Number Updater e109f0b511 Automated update of .build_number to 338 for branch master
Last update: 53ce9c85d1 (1 commits ago)
2013-02-10 22:51:22 -07: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
Automatic Build Number Updater 53ce9c85d1 Automated update of .build_number to 337 for branch master
Last update: 9c363abc41 (1 commits ago)
2013-02-10 22:42:53 -07: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
Automatic Build Number Updater 9c363abc41 Automated update of .build_number to 336 for branch master
Last update: a06faf61b4 (2 commits ago)
2013-02-10 16:56:03 -07:00