Commit Graph
3473 Commits
Author SHA1 Message Date
Bharat Mediratta 87f8b6ff0a Bounce the user to the login page if they try to get to part of the
admin site as a guest.  Also, theme the login/html page.
2010-06-12 15:28:03 -07:00
Bharat Mediratta dceecabbf1 Make login/logout continuation url code consistent. Where necessary,
we specify the continue_url in the session, but we store it in the
login form so that we can propagate it across the session creation
that happens at login time.
2010-06-12 15:16:47 -07:00
Bharat Mediratta c026da85cd Use "continue_url" instead of "continue" for consistency with the
reauth code.
2010-06-12 15:10:34 -07:00
Bharat Mediratta b61b50604b Push the continue url into the form for consistency with other
login/continue code.
2010-06-12 15:09:16 -07:00
Bharat Mediratta 63d95087bf Stop trying to parse the continue url in the logout controller because
it requires us to reproduce a bunch of complex routing logic.
Instead, just have the logout link generating code generate a link
that's visible to guests.
2010-06-12 13:35:12 -07:00
Bharat Mediratta a4586bc0c0 Revert "Fix for ticket #1118. The item validation was flagging duplicate slugs as errors. There was already code in the item save to insure that any"
This introduces a bug where you can create two items with the same slug.

This reverts commit cb01f4017d.
2010-06-12 13:05:40 -07:00
Tim Almdal cb01f4017d Fix for ticket #1118. The item validation was flagging duplicate slugs as errors. There was already code in the item save to insure that any
duplicates were made unique, so this patch removes the validation as unnecessary.
2010-06-11 16:37:45 -07:00
Tim Almdal 41c18929cd Remove the duplicate query when searching as pointed out by joe7 on ticket #844 2010-06-11 15:54:08 -07:00
Tim Almdal 4c6045843d Merge branch 'master' of git@github.com:gallery/gallery3 2010-06-11 15:41:00 -07:00
Tim Almdal bbbb35675a Fix for ticket #1039. The problem was, as Bryan76 pointed out, with passing the full url in the continue parameter. In the logout controller, we tried to get the item from the url so we could check the permission of the item to insure that the guest user had access. But url::get_item_from_url expects a relative url. 2010-06-11 15:40:54 -07:00
Bharat Mediratta 2c1e3800ef Send back the REST API version as a header. It's on every request,
which sucks, but it's totally unobtrusive because it's a header so
that's ok.  Decided that the current version is "3.0" although it will
surely change before the final 3.0 release.

Fixes ticket #1148
2010-06-11 14:59:17 -07:00
Tim Almdal bb35aefffb Fix for ticket #797
When load a file is uploaded using a dialog box and the jquery plugin ajaxForm, the ajaxForm plugin uses an hidden iFrame element to send the multi-part
form and this is where the response goes.  The ajaxForm plugin then retrieves the document body and parses the result as a json string. If the file uploads
properly everything is fine, but if it fails Gallery3 return the input form with the the error fields highlighted as part of the json response. As this
response is returned to a hidden iframe, the browser attempts to manipulate it and all hell breaks loose. We lose the trailing brace, we start getting
escaping of form tags. When the ajaxForm plugin retrieves the iFrame body its no longer a valid json frame and the parsing fails and the user sees no
indication that it failed.
2010-06-11 12:36:23 -07:00
Tim Almdal 30f4e143e8 Actually execute the database query that updates the album view count. Fixes ticket #1092. Thanks to shinta for pointing the way. 2010-06-11 08:17:03 -07:00
Tim Almdal 58b21e909d Change the pattern used to convert the file name to a title. Fixes ticket#1061 2010-06-10 18:49:29 -07:00
Bharat Mediratta 26d0af45ea New version of EXIF gets ISO and Metering Mode right. Yay! 2010-06-09 21:45:05 -07:00
Bharat Mediratta ab93767e4d Update golden file 2010-06-09 21:26:36 -07:00
Bharat Mediratta 6556ca8833 In GalleryCodeFilterIterator::accept(), ignore . and .., and stop caring about .svn 2010-06-09 21:23:42 -07:00
Bharat Mediratta aff0f6eca8 Fix get_ancestor_test() since the parameter was renamed to ancestors_for. 2010-06-09 20:55:39 -07:00
Bharat Mediratta 3dacafb718 Revert the "preserve_ids" global query parameter. We decided that it was a
bad idea.

