Commit Graph
151 Commits
Author SHA1 Message Date
Tim Almdal 67190412e6 Respect the $type parameter on Tag_Model::items_count() 2009-07-23 11:57:34 -07:00
Tim Almdal 070884d9e2 Fix for ticket #496. replace the src attribute (non standard) with the title attribute to contain the url of the tag cloud controller. 2009-07-23 10:23:00 -07:00
Tim Almdal fa0c17ab5b Make tag handling consistent by converting spaces to periods and using commas or semi-colons as separators 2009-07-23 09:26:04 -07:00
Bharat Mediratta dbeadc1407 Use the Kohana cascading filesystem to locate resources loaded by the
theme.  Because the theme comes first, this means that themes can
override any module resources, at the cost that we no longer have
namespacing for JS and CSS files.

The only file getting used outside of this model is
themes/default/screen.css which is used in the admin theme.  I fixed
that by copying screen.css into admin_default and renaming its
screen.css to admin_screen.css.  I also copied over all the images
that it was referencing.

Fixes tickets #48 and #539.

Theme API changes:
- theme_script(), theme_url() and theme_css() are no longer needed
- script(), url() and css() now refer to the first matching asset in
  the module load path, where gallery3/lib is at the end of the path
2009-07-22 14:27:57 -07:00
Bharat Mediratta ce963c9db0 Remove the access permission call from here; this is too low level. 2009-07-20 22:23:21 -07:00
Bharat Mediratta 60d6058880 Make some API changes simplify the tag editing code. We now have a
good pattern for allowing modules to add their own hooks to item forms!

1) Album, photo and movie forms now all use edit_item as the group and
   we publish item_edit_form and item_edit_form_completed events which
   makes it much easier in the module to handle all events.  They can
   still differentiate based on $item->type if they want to.

2) Added tag::clear_all() and tag::compact() functions which takes the
   place of hiwilson's tag::update() function and is now used in
   tag_event::item_delete().  This provides a simple API that allows
   us to have a lot less event handling code.  It's less efficient
   than what hiwilson was doing before in that it will delete and
   re-add tags, but if that ever turns out to be a performance issue
   we can do something about it then.
2009-07-20 08:51:12 -07:00
hiwilsonandBharat Mediratta 709d6c5faf (1)Add tag edit field in album/photo edit form. (2)provide edit functionality. (3)support multi-word tagging. 2009-07-20 08:02:07 -07:00
Bharat Mediratta 5ee2e3e02c Create tag::item_tags which returns all the tags for any one item. 2009-07-19 13:46:22 -07:00
hiwilsonandBharat Mediratta 0e4a7a5133 make tags to be searchable. work with http://github.com/hiwilson/gallery3/commit/a5eef648c00ec3ddee40ebd716380ae0a50e90e7
Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-07-20 04:06:58 +08:00
Bharat Mediratta 5b3b675b6d Non-trivial changes to the event handling code:
1) The item_updated event no longer takes the old and new items.
   Instead we overload ORM to track the original data and make
   that available via the item.  This will allow us to move event
   publishing down into the API methods which in turn will give us
   more stability since we won't require each controller to remember
   to do it.

2) ORM class now tracks the original values.  It doesn't track
   the original relationships (no need for that, yet)

3) Added new events:
     item_deleted
     group_deleted
     user_deleted
2009-07-16 11:19:34 -07:00
Bharat Mediratta e2a9a1d284 Add quotes around all values that contain spaces in them, and add a
test to make sure that we continue to do so.

This makes sure that we don't have problems with 5.3 which treats the
literal "on" as a boolean.
2009-07-13 10:36:55 -07:00
Tim Almdal 311794dbce Make the tag event handle the iptc keywords consistently with
other tag add mechanisms
2009-07-09 22:11:49 -07:00
Tim Almdal 7a9a4b9e8b Found another place that p:purify was required.
Generalize the dynamic.html so it doesn't require a tag element
2009-07-04 09:00:11 -07:00
Bharat Mediratta 8f9a943f55 Fix a bunch of XSS vulnerabilities turned up by manual inspection
using the checklist in ticket #385.
2009-07-01 17:57:39 -07:00
hiwilson a9b27fb352 Let the "Popular tags" sidebar block display on tag or search page. 2009-06-29 22:40:13 -07:00
Tim Almdal 5e83ebd6d0 Use $theme->script() method to render module javascript files 2009-06-28 16:50:55 -07:00
Bharat Mediratta bfca0c7903 Refactor the install/upgrade code to be more flexible.
Add xxx_installer::upgrade($version) method so that upgrade stanzas
are separate from install stanzas.  In the old code, to do an upgrade
meant that you had to re-evolve everything from the initial install
because we'd step through each version's changes.  But what we really
want is for the initial install to start off in the perfect initial
state, and the upgrades to do the work behind the scenes.  So now the
install() function gets things set up properly the first time, and the
upgrade() function does any work to catch you up to the latest code.
See gallery_installer.php for a good example.
2009-06-23 12:00:49 -07:00
Bharat Mediratta 6029c2bf7a Catch exceptions from tag::add() that can be caused by character
encoding issues resulting from embedded keywords in encodings we can't
decipher.  This can lead to weird truncation issues which in turn can
lead to multiple tags getting truncated to the same value in MySQL
which leads to mysql complaining that we're adding a duplicate tag.
2009-06-19 12:03:35 -07:00
Bharat Mediratta 79582ee5bf Fix up the titles in the default theme. They've been broken for a
while.  This fixes ticket #342.

