summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers
AgeCommit message (Collapse)Author
2011-01-11Merge branch 'Ticket#1504' of git://github.com/Joe7/gallery3Bharat Mediratta
2011-01-11Merge branch 'fix-viewable2_master' of git://github.com/BigMadWolf/gallery3Bharat Mediratta
2011-01-12Returning 2 flags from l10n_client::validate_api_key(), 1 to reflect if ↵Joe7
connection was built up properly (just a boolean, not distuingishing between reasons in case of a failure), the other to reflect API validating success status. Using this presenting a slightly more meaningfull error msg to user in case the connection would fail. Fixes Ticket #1504
2011-01-11Removed check as input value is compared against dataset of validated ↵Joe7
values, and request is only processed further in case of a match. => this is unnecessary
2011-01-10Allow File_Proxy_Controller to run in private gallery mode since itBharat Mediratta
does all the right permission checks. This prevents a hotlink to a private photo in a private gallery from kicking the user out to a login page. Fixes #1594.
2011-01-09Fixed item controllers so that any item position is computed correctly, when ↵Jérémy Subtil
some other items belonging to the same parent album are not viewable. Changed depracated calls to item_Model::get_position() to item::get_position().
2011-01-07Don't enable the REST module by default (fixes #1585).Bharat Mediratta
Bump the info module per changes for #662.
2011-01-07Allow '..' segment in photo/album paths through file_proxy (as is not ↵Joe7
forbidden in other places like add album/item) and explitely look for /../ instead Note: directory path can't end in '.' forcibly so this shall be fine Fixes Ticket #1518
2011-01-03Follow on to cfaa62370ecbdb3badf4ab68bbefa7cfedaea154 to fix indentation.Bharat Mediratta
Fixes #1569.
2011-01-03Reimplemented Kohana 2.3's View::set_global() with array support.Joe7
Allows for cleaner code and fewer function calls.
2011-01-03Keep view counters of all item types accurateJoe7
Added common increment_view_count() func in item model for reuse
2010-12-28Use db::expr instead of "new Database_Expression". Resolves #1560.Bharat Mediratta
2010-12-23Create a way for controllers to exempty themselves from maintenanceBharat Mediratta
mode and private gallery mode by setting the following constants in the controller to true. ALLOW_MAINTENANCE_MODE ALLOW_PRIVATE_GALLERY Fixes #1411 and the subsequent refactoring fixes #1551 as well.
2010-12-21Updated to use the new item::find_by_path() API.Bharat Mediratta
2010-12-15Consolidate all the random code into a random helper that offers:Bharat Mediratta
random::hash() random::string() random::percent() random::int() So that we don't have lots of different ways to get random values all over the code. Follow-on to #1527.
2010-12-15Use mt_rand() instead of rand() since it provides better portability.Bharat Mediratta
Fixes #1527.
2010-09-29Stop caching all module variables in the vars table using theBharat Mediratta
name=_cache row. If that overflows, it will cause us to be unable to load variables, and we can't recover from that. Instead, use the Cache table. Bump the gallery module to v40. Fixes ticket #1405.
2010-09-18The Kohana folks removed the cache cleanup code back inBharat Mediratta
http://dev.kohanaframework.org/projects/kohana2/repository/revisions/4605 So now our cache entries don't expire. For now, do cache expiration whenever we render Admin > Maintenance, since that's the type of place that users will go when they want their cache to expire anyway.
2010-09-16Preserve the image extension on the temp file that we create forBharat Mediratta
rotating images. Some versions of GD won't work if we don't do this. Fixes ticket #1375.
2010-09-16Restrict viewing user profile pages to registered users only, butBharat Mediratta
provide a "show_user_profiles_to" setting to allow admins to open it up to everybody (choices there are "registered_users", "admin_users" or "everybody"). Fixes ticket #1378.
2010-09-11Add CSRF protection to the upgrader. And update the CLI output soBharat Mediratta
that it tells you which modules failed to upgrade properly. Fixes ticket #1359.
2010-09-10If the user is not an admin, don't 403 -- instead just redirect themBharat Mediratta
to the root album. Fixes ticket #1356.
2010-09-08Detect out-of-date modules and put up a message for site admins.Bharat Mediratta
Fixes ticket #1353.
2010-09-08Detect when a module fails to upgrade properly and put up anBharat Mediratta
informative message to help the user know that she needs to get a newer copy of the module. Fixes ticket #1189.
2010-09-04Fix full size dimensions after rotating an image on the photo view page.Bharat Mediratta
The photo view page caches the dimensions of the full size and then renders it in Javascript. But after rotation, those dimensions are no longer valid. Create a new function on the items controller that returns the appropriate dimensions, then add a hook on $.gallery_replace_image and implement the hook on the photo view page to have it make an async call to get the new dimensions. Fixes ticket #1317
2010-09-02Don't show the "(## errors)" part of the status message if there haven't ↵Bharat Mediratta
been any errors.
2010-08-31Expire completed uploads and introduce a text message that says howBharat Mediratta
many photos have been uploaded successfully. This is to pave the way for retry code later on.
2010-08-29Revert "Change the theme option page to display using tabs if the site theme ↵Bharat Mediratta
has an admin page." This reverts commit d66c496fb1007bbd0b1640496808000c573d95fd. Conflicts: modules/gallery/helpers/theme.php modules/gallery/views/admin_theme_options.html.php themes/admin_wind/css/screen.css
2010-08-29Bump gallery module to v36 and add a favicon_url variable, which weBharat Mediratta
expose in Admin > Appearance > Theme Options and defaults to lib/images/favicon.ico. Thix fixes ticket #1312.
2010-08-29Move theme::get_edit_form_admin into admin_theme_options since that'sBharat Mediratta
the only place where it's used and the theme helper is loaded on every page view.
2010-08-29Convert the "parents" variable from a result iterator to an array soBharat Mediratta
that the theme can call empty() on it. Fixes #1318.
2010-08-22Get rid of the move dialog and move option. Instead, replace it withBharat Mediratta
a call to Organize with the appropriate album open. I have not yet figured out how to get the SWF code to highlight the active image, but that's coming. Partial fix for #1204.
2010-08-15We use UTF-8 everywhere. Fixes ticket #1285.Bharat Mediratta
2010-08-11Send back the content length of files. This fixes streaming movies. Fixes ↵Bharat Mediratta
ticket #974.
2010-08-09"Content-type" --> "Content-Type".Bharat Mediratta
2010-08-09The root album's edit form doesn't have a name field, so don't countBharat Mediratta
on it being there in update(). Fixes ticket #1281.
2010-08-08Fix for ticket #1279. In admin themes sanitize the theme name before ↵Tim Almdal
checking that theme.info exists.
2010-08-07Add the ability to replace the source data file in Item_Model::save().Bharat Mediratta
Refactor the rotate code in Quick_Controller to replace the data file, and then have gallery_event::item_updated_data_file() pick up after the change is saved, rebuild the image and handle album covers. This is much more portable than before and it will allow any mechanism (eg: REST) to replace the source image.
2010-08-07Whitespace fix.Bharat Mediratta
2010-08-06Use module::install and module::activate for the gallery module asBharat Mediratta
well; I've verified that it generates the same installer files.
2010-08-01Use the login/html page for maintenance mode; we don't need theBharat Mediratta
maintenance controller/view anymore. Fixes ticket #1267.
2010-08-01Make maintenance mode a variable instead of a config. Then createBharat Mediratta
links on the Admin > Maintenance page to allow you to turn it on and off. This should be efficient since we cache all vars and look them up on every request anyway. This also allows us to have the Fix task enable maintenance mode while it's running which greatly reduces the chances that somebody will come along and hork the database while we're tinkering with MPTT pointers. Fixes ticket #1259.
2010-08-01Make the continuation url go to admin/maintenance.Bharat Mediratta
2010-07-31Full pass over all the JSON encoding and JS dialog code. We now abideBharat Mediratta
by the following rules: 1) An initial dialog or panel load can take either HTML or JSON, but the mime type must accurately reflect its payload. 2) dialog form submits can handle a pure HTML response, but the mime type must also be correct. This properly resolves the problem where the reauth code gets a JSON response first from the reauth code, and then an HTML response when you reauth and continue on to a given form -- try it out with Admin > Settings > Advanced. 3) All JSON replies must set the mime type correctly. The json::reply convenience function does this for us. 4) By default, any HTML content sent back in the JSON response should be in the "html" field, no longer the "form" field. The combination of these allows us to stop doing boilerplate code like this in our controllers: // Print our view, JSON encoded json::reply(array("form" => (string) $view)); instead, controllers can just return HTML, eg: // Print our view print $view; That's much more intuitive for developers.
2010-07-31Resend the entire dialog content (including the wrapping view) instead of ↵Tim Almdal
just the form.
2010-07-31Missing the user name on the reauthenticate form.Tim Almdal
2010-07-31When the admin controller redirects to the reauthenticate controller, the ↵Tim Almdal
value of request::is_ajax() from the original request is lost. This patch stores its value in the session so the reauthenticate controller knows whether its in a dialog/panel or not.
2010-07-31Convert the admin_theme controller to use the json::reply methodTim Almdal
2010-07-31More patches as part of #1225. Change the 'core' modules to use the json::replyTim Almdal
method to set the content type header and encode the response as a json object
2010-07-31Use readfile() instead of fopen()/fpassthru()/fclose() for brevity.Bharat Mediratta
I've done some tests on a 60M flv and found that there's no difference in memory consumption with these three approaches: public function test() { Kohana::close_buffers(false); $file = "/home/bharat/basketball.flv"; if ($fd = fopen($file, "rb")) { while (true) { $bits = fread($fd, 65535); if (strlen($bits) == 0) { break; } print $bits; set_time_limit(30); } fclose($fd); } Kohana_Log::add("error","test: " . print_r(array(memory_get_peak_usage(true),memory_get_peak_usage(false)),1)); } public function test2() { Kohana::close_buffers(false); $file = "/home/bharat/basketball.flv"; $fd = fopen($file, "rb"); fpassthru($fd); fclose($fd); Kohana_Log::add("error","test2: " . print_r(array(memory_get_peak_usage(true),memory_get_peak_usage(false)),1)); } public function test3() { Kohana::close_buffers(false); $file = "/home/bharat/basketball.flv"; readfile($file); Kohana_Log::add("error","test3: " . print_r(array(memory_get_peak_usage(true),memory_get_peak_usage(false)),1)); }