Commit Graph
244 Commits
Author SHA1 Message Date
Bharat Mediratta df001700dd Don't enable the rest module by default yet; we should make sure that
we do a more thorough security audit on it first.
2010-01-01 12:17:04 -08:00
Tim Almdal c4ba5b6f65 Correct the sql so that the guest and admin passwords are actually blanked as part of the export 2010-01-01 09:54:10 -08:00
Bharat Mediratta 20bd09ff00 A more thorough fix for #745 and #940. Stop using the referer to
guess how to send the user back.  Instead, proxy the originating item
id through the edit forms so that we can tell exactly what page we
were on when we began editing.  If we were viewing the item, then
redirect to its new url (in case it changed) to fix ticket #745.  But
if we were viewing some other item, then just stay on the current page
to fix #940.

The page_type approach didn't work because you'd have the same
"collection" page_type when doing a context menu edit for an album.
2009-12-31 17:21:19 -08:00
Tim Almdal 55eeb8336f Change the file proxy to use the expires helper to manage content expiration. Fixes ticket #953. 2009-12-30 09:55:28 -08:00
Bharat Mediratta 057e8d09af Convert a bunch of leftover kohana::show_404 calls to throw
Kohana_404_Exception instead.  These are the ones where we used a
lower-case 'k' so my previous filter didn't catch it.
2009-12-23 20:51:33 -08:00
Bharat Mediratta 8b9a02084a Updates for the latest version of Kohana 2.4:
1) Controller::$input is gone -- use Input::instance() now
2) Handle new 'database.<default>.connection.params' parameter
3) Handle new 'cache.<default>.prefix' parameter
2009-12-21 21:27:43 -08:00
Bharat Mediratta 8883d1605a Convert some more database queries. 2009-12-17 21:16:37 -08:00
Bharat Mediratta 9b75b85e71 Update all database queries such that we can run "php index.php
package" and generate the same SQL as before.
2009-12-17 21:05:58 -08:00
Bharat Mediratta c99a75b5d1 Improve the exception error message. 2009-12-17 09:16:44 -08:00
Bharat Mediratta f431d7e12e Convert a database call. 2009-12-16 18:04:44 -08:00
Bharat Mediratta 86467363c2 Convert a database call. 2009-12-16 18:03:23 -08:00
Bharat Mediratta 9b3b9c6da6 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2009-12-16 17:58:49 -08:00
Bharat Mediratta b4a35a8e2c Show the right edit form for movies. 2009-12-16 09:37:28 -08:00
Bharat Mediratta 4566c299c1 Convert some database calls. 2009-12-16 09:24:38 -08:00
Bharat Mediratta 064a24b897 Convert a database call. 2009-12-13 17:15:59 -08:00
Bharat Mediratta 8ed47ceaad Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2009-12-06 19:17:02 -08:00
Bharat Mediratta 0bb742ef33 Use NULL instead of actual values in the vars table, so that var tweaks result in smaller diffs. 2009-12-05 21:21:08 -08:00
Bharat Mediratta 62693db037 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2009-12-05 17:56:31 -08:00
Tim Almdal 267b3a1623 Make the rendering of the Theme Options page consistent between the first request and any errors 2009-12-04 13:48:52 -08:00
Bharat Mediratta d2cb217e20 Convert more database calls over to the new format
- admin/maintenance page loads, the rebuild thumbs/resizes task works
- Fixed up some conversion bugs in the Cache driver
2009-12-02 00:34:34 -08:00
Bharat Mediratta c803cb2909 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2009-12-01 19:44:29 -08:00
Bharat Mediratta 6fa880777c Beter fix for #925. 2009-12-01 13:37:07 -08:00
Bharat Mediratta f9ebe009c3 Use the real mime type for movies when we're requesting the full movie
instead of a thumbnail.  Fixes ticket #925, thanks to lsowen.
2009-12-01 13:34:40 -08:00
Bharat Mediratta 883fda313d Fix a typo that was breaking the home page (doh!)
$this->_show() -> $this->show()
2009-12-01 00:08:12 -08:00
Bharat Mediratta 852653ef24 Clean up item routing a bit.
1) The new default route is "albums", and Albums_Controller::index() does the right thing
2) Items_Controller redirects to the appropriate specific controller
3) All item controllers now have show() instead of _show(), so that
   the routing code in url::parse_url() can get to it.  But that code is protected against
   receiving bogus requests.
2009-11-30 13:57:50 -08:00
Bharat Mediratta 01bad461df Publish theme_edit_form and theme_edit_form_completed events so that themes can piggyback on the regular Admin > Appearance > Theme Options page. 2009-11-29 12:39:21 -08:00
Bharat Mediratta 53df0df0a4 Update a few more occurrences of ORM/Database -> Database_Builder 2009-11-29 02:48:42 -08:00
Bharat Mediratta dee3ee81e2 Database::orwhere() is now Database_Builder::or_where() 2009-11-26 20:25:32 -08:00
Bharat Mediratta 54be15191b Overload Database_Builder to add merge_where() which takes predefined
where clauses and adds them to the existing query.  Update all
existing queries that take an additional where clause to use it.
2009-11-26 18:47:40 -08:00
Bharat Mediratta 1fd0e14359 Convert all DB where() calls to take 3 arguments.
Convert all open_paren() calls to and_open() or or_open() as appropriate.
2009-11-26 12:09:04 -08:00
Bharat Mediratta 0121bfd585 ORM::orderby -> ORM::order_by 2009-11-25 19:26:52 -08:00
Bharat Mediratta 60c20b0045 The html helpers no longer forces .js and .css suffixes to urls it generates (yay!) 2009-11-25 16:26:10 -08:00
Bharat Mediratta 4a417708f0 Kohana::show_404() -> throw new Kohana_404_Exception() 2009-11-25 13:51:33 -08:00
Bharat Mediratta 33b1d4b7ef Convert one more instance of ORM::$loaded to ORM::loaded() 2009-11-25 13:41:53 -08:00
Bharat Mediratta f50dbd992d Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
	modules/gallery/controllers/rest.php
2009-11-25 13:40:47 -08:00
Bharat Mediratta 2e420522ec Preliminary work to cut over to Kohana 2.4
- Kohana::log() -> Kohana_Log::add()
- Kohana::config_XXX -> Kohana_Config::instance()->XXX
- Implement View::set_global in MY_View
- Updated Cache_Database_Driver to latest APIs
- ORM::$loaded -> ORM::loaded()
- Updated item::viewable() to use K2.4 parenthesization
2009-11-25 13:22:24 -08:00
Tim Almdal dc67cf6481 Remove the REST_Controller and assorted baggage. Completes ticket #917 2009-11-25 13:02:14 -08:00
Tim Almdal 2d5c232c42 Refactor the album, movie and photo handling to remove the REST_Controller. Partial fix for ticket #917 2009-11-25 12:46:04 -08:00
Bharat Mediratta 3ed7a5af46 Rename I18n to Gallery_I18n to avoid conflict with Kohana 2.4 2009-11-24 19:24:02 -08:00
Bharat Mediratta 82ee5f9d33 Make get_add_form private and use it non-statically. 2009-11-24 16:37:59 -08:00
Bharat Mediratta 4c5e2000f6 Don't call theme::get_info() on themes that don't have a theme.info. Fixes #896. 2009-11-20 21:23:11 -08:00
Bharat Mediratta 5e9bbbe490 Convert the Simple Uploader form over to Forge, and use the event
model to let the Tags module modify it.  This brings it inline with
our other module-extensible form based interactions.
2009-11-20 19:41:45 -08:00
Tim Almdal eb34b301a7 Add the ability to add tags for files that are uploaded using the simple loader. 2009-11-19 18:08:32 -08:00
Tim Almdal f5b0ce1f47 Revert "Currently Admin_Theme_Options controller assumes that all the themes will provide the same values. This change corrects that assumption and moves the management of the theme options, including creating the form and updating the theme options into the theme."
This reverts commit 1692ee1308.
2009-11-19 11:44:09 -08:00
Tim Almdal 57adefc5ba Revert "Create theme::get_var(), theme::set_var() methods to set the options of the active site theme. Change all refrences to theme options to use these methods. Update the version number of Gallery to 20 and move any them related options to the be stored under the active theme."
This reverts commit 26114972c3.
2009-11-19 11:44:01 -08:00
Tim Almdal e1cc8a37b2 Revert "Use call_user_func instead of call_user_func_array as we don't need to pass the parameters by reference."
This reverts commit 75cc4962a2.
2009-11-19 11:43:34 -08:00
Tim Almdal 75cc4962a2 Use call_user_func instead of call_user_func_array as we don't need to pass the parameters by reference. 2009-11-19 10:03:39 -08:00
Tim Almdal 26114972c3 Create theme::get_var(), theme::set_var() methods to set the options of the active site theme. Change all refrences to theme options to use these methods. Update the version number of Gallery to 20 and move any them related options to the be stored under the active theme. 2009-11-18 15:36:13 -08:00
Tim Almdal 1692ee1308 Currently Admin_Theme_Options controller assumes that all the themes will provide the same values. This change corrects that assumption and moves the management of the theme options, including creating the form and updating the theme options into the theme. 2009-11-18 14:37:49 -08:00
Tim Almdal 4d4e81ca26 Create a helper to load the theme information from theme.info 2009-11-18 08:38:11 -08:00