Commit Graph
2849 Commits
Author SHA1 Message Date
Bharat Mediratta 284788d964 Switch from stdClass to arrays which works around issues caused in
http://dev.kohanaphp.com/issues/2459 -- I don't exactly know why, but
the solutions are equivalent so I'm not going to dig too far.
2010-01-18 12:08:39 -08:00
Bharat Mediratta 41a392611c Change DENY and ALLOW to "0" and "1" to match the fact that ORM no
longer typecasts values as of http://dev.kohanaphp.com/issues/2459
2010-01-18 12:08:05 -08:00
Bharat Mediratta 4eafe97b48 Reload $item after removing view permissions. 2010-01-18 11:57:23 -08:00
Bharat Mediratta 0dc184e99f Overload url::current() and url::merge() to make the current url XSS
safe.  Add tests to make sure that it doesn't relapse with future
Kohana changes.  Fixes ticket #983.

Ref: http://gallery.menalto.com/node/93738
2010-01-18 11:10:37 -08:00
Bharat Mediratta 2c2c77ea39 Remove debug code. 2010-01-16 00:19:35 -08:00
Bharat Mediratta dcf4b5e71a Don't pass MY_ORM::original() to update event handlers, since after
parent::save() it'll be reset.  Clone it first.

This is an alternate fix for #978.
2010-01-16 00:13:28 -08:00
Bharat Mediratta 9f03d36d6e Don't use MY_ORM::original() here since the values may not have
changed since the last save.  Instead, use the original ORM passed in.
2010-01-16 00:10:55 -08:00
Bharat Mediratta 00c73a4b07 Revert "Fix for ticket #978. Don't reset the original property as part of the save processing, because that will overwrite the original values with all the new values. The problem with the original approach is that when changed event handlers used ->original(), it had already been reset as part of the save processing. Went back and forth on either leaving this alone and forcing callers to save the original prior to calling the save function, but there were a few event handlers that used ->original(). This seemed the easier change. So to reset the original you need to call reload() or clear(). There is now an optional parameter on the reload to only reload the original."
This reverts commit daeaca110d.
2010-01-15 23:53:43 -08:00
Bharat Mediratta 99073c3e20 Revert "Did the old commit then save trick"
This reverts commit e41ad23a8e.
2010-01-15 23:53:35 -08:00
Tim Almdal 260660b2f6 Somemore K24 migration holdovers. need to specify the where statement with operands. '=' is no longer assumed. Fixes ticket #979 2010-01-13 12:08:56 -08:00
Tim Almdal e41ad23a8e Did the old commit then save trick 2010-01-13 11:47:27 -08:00
Tim Almdal daeaca110d Fix for ticket #978. Don't reset the original property as part of the save processing, because that will overwrite the original values with all the new values. The problem with the original approach is that when changed event handlers used ->original(), it had already been reset as part of the save processing. Went back and forth on either leaving this alone and forcing callers to save the original prior to calling the save function, but there were a few event handlers that used ->original(). This seemed the easier change. So to reset the original you need to call reload() or clear(). There is now an optional parameter on the reload to only reload the original. 2010-01-13 11:27:09 -08:00
Tim Almdal 639f1e741a Put quotes around the item titles in all the messages and more importantly actually display the original's title properly. Fixes ticket #966, but does now show us ticket #978 2010-01-12 11:42:31 -08:00
Tim Almdal e81acce985 If the user hits enter in the search text field, then cancel the submission, because the search is done in the browser and the the enter will unexpectedly reload the root directory. 2010-01-12 09:42:06 -08:00
Tim Almdal 42d7c9590e Correct the "l10n_client_data[index] is undefined" error. 2010-01-12 08:58:49 -08:00
Tim Almdal 9ff9d70fe2 Some whitespace and syntax corrects 2010-01-12 08:32:33 -08:00
Tim Almdal 3dfac5884f Add a css id attribute to the i10n-edit-translation element. Fixes ticket #969. 2010-01-12 08:31:28 -08:00
Tim Almdal 3b26d87f3a Reformat the string list so that the search box does not get push off the end of the page. 2010-01-11 14:22:16 -08:00
Tim Almdal 2b283f4d01 Remove the translation submit button from translation search form. Fixes ticket #975 2010-01-11 13:26:10 -08:00
Tim Almdal 284e14d50e Remove the automatically marking the resizes dirty line as this could cause alot of pain to some installations 2010-01-11 10:48:27 -08:00
Tim Almdal 3ab6c4915a Fixes ticket #671.
In the graphics_rules table height and width set the maximum height and width
values and should be equal.  Initially, the height on the resize target rule was
less than the height, which artificially constrained images in portrait mode.

**Note"" this fix requires an upgrade to version 22.  All the resizes will be flagged
dirty.
2010-01-11 10:42:39 -08:00
Tim Almdal a11bf29507 Fix for ticket #972 and more. In Kohana 2.4, ORM::delete_all ignores any where
clauses and deletes all the entries in the table unless an array of id's are
passed as the parameter.  This fix used the Database_builder to specify any where
conditions. Thanks psvo for find the first one. :-)
2010-01-09 23:57:16 -08:00
Tim Almdal bd9f945e3f Remove the display of the "body_attributes" div when in debug mode. debug mode is by default set up to add new div's to display the location of the content. "body_attributes" are attributes on the body tag and trying to add content introduces an extra > in the html stream. 2010-01-08 12:49:16 -08:00
Tim Almdal 2ab6eda728 Change file proxy to url encode the path components instead of the entire path. Otherwise, we will encode the slashes and won't find the item. 2010-01-08 12:18:46 -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 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 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 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
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