The bug is that we were using $item instead of $theme->item().  But we
were also not special casing tags properly, and they are effectively
first class citizens (at least for now) so treat them properly.  Also,
set page_title by default in the theme so that we don't have to do an
empty() check on it (makes the theme easier to read) and move the
title out of Tags_Controller so that the theme has more control over
it.
2009-06-15 18:15:41 -07:00
Bharat Mediratta 1b656be713 Create a sidebar for tag pages
Move the <link> for the container feed (either gallery/album/<id> or
tag/tag/<id>) back into gallery_theme
2009-06-14 22:27:26 -07:00
Bharat Mediratta 32ea4406c8 Refactor the way that the rss module works so that we're not allowing
the url to dictate arbitrary static method calls.

* Each xxx_rss helper has a single feed() call which takes an id as the argument

* xxx_rss::available_feedS() only returns feeds when they're applicable (ie
  if you're viewing a tag, it won't show you an item feed).

* Feed urls are now in the module/feed_id form so that we can bind a
  feed id to a given module

* Tightened up the Rss_Controller by using url::merge and some other tricks.

* Made the slideshow module express its own feed.
2009-06-14 21:51:54 -07:00
Bharat Mediratta 00fad54c0b Refactor feed code to use stdClass everywhere. Fix bugs in the
max-pages calculation code.  Move feed related data into the $feed
variable and only pass that to the view.
2009-06-14 16:40:57 -07:00
Tim Almdal 8b7f7a2fbe Don't use stdClass to return the feed data. Just use an array. 2009-06-14 12:38:57 -07:00
Tim Almdal 76b89556fc Remove the sidebar flag from the feed definition returned by available_feeds and
replace with a type field with one of two values (head and block).  We need to
do this to determine what fields go in the rss block so we can ignore the
definitions that are related to the page head when creating the rss block that
goes into the sidebar.
2009-06-14 12:09:47 -07:00
Tim Almdal 484796e7cc Remove rss:item_feed, rss::tag_fead and rss_theme::head and move that
functionality in the <module_name>_theme::head function. Created rss::feed_link
to wrap the module supplied uri in the html link element.
2009-06-14 11:39:53 -07:00
unostarandBharat Mediratta 878d82cb46 Multi-byte safe function to support all other languages.
Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-06-13 08:14:21 +08:00
Tim Almdal 30bdaa8123 Continue refactoring the rss module and distribute the creation of album and
tag feeds to the gallery and tag modules respectively.  This chould close
ticket #388
2009-06-12 11:48:13 -07:00
Bharat Mediratta dd854379c2 Sanitize all data we return via json_encode() to guard against XSS and
other data leaks.
2009-06-03 17:08:23 -07:00
Bharat Mediratta 91c7eb1200 Don't throw an error if there are no visible tags. 2009-06-01 23:00:10 -07:00
Bharat Mediratta 43abcd9386 Security pass over all controller code. Mostly adding CSRF checking
and verifying user permissions, but there are several above-the-bar
changes:

1) Server add is now only available to admins.  This is a hard
   requirement because we have to limit server access (eg:
   server_add::children) to a user subset and the current permission
   model doesn't include that.  Easiest fix is to restrict to admins.
   Got rid of the server_add permission.

2) We now know check permissions at every level, which means in
   controllers AND in helpers.  This "belt and suspenders" approach will
   give us defense in depth in case we overlook it in one area.

3) We now do CSRF checking in every controller method that changes the
   code, in addition to the Forge auto-check.  Again, defense in depth
   and it makes scanning the code for security much simpler.

