Commit Graph

4686 Commits

Author SHA1 Message Date
Bharat Mediratta
895ac72e70 Add item::random() to return a random Item_Model. 2010-01-08 11:49:18 -08:00
Bharat Mediratta
3fc6dab7ac Expect merge_where and merge_or_where to handle empty tuples. 2010-01-08 11:49:01 -08:00
Bharat Mediratta
2d8843ba4d use item::random() to get the random item. 2010-01-08 11:48:44 -08:00
Bharat Mediratta
a2f5ace493 Change merge_where() and merge_or_where() to ignore empty tuples so that chaining is easier. 2010-01-08 11:47:00 -08:00
Bharat Mediratta
14f6e5f6d3 Allow the "name" param in get() so that you can restrict the query to children with a given name. 2010-01-08 11:12:02 -08:00
Bharat Mediratta
d43badb4ec Change url parsing in resolve() to ignore the query string. 2010-01-08 11:11:38 -08:00
Tim Almdal
46e33f1bbe Fix for ticket #933. Move the inclusion of the piclens script from the theme::header callback to the theme::page_bottom callback. 2010-01-08 11:06:54 -08:00
Tim Almdal
58620c5faa Use rawurlencode to remove any encoding that the browser may have added. Fixes ticket #954. 2010-01-07 10:55:43 -08:00
Bharat Mediratta
c711bf1b1f Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2010-01-07 10:41:19 -08:00
Bharat Mediratta
10c05c855a Merge branch 'master' of git@github.com:gallery/gallery3 2010-01-06 17:05:00 -08:00
Bharat Mediratta
058a84ed76 Convert ORM::in() to ORM::where(.., "IN", ..) for K24 compatibility. 2010-01-06 17:04:44 -08:00
Tim Almdal
188f418a54 Correct the controller_auth_data golden file to reflect that the csrf is not longer considered dirty in the logout controller. 2010-01-06 11:42:44 -08:00
Bharat Mediratta
31454d37b3 Improve REST tag support.
- Add support for retrieving a list of members from a collection
- Implement put(), post() and delete() for tags.
- Use tag_rest::delete() as a way to remove members from the tag collection
2010-01-05 13:41:06 -08:00
Bharat Mediratta
c5d1443895 $offset should be null by default, not 0. Hold over bug from the K24 migration. 2010-01-05 12:05:37 -08:00
Bharat Mediratta
d18be7fe55 $offset should be null by default, not 0. Hold over bug from the K24 migration. 2010-01-05 12:05:22 -08:00
Bharat Mediratta
3fffa18e65 Further progress on refining the REST server side code.
1) Deal in fully qualified URL resources through the rest
   interface.  All rest methods are now passed the complete url in
   request->url.

2) Create rest::resolve() which lets individual resource definition
   code convert a full url into the appropriate matching resource.
   Implement gallery_rest::resolve() and tag_rest::resolve()

3) Reimplement tag_rest's get() and post() methods.  They're much
   simpler now.

4) Implement the tags_rest helper which supports working with the
   entire tags collection.
2010-01-04 21:48:21 -08:00
Bharat Mediratta
1cab4221ab Merge branch 'master' of git@github.com:gallery/gallery3 2010-01-04 21:38:39 -08:00
Bharat Mediratta
6b8a52d328 Fix the logout link to send you back to the current url. The old
approach depended on having an $item, which is not the case on all
pages (eg: tag pages).  Also, check the CSRF in the logout controller,
else you can use the logout link as a blind forwarder.
2010-01-04 21:37:51 -08:00
Tim Almdal
8ae0d4c196 Change uppercase NULL to lowercase null to match the gallery3 style guide 2010-01-04 13:00:15 -08:00
Tim Almdal
bfcd4efe92 Another K2.4 holder over... We had, when checking for position, ->where(, "=", NULL) which would never find any. It should have been ->where(, "is", NULL) 2010-01-04 12:39:48 -08:00
Tim Almdal
cbf9754922 Send an empty Pragma header and use the item-updated time in the last-modified header 2010-01-04 09:10:12 -08:00
Bharat Mediratta
0e3327bca7 Simplify the REST API code. Here's what I did:
1) Simplify gallery_rest to return flat models, no children and do no
   validation for now.
2) Flatten the REST replies and use HTTP codes to indicate
   success/failure instead of additional status messages.
3) Use the message and error code support in the base Exception class,
   instead of brewing our own in Rest_Exception.
4) Get rid of rest::success() and rest::fail() -- we only need
   rest::reply() since all failures are covered by throwing an
   exception.
5) Get rid of /rest/access_key and just use /rest for authentication.
6) Inline and simplify rest::normalize_request since we only use it once
7) Change rest::set_active_user to succeed or throw an exception
8) Extract Rest_Exception::sendHeaders into rest::send_headers()

