summaryrefslogtreecommitdiff
path: root/modules/server_add/controllers
AgeCommit message (Collapse)Author
2009-10-23Adjust order of items on server_add admin page. Restore autocomplete to the ↵Chad Kieffer
add form. Created a server_add.css file.
2009-10-18Moved the short_form init function to gallery.common and made it jQuery ↵Chad Kieffer
plugin. Dropped gallery.form.js. Applied short forms to server_add and tag admin pages. Added tag.css to admin views. Added .g-wide {}.
2009-10-04Renamed more CSS selectors from gName to g-name.Chad Kieffer
2009-10-04Renamed most, if not all css selectors from gName to g-name. Moved a few ↵Chad Kieffer
shared images from wind to lib. Deleted unused images in the admin_wind. This will likely break a few ajax features.
2009-09-17Don't try to creat an album that corresponds to the staging directory. Just ↵Tim Almdal
add the contents of the staging directlyinto the album that server_add was invoked from. Fixes ticket #785
2009-09-17Don't show links as part of the auto complete listTim Almdal
2009-09-15Adjust the text of the symlink error message.Bharat Mediratta
2009-09-15Forbid from add symbolink link in admin server add. Read ticket #744 for ↵Jan Koprowski
more details.
2009-08-29Merge commit 'upstream/master'Andy Staudacher
Conflicts: modules/akismet/views/admin_akismet.html.php modules/comment/helpers/comment_rss.php modules/gallery/helpers/gallery_rss.php modules/gallery/libraries/I18n.php modules/gallery/views/permissions_browse.html.php modules/gallery/views/simple_uploader.html.php modules/info/views/info_block.html.php modules/organize/controllers/organize.php modules/organize/views/organize.html.php modules/organize/views/organize_album.html.php themes/default/views/album.html.php themes/default/views/movie.html.php themes/default/views/photo.html.php
2009-08-29Refactor all calls of p::clean() to SafeString::of() and p::purify() to ↵Andy Staudacher
SafeString::purify(). Removing any p::clean() calls for arguments to t() and t2() since their args are wrapped in a SafeString anyway.
2009-08-27Properly deal with invalid images. This fixes ticket #611 which showsBharat Mediratta
a BMP masquerading as a .jpg causing us to be unable to rebuild resizes and thumbnails. Now if that happens, we discard the file, log it and move on.
2009-08-04Skip empty files, since we know they're broken. Fixes ticket #610.Bharat Mediratta
2009-07-21Fix some consistency in text.Shai Ben-Naphtali
This fixes ticket #546 Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-07-19Fix l10n message inconsistency, ticket 546Andy Staudacher
2009-07-11Further simplify server_add (and bump it to version 3).Bharat Mediratta
Now we don't have checkboxes, but instead we restrict you to selecting directories and albums from only one level in the hierarchy. This makes it easier for us to make sure that we properly create the hierarchy that you want and avoid confusion about what's going to wind up where. Modify Server_Add_File_Model to have a parent_id and item_id and then modify them as we go so that we can build up a tree structure there *before* we create any items. This makes it much easier to figure out where a new item is going to go and get rid of a bunch of probably buggy code in the main task.
2009-07-10Remove debug code.Bharat Mediratta
2009-07-10Fix a bug where we were not properly locating the parent album whenBharat Mediratta
adding a new album or photo. Simplify the data structure that we pass down to server_add_tree.html.php so that we just pass a file list and let it do whatever it wants with it.
2009-07-09Avoid blowing the task data column by only adding directories to the queue ↵Bharat Mediratta
instead of directories and files.
2009-07-09Add status output to make it clearer what's happening when you add files.Bharat Mediratta
2009-07-07Rework server_add. It's smaller and leaner now, storing the list ofBharat Mediratta
files out in a separate model for scalability. Removed the "pause" functionality. - Server_Add_Controller extends Admin_Controller so that we don't have to check for admin every time. - Task completion time now factors in the time it takes to walk the arbitrarily deep trees - Moved checkbox management entirely into JS using jQuery - Simplified the JS considerably
2009-07-02Merge branch 'master' of git@github.com:/gallery/gallery3Bharat Mediratta
Conflicts: modules/server_add/controllers/admin_server_add.php
2009-07-02Temporary version add() that just dumps out the values for now.Bharat Mediratta
2009-07-02Partial pass of server_add cleanup. It's broken at this stage sinceBharat Mediratta
I've redone the browsing code but I have not implemented the adding code. 1) Rename index() to browse() since index is too generic. 2) Simplify the data that we pass to _dialog and _tree 3) Change _tree to return list items only, so that the outer dialog can be a <ul> for consistency. 4) Simplify the data structures so that we're not tracking checked vs. unchecked status in the PHP code, it's all done in jquery where we can do it with just a line or two of JS 5) use glob() which pretty much entirely replaces _get_children
2009-07-02Eliminate temporary variables by passing the $item into the view andBharat Mediratta
making API calls on the item.
2009-07-02In remove_path(), if the path is invalid don't echo it back in the UI.Bharat Mediratta
2009-07-01Fix a bunch of XSS vulnerabilities turned up by manual inspectionBharat Mediratta
using the checklist in ticket #385.
2009-06-10Changed how directories are processed when the parent directory is selected andTim Almdal
the branch was never opened on the client. This should fix some of the issues with the server_add as I was able to select the staging directory and then add over 400 images in a multi-tier structure. Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-05Rewrite the server_add to have the server format the selection when a branch ↵Tim Almdal
is opened. Sub trees re only retrieved when the branch is opened. Changed the start task processing to fill in any subtrees that are selected, but were never expanded on the client. Added the loading icon. Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-06-01Security pass over all controller code. Mostly adding CSRF checkingBharat Mediratta
and verifying user permissions, but there are several above-the-bar changes: 1) Server add is now only available to admins. This is a hard requirement because we have to limit server access (eg: server_add::children) to a user subset and the current permission model doesn't include that. Easiest fix is to restrict to admins. Got rid of the server_add permission. 2) We now know check permissions at every level, which means in controllers AND in helpers. This "belt and suspenders" approach will give us defense in depth in case we overlook it in one area. 3) We now do CSRF checking in every controller method that changes the code, in addition to the Forge auto-check. Again, defense in depth and it makes scanning the code for security much simpler. 4) Moved Simple_Uploader_Controller::convert_filename_to_title to item:convert_filename_to_title 5) Fixed a bug in sending notification emails. 6) Fixed the Organize code to verify that you only have access to your own tasks. In general, added permission checks to organize which had pretty much no validation code. I did my best to verify every feature that I touched.
2009-05-21Change $view->action to a absolute url.Bharat Mediratta
2009-05-13Gee it's May already. Update copyright to 2009.Bharat Mediratta
2009-05-13Create a new "add" permission and require it at the controller levelBharat Mediratta
when adding photos/movies/albums
2009-05-09Remove quotes and correct typoTim Almdal
2009-05-09Fix for ticket #217Tim Almdal
2009-04-231) Change the processing so the server_add start task can return done = 1Tim Almdal
if there are no eligible files selected 2) Change the javascript to handle this condition and show a pop up
2009-04-09Don't try to import the staging directory as an albumTim Almdal
2009-04-09Create a pause method on the server_add controller and get rid of theTim Almdal
optional parameter/
2009-04-08Fixes issues with Server Add:Tim Almdal
1) Fixes Ticket #208 2) Fixes Ticket #190 3) Fixes an unticketed issue where two items could collide when creating the thumbnail and/or resize. For example, loading a.flv and a.jpg would have generated the same thumbnail image. This change adds a random value to the name to avoid conflicts. 4) Added item::__set() to clear the relative path if the name changes
2009-04-03Fix for ticket #200. When an error occurs the current uri is noTim Almdal
longer admin/server_add but admin/server_add/add_path and the equality check fails.
2009-03-25Fix for ticket #184. Sort the output children as DirectoryIteratorTim Almdal
does not provide a sort order. Separate the directory and files, sort them individually and then merge them together so directories are at the top of the list
2009-03-24Fix the problem I created by trying to run the task again after it was ↵Tim Almdal
completed.
2009-03-24Add a pause button to the server add dialog and if it is clicked thenTim Almdal
the upload is paused. If the dialog is closed and the task is not complete then a warning message is displayed on the album.
2009-03-11Refine the task api but removing the optional parameters on theTim Almdal
task::create method call
2009-03-10Refactor the server add module to make use of the task api (TicketTim Almdal
#125). Haven't quite figured out what to do with the errors in the context. Maybe they should show on the mainenance screen?
2009-03-09Fix for ticket #135Tim Almdal
2009-03-05Remove stray reference to server_add_dir_list.html.phpBharat Mediratta
2009-03-05Cleanups.Bharat Mediratta
- Show the "Server Add needs configuration" message whenever there are no paths. - Un-ajaxify the admin code to remove complexity and allow us to update the status message as appropriate. - Rename server_add_admin.html.php to admin_server_add.html.php for consistency. - Fix up form to properly display error messages - Get rid of server_add_dir_list.html.php now that we're non-ajaxified. - Change delete <span> to an <a> for non-ajax world.
2009-03-05Change how the urls are built in the java scriptTim Almdal
2009-03-04Last of changes required from Bharat's 2nd review passTim Almdal
2009-03-04Changed $uid to $tree_id, so not to confuse anyone between and acroynmTim Almdal
for unique identifier as opposed to user id. :-)