4) Moved Simple_Uploader_Controller::convert_filename_to_title to
   item:convert_filename_to_title

5) Fixed a bug in sending notification emails.

6) Fixed the Organize code to verify that you only have access to your
   own tasks.  In general, added permission checks to organize which had
   pretty much no validation code.

I did my best to verify every feature that I touched.
2009-06-01 22:40:22 -07:00
Bharat Mediratta 9369ccab7f Run all variables that come from user-entered data through p::clean() 2009-05-31 01:02:51 -07:00
Bharat Mediratta ebb0761b8d Label the tag input field according to the item type.
Fixes ticket #176.
2009-05-28 00:32:24 -07:00
Bharat Mediratta 88a3d43ba9 Update all references to the core application to now point to the
gallery module.  This type of mass update is prone to some small bugs.
2009-05-27 16:17:29 -07:00
Tim Almdal 908618960b Since organize is now in the preview stage and will probably be
rewritten by beta2, pull all of its "tenticles" back into itself and
out of core or tags module.
2009-05-26 14:43:31 +00:00
Bharat Mediratta 7aed923908 Restructure the module lifecycle.
Install: <module>_installer::install() is called, any necessary tables
are created.

Activate: <module>_installer::activate() is called.  Module
controllers are routable, helpers are accessible, etc.  The module is
in use.

Deactivate: <module>_installer::deactivate() is called.  Module code
is not accessible or routable.  Module is *not* in use, but its tables
are still around.

Uninstall: <module>_installer::uninstall() is called.  Module is
completely removed from the database.

Admin > Modules will install and activate modules, but will only
deactivate (will NOT uninstall modules).
2009-05-26 05:28:59 +00:00
Tim Almdal ee0bd765b6 Implement a basic tag management interface with the organize drawer 2009-05-22 16:14:42 +00:00
Tim Almdal a9e3692027 1) This provides the editting functionality for albums and photos in the
organize feature.
2) Remove the tag functionality at this point
3) Added a callback to handle validating conflicting names (only used
by organize at this point.
4) Closes #231
2009-05-21 01:31:29 +00:00
Tim Almdal 762ca22544 This takes us the next step closer to providing bulk edit. We still
can't edit, but we are getting closer :-).
This change sets up a framework for modules to contribute edit panels
to the organize drawer. Currently implemented General (albums and
photos), Sort Order (albums only) and Manage Tags
2009-05-18 19:34:03 +00:00
Bharat Mediratta 5495037a3d Gee it's May already. Update copyright to 2009. 2009-05-13 20:04:58 +00:00
Bharat Mediratta 99c26f30c6 Allow users to enter multiple tags at once, split by space, semicolon
or comma.

Fixes ticket #193.
2009-05-13 01:43:47 +00:00
Bharat Mediratta 99b7cdeee1 Fix a copy/paste typo. 2009-05-10 00:13:39 +00:00
Bharat Mediratta d1a9138925 Don't try to use mb_detect_encoding if the module isn't loaded. Not sure if this is a great solution, but it'll probably cut down on a big class of errors opportunistically 2009-05-08 19:16:48 +00:00
Bharat Mediratta 13f8a0dd7b Detect input encodings from EXIF/IPTC data and convert to utf-8 as
appropriate.  This allows us to switch the exif value column back to
varchar and improves the way that we deal with non-utf8 data in our
embedded EXIF/IPTC data.
2009-05-05 03:30:49 +00:00
Bharat Mediratta fde7073886 Strip trailing nulls off of some tags. 2009-04-05 04:08:24 +00:00
Bharat Mediratta f7435112c5 Clean up JS/HTML so that renaming works properly (it had hardcoded
urls before).  Clean up indentation and localization code while I'm
in there.
2009-04-03 22:53:43 +00:00
Bharat Mediratta 921f3a2eee Put csrf token into Admin_View and Theme_View by default, then use it
directly wherever possible instead of access::csrf_token().
2009-03-27 03:43:21 +00:00
Jakob Hilden b909132f54 tag changes in the tag admin should now work as expected 2009-03-25 04:47:25 +00:00
Bharat Mediratta 7cf0313e7b Remove the in-place tag editing code from the default theme. It
should be implemented in the tags module for now, and then possibly
generalized out to lib later on.
2009-03-17 20:59:24 +00:00
Bharat Mediratta c81ee12411 Don't allow empty tag names 2009-03-17 20:57:51 +00:00
Bharat Mediratta 8786ee3ffb Initialize $tags properly 2009-03-17 05:25:38 +00:00