Here's what's currently broken:
1) Data validation.  There currently is none
2) Logging.  That's gone too
3) image block and tag code is broken
4) Tests are broken
5) No movie support
2010-01-03 20:30:35 -08:00
Tim Almdal
64e5efd57b Add rest_controller::__call to the authorized controller methods 2010-01-02 17:09:40 -08:00
Tim Almdal
5b9801092b Remove the Rest_Exception::trigger method. 2010-01-02 16:55:06 -08:00
Tim Almdal
07f8e256cf Clean up gallery_rest helper test 2010-01-02 16:22:03 -08:00
Bharat Mediratta
11f6a3d1eb Merge branch 'master' of git@github.com:gallery/gallery3 2010-01-02 15:49:17 -08:00
Bharat Mediratta
bad83900ae Fix two issues with change_album_test()
1) We do support changing the name.
2) Choose a random name to avoid conflicts.
2010-01-02 15:48:58 -08:00
Tim Almdal
ff95c4079e Fix the tag_rest helper tests 2010-01-02 15:48:54 -08:00
Tim Almdal
d4ad81e657 Correct unexpected error in gallery_rest_put_album_no_path_test 2010-01-02 15:04:43 -08:00
Bharat Mediratta
681613ac9e Fix up tabs, leading <?php. 2010-01-02 14:52:10 -08:00
Bharat Mediratta
7369c68ddd Ignore modules/gallery/views/kohana/error.php -- we're required to have that name by Kohana_404_Exception. 2010-01-02 14:47:59 -08:00
Bharat Mediratta
3ceb0d57ba Update the expected response after modifying an album to match the
change I made in 20bd09ff00
2010-01-02 14:37:51 -08:00
Bharat Mediratta
7c03644777 Update the expected response after modifying an album to match the
change I made in 20bd09ff00
2010-01-02 14:33:31 -08:00
Tim Almdal
28597ba533 Correct file structure tests, Have the tests delete the userid they create so as not to impact other tests. 2010-01-02 14:31:59 -08:00
Bharat Mediratta
bff7b393ec Stop checking the exact nature of all grups after install. It doesn't add any value. 2010-01-02 14:02:41 -08:00
Bharat Mediratta
183e65210a Verified and updated. 2010-01-02 14:00:28 -08:00
Bharat Mediratta
b3023493f4 Clean the G2 base url so that we can't leak XSS vulnerabilities that
way (highly unlikely, but now it's impossible).
2010-01-02 14:00:00 -08:00
Bharat Mediratta
8e4c48837c Verified and updated. 2010-01-02 13:56:01 -08:00
Bharat Mediratta
14b0ab08b4 Update the expected response after modifying an album to match the
change I made in 20bd09ff00
2010-01-02 13:53:01 -08:00
Bharat Mediratta
4ab2400d18 Add a cache buster to the resize and file urls. This fixes ticket 2010-01-02 13:47:28 -08:00
Bharat Mediratta
e413cb3011 Merge branch 'master' of git@github.com:gallery/gallery3 2010-01-02 12:53:56 -08:00
Bharat Mediratta
1544bea535 Add a tip about deactivating some modules to make importing faster.
Combine two tips into one.
2010-01-02 12:46:28 -08:00
Bharat Mediratta
f65794785a Take precautions against deleting var/albums, var/thumbs or var/resizes.
Fixes ticket #916.
2010-01-02 10:51:47 -08:00
Tim Almdal
77cabb056f Merge branch 'master' of git@github.com:gallery/gallery3 2010-01-02 08:42:14 -08:00
Tim Almdal
1b3d20a0fb Correct formatting in the uploadify dialog box for safari. 2010-01-02 08:42:06 -08:00
Bharat Mediratta
0be0111b74 Remove an obsolete todo. 2010-01-01 22:11:08 -08:00
Bharat Mediratta
c3075d8181 Add a code block showing how to add a mod_rewrite block to the old Gallery2 install to redirect urls to Gallery 3. 2010-01-01 21:58:07 -08:00
Bharat Mediratta
80e35affcb Improve the PHPdoc for map()
We now expect to either get query parameters from the Gallery2 url so
we can pick off g2_itemId, or we'll get the rewrite url in the path
query param.
2010-01-01 21:56:29 -08:00
Bharat Mediratta
161366e51d New controller for remapping Gallery 2 urls to Gallery 3 urls. 2010-01-01 21:02:52 -08:00
Bharat Mediratta
6d5d68a3f9 Start tracking the original G2 url and id for all entities. This will
allow us to map G2 image urls to the appropriate G3 ones.
2010-01-01 17:41:20 -08:00