This reverts commit 6425d41edd.
2010-06-09 20:49:32 -07:00
Bharat Mediratta b40057283e Add a "can_edit" field to the Item_Model's REST output. It's
applicable to the current user.
2010-06-08 20:59:24 -07:00
Bharat Mediratta 9ec600fd45 Merge branch 'master' of github.com:gallery/gallery3 2010-06-07 23:13:49 -07:00
Bharat Mediratta 6425d41edd Add a "preserve_ids" global query parameter for REST requests that
indicates that we shouldn't opportunistically convert ids into REST
urls.
2010-06-07 23:12:52 -07:00
Bharat Mediratta 98fce83de5 Add a "convert_ids" parameter to Item_Model::as_restful_array(), which
we can turn on with a query parameter.
2010-06-07 22:23:46 -07:00
Bharat Mediratta 5151f0b865 Improve a comment. 2010-06-07 22:18:09 -07:00
Tim Almdal fef5cf9865 If the identity provider changes then delete all the rest user_access_keys, as they are no longer valid. (i.e. all the related users have been deleted.) 2010-06-07 07:09:39 -07:00
Bharat Mediratta 1d91e1b2dc Don't show the rotate links if the active user can't edit the photo. Fixes ticket #1157. Thanks to psvo. 2010-06-06 23:19:02 -07:00
Bharat Mediratta ab0bef14be Try to adjust for situations where /proc/loadavg is_readable() but
generates an error if we call file() on it.  Fixes ticket #1149.
2010-06-06 21:08:10 -07:00
Bharat Mediratta 0c1fb03914 Updated to Exifer 2010-06-06 21:01:36 -07:00
Bharat Mediratta aeee88031f Fix an unused variable caused by converting straight query params
to $entity based params.
2010-06-06 13:06:08 -07:00
Bharat Mediratta e1d3b0295d Change "ancestor_for" to "ancestors_for" for consistency. 2010-06-06 12:42:16 -07:00
Bharat Mediratta 4e56176f35 item::random_query() doesn't need to take a "where" clause because
it's returning a query, so the caller can add the where clause
himself.  This makes for a cleaner API.
2010-06-05 23:47:47 -07:00
Bharat Mediratta 87fde3f360 Create a UI under Admin > Settings > Comments where you can limit
comments only to registered users.  It's simplistic, but is better
than adding a permission since generally this setting will be used
Gallery-wide.

Fixes ticket #1002
2010-06-05 23:35:32 -07:00
Bharat Mediratta 10895ca529 Undo the change added in e4eedbce22
which deactivates modules on upgrade.  No idea why we did that, but it
breaks upgrading because it deactivates any module that's been
upgraded.
2010-06-05 23:04:23 -07:00
Bharat Mediratta 0350cf3cd8 Fix a comment typo. 2010-06-05 22:50:20 -07:00
Bharat Mediratta 4603d7010d Merge branch 'master' of github.com:gallery/gallery3 2010-06-05 19:45:44 -07:00
Bharat Mediratta 481ef823dd Add an advanced setting to allow developers to allow guest access to
REST entities.
2010-06-05 19:45:15 -07:00
Tim Almdal fd437aec2b Correct XSS Security Test golden file for recent changes. Update the controller_auth data file for the rename
of admin_comments to admin_manage_comments.
2010-06-04 14:05:26 -07:00
Tim Almdal ed1905d3f9 Change the name of the private format_restful_item to _format_restful_item so that the File_Structure_Test will pass. 2010-06-04 14:05:25 -07:00
Tim Almdal 686da5a3e0 Save the item before updating the order of the children. Also always increment the weight count (even if it is equal to the weight of the current child) 2010-06-04 14:05:25 -07:00
Tim Almdal a600185b60 Allow the use of the type query parameter to filter the results of a rest/gallery/items?urls=... request. This allows the client to pass the entire list of member urls and have the rest server filter the results based on the specified types.
(cherry picked from commit 3fe10b15cf)
2010-06-04 14:05:24 -07:00
Tim Almdal 04b90c3bde Remove the item id from the rest/gallery/items url as that was inconsistent. Add the query parameter ancestors_for=<url> to provide a restful way to retrieve the ancestors of an item.
(cherry picked from commit e9c8a8ae53)

Conflicts:

	modules/gallery/helpers/items_rest.php
2010-06-04 14:05:24 -07:00
Bharat Mediratta 110350776d Merge branch 'master' of github.com:gallery/gallery3 2010-05-18 09:11:23 -07:00
Tim Almdal 73c7ec5310 Save the item before updating the order of the children. Also always increment the weight count (even if it is equal to the weight of the current child) 2010-05-18 06:16:47 -07:00
Bharat Mediratta ab204d2720 Rename the admin_comments view to admin_manage_comments to match the controller. 2010-05-16 23:01:57 -07:00
Bharat Mediratta 2157285d9b Rename admin/comments to admin/manage_comments to make room for
admin/comments to be a settings page.
2010-05-16 22:53:19 -07:00
Bharat Mediratta c682ba86bd Make sure that $item exists in site_menu(). 2010-05-16 22:37:10 -07:00
Tim Almdal 83ce637ce3 Allow the use of the type query parameter to filter the results of a rest/gallery/items?urls=... request. This allows the client to pass the entire list of member urls and have the rest server filter the results based on the specified types.
(cherry picked from commit 3fe10b15cf)
2010-05-15 23:43:25 -07:00
Tim Almdal 48b66f2d67 Remove the item id from the rest/gallery/items url as that was inconsistent. Add the query parameter ancestors_for=<url> to provide a restful way to retrieve the ancestors of an item.
(cherry picked from commit e9c8a8ae53)

Conflicts:

	modules/gallery/helpers/items_rest.php
2010-05-15 23:42:55 -07:00
Bharat Mediratta 1240878df0 Fix-ups for d98b85f7d3
- Pass the CSS selector of the active image in as an arg to site_menu
  so that quick operations know what they're operating on.
- Change the ids from g-{photo,movie}-id to the generic g-item-id
- Initialize ajax handlers for site menu on the photo and movie page
- Drop the movie context menu, it's now in the site menu
2010-05-14 16:55:15 -07:00
Bharat Mediratta 3422185938 Remove "rnd=" param from quick changes since we have the m= cache-buster already. 2010-05-14 16:51:51 -07:00