stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-27 18:24:03 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,318 Commits 4 Branches 0 Tags
e754bc18ea5dfd93beae5bad1c743610ceeef6e3
Commit Graph
227 Commits
Author SHA1 Message Date
Andy Staudacher 30dcaaa236 Need to allow access to ::change_provider for CLI, to make packager work. 2010-02-14 18:33:10 -08:00
Andy Staudacher 74471df777 Minor security tightening of IdentityProvider::change_provider(). 2010-02-14 16:12:18 -08:00
Andy StaudacherandTim Almdal 2dad1d7cd1 Some HTML validation fixes (don't render empty <ul> lists, empty id attributes, use &amp; not &) 2010-02-14 07:15:57 -08:00
Andy Staudacher d53f6d0e05 Fix for tickets 1009 and 603: Show a themed error page to guests / registered users (not to admins though). And show a login form to guests for 404 (incl. insufficient view permissions) errors. 2010-02-12 16:40:44 -08:00
Bharat Mediratta 6dfab72922 Override Input::clean_input_keys() to sanitize malicious values out of 
strings instead of dying.  This at least gives us graceful degradation.

Fixes ticket #764, patch thanks to djnz.
 2010-02-08 15:37:11 -08:00
Tim Almdal 6783de2457 Remove the redundant reference to ["force_rtl". 2010-02-07 14:17:58 -08:00
Tim Almdal b6c0d3a48c Refactor the is_rtl() helper into the Gallery_I18n class. This allows checking 
for a config value "force_rtl" which will layout the gallery pages in rtl mode
without having to change to an language that is no longer understandable to the
developer.

Adding the line "$config['force_rtl'] = true;" to the config/locales.php file
will make it happen.
 2010-02-07 13:55:17 -08:00
Bharat Mediratta adac97b537 Add prefix support for the target of RENAME TABLE. 2010-02-07 08:28:32 -08:00
Bharat Mediratta c050acf30a Fix lots of warnings that pop up when we're in E_STRICT mode. They're 
mostly issues around uninitialized variables, calling non-static
functions in a static context, calling Session functions directly
instead of on its singleton, passing non-variables by reference, and
subclasses not using the same interface as the parent class.
 2010-01-31 16:07:41 -08:00
Bharat Mediratta dccb2b73ff Dump out validation errors so that we have some extra information in the logs. 2010-01-30 16:19:00 -08:00
Bharat Mediratta 0d73738099 Stop using obsolete form::close() 
Update the way we include the hidden CSRF field for InPlaceEdit.
 2010-01-29 10:13:10 -08:00
Bharat Mediratta 9908f37eef Use identity::set_active_user() instead of auth::login() when we 
change providers otherwise the user_installer code is going to be
calling auth::login() which causes all kinds of unexpected weirdness,
like it triggers the handler in gallery_event which detects graphics
toolkits, and that's only supposed to run on the first admin login.
 2010-01-28 21:33:41 -08:00
Bharat Mediratta 4b32a71afc Convert back to using ORM::factory(..., $id) instead of calling where(). 2010-01-27 22:34:11 -08:00
Bharat Mediratta 804614711a Make only one attempt to restore the old identity provider in case of 
failure.  Else, we can get into an infinite recursion.
 2010-01-25 19:49:52 -08:00
Bharat Mediratta fecac4a859 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 
Conflicts:
	modules/gallery/tests/xss_data.txt
 2010-01-23 16:29:10 -08:00
Tim Almdal abdeb21ccb Add a user_menu method to the Admin_View and then use this method to get the 
user menu.  Since the information displayed is identical in both admin and
theme views, it makes sense to combine the generation to it is done in a common
location.
 2010-01-23 13:29:49 -08:00
Tim Almdal eabeeeb126 Trap any errors that may occur when trying to install a new identity provider and then reinstall the current one. 2010-01-22 13:38:05 -08:00
Tim Almdal ae568b6182 Refactor the identity provider installation in to a common helper method (change_provider) with an initialization callback. 2010-01-22 12:09:11 -08:00
Bharat Mediratta e2b6cfc2d9 Make move_to protected since we don't want folks calling it on 
Item_Model.  If there's a need to make this public, we should override
it in Item_Model and throw an exception there.
 2010-01-20 23:47:48 -08:00
Bharat Mediratta 949586c254 Oops, bug in save() -- we weren't returning the saved value! 2010-01-20 23:28:29 -08:00
Bharat Mediratta f6c48d757c Delete MY_ORM::original(). We did not have proper containment to 
generate $original when we needed it, resulting in inconsistent
behavior.
 2010-01-20 22:56:37 -08:00
Bharat Mediratta 71a8375554 Whitespace. 2010-01-18 22:52:58 -08:00
Bharat Mediratta dc570aaca9 Switch from ORM_MPTT::$db_builder to db::build(). 2010-01-18 22:52:23 -08:00
Bharat Mediratta efa4e230da in move_to(), move the lock to before we do any calculations so that we have the latest data. 2010-01-18 21:40:00 -08:00
Bharat Mediratta f20fa2cfed Change IdentityProvider::create_user() to take $email as well, since that's a required 
parameter for the Gallery driver.
 2010-01-17 20:37:25 -08:00
Bharat Mediratta f0a290fc76 If we call original() and there's no $original yet, then consider this 
to be the original.  That should be safe because we're already
guarding __set, __unset and save.
 2010-01-17 13:29:36 -08:00
Bharat Mediratta 39ad9fa9a0 Get rid of add_rules_from() -- it's no longer necessary now that we're doing model based validation. 2010-01-16 21:25:17 -08:00
Bharat Mediratta 434d351b2f Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 
Conflicts:
	modules/gallery/models/item.php
 2010-01-16 00:15:23 -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
Bharat Mediratta 916da15cbb Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2010-01-15 13:36:16 -08:00
Bharat Mediratta 1066e64354 Call parent::save() before releasing the lock to make creating the hole and filling it an atomic operation. 2010-01-15 12:41:22 -08:00
Bharat Mediratta 50e3cc5837 Move model business logic out of album::create() and into 
Item_Model::save().  This makes creating albums similar to editing
them and makes it difficult to create an album poorly.  I expect to be
able to remove a lot of code from the photo and movie helper because
it's duplicated here.

In order to do this, I refactored ORM_MPTT::add_to_parent() into
ORM_MPTT::save() so we now add it to the parent when we do save.  This
allows us to call save() only once which saves a database call per
add.

The Albums_Controller logic is roughly the same as before.

Haven't updated the tests yet, they're going to fail miserably since
many of them depend on album::create() which is now gone.
 2010-01-15 12:15:20 -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
Bharat Mediratta 5a8d48a869 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2010-01-08 15:37:24 -08:00
Bharat Mediratta ad3e003e48 Remove stray semicolons. 2010-01-08 14:04:41 -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
Bharat Mediratta 3fc6dab7ac Expect merge_where and merge_or_where to handle empty tuples. 2010-01-08 11:49:01 -08:00
Bharat Mediratta fc5d1e5d74 Fix a bug where we weren't replacing table names when there's no 
prefix.  This is wrong because even when there's no prefix we have to
get rid of the {curly} braces.
 2009-12-27 12:41:52 -08:00
Bharat Mediratta 63fd9622c0 Don't use as_array() on the result from db::build()->execute() -- it's no longer necessary. 2009-12-22 16:50:15 -08:00
Bharat Mediratta a6da027aad The default value for $offset should always be null (according to the 
new K24 ORM).

Fix up a bad where tuple in the test.
 2009-12-22 16:22:24 -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 5df1dc135b Fix some bugs in the cache database driver, and update the tests for K24. 2009-12-21 12:13:25 -08:00
Bharat Mediratta 0cd03c8883 Add Database::set_default_instance() for tests 2009-12-21 11:30:26 -08:00
Bharat Mediratta 2aba8c4bff Simplify add_table_prefixes. In Kohana 2.4, it returns the bare table 
name, not the prefixed one so this makes our logic easier.
 2009-12-17 21:05:47 -08:00
Bharat Mediratta c22bf27cc2 Add the current file/line at the top of the trace. 2009-12-06 21:02:30 -08:00
Bharat Mediratta 2be72bb1c3 Overload Kohana_Exception::text() to dump out the complete stack trace 
so that we have useful data in the logs.
 2009-12-06 20:42:38 -08:00
Bharat Mediratta 112aafe513 Oops, removed the overload for query() before, we need this back so 
that we can prefix table names properly.
 2009-12-06 19:51:00 -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