Commit Graph
182 Commits
Author SHA1 Message Date
Andy Staudacher d050f0a246 Minor style fix: (string) $var, not (string)$var, and move the explicit cast down where it's needed. 2009-09-17 14:04:13 -07:00
Tim Almdal 2eeacd2656 use an implicit cast to convert the translated error message to a string as it is encoded by the json routines and will be treated as an object otherwise 2009-09-17 13:55:11 -07:00
Tim Almdal 48326ad017 Cleanup issues with the original fix for #779 2009-09-17 12:11:00 -07:00
Tim Almdal 5490057480 When editing tags in place, and there is a validation error, highlight the tag with a red border and show a statust message. This fixes ticket: #779 2009-09-16 12:27:13 -07:00
Andy Staudacher f1887422f8 Stricter input handling (cast to int) 2009-09-15 23:07:41 -07:00
Andy Staudacher 7608870537 Controller auth / CSRF fixes 2009-09-15 22:51:49 -07:00
Andy Staudacher e168e0dfae CSRF / auth fixes, golden data file checkpoint 2009-09-15 21:50:48 -07:00
Bharat Mediratta df85f43aa1 Remove unused $feed->link. 2009-09-08 17:05:38 -07:00
Andy Staudacher ff1979e12e Fix XSS in tags JS 2009-09-01 01:12:02 -07:00
Andy Staudacher b9bd1681a3 Update all code to use helper method html::clean(), html::purify(), ... instead of SafeString directly. 2009-08-29 22:54:20 -07:00
Andy Staudacher 0204617b60 XSS fixes 2009-08-29 15:41:02 -07:00
Andy Staudacher a5dfc81a8f Merge commit 'upstream/master'
Conflicts:

	modules/akismet/views/admin_akismet.html.php
	modules/comment/helpers/comment_rss.php
	modules/gallery/helpers/gallery_rss.php
	modules/gallery/libraries/I18n.php
	modules/gallery/views/permissions_browse.html.php
	modules/gallery/views/simple_uploader.html.php
	modules/info/views/info_block.html.php
	modules/organize/controllers/organize.php
	modules/organize/views/organize.html.php
	modules/organize/views/organize_album.html.php
	themes/default/views/album.html.php
	themes/default/views/movie.html.php
	themes/default/views/photo.html.php
2009-08-29 14:17:48 -07:00
Andy Staudacher c01ac42c46 Refactor all calls of p::clean() to SafeString::of() and p::purify() to SafeString::purify().
Removing any p::clean() calls for arguments to t() and t2() since their args are wrapped in a SafeString anyway.
2009-08-29 12:48:40 -07:00
Bharat Mediratta 4828db003f Remove 'ENGINE=InnoDB' specification from tables that we create. Use
the system's default table specification.  Fixes ticket #597.
2009-08-27 15:47:54 -07:00
Bharat Mediratta 7863aa16f9 Update tags module to notify modules when items related to a tag are
affected.  Practically speaking this means that we'll reindex items
when tags are added or removed from them.

API change:
  Remove item_related_updated_batch event.

Rationale:
  While this is an efficient event, it requires module developers to
  support two event APIs for staying up to date and increases the
  likelihood that they'll forget one and have data corruption.  Force
  them all through the slower but more reliable pipe, for now.  We
  can always try to improve efficiency by using the batch_start and
  batch_stop events.
2009-08-08 14:30:21 -07:00
Tim AlmdalandBharat Mediratta 445a8fb1b6 Change galleryPanel and galleryDialog widgets to gallery_panel and gallery_dialog respectively
Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-08-08 02:08:42 +08:00
Tim AlmdalandBharat Mediratta a302a9c3fa Refactor the gallery dialog into a jQuery widget
Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-08-08 02:08:28 +08:00
Tim Almdal 9f396178ce Revert "Allow a theme to override the page refresh mechanism. Create a new"
This reverts commit 1f014aae6c.
2009-08-05 09:24:27 -07:00
Tim Almdal 3461b4e8e6 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-28 20:49:50 -07:00
Bharat Mediratta 44bc74edb9 Change search callbacks to use the event system, so move them out of
xxx_search helpers and into xxx_event helpers.
2009-07-28 20:30:34 -07:00
Bharat Mediratta 1e90e40d3a Use events to generate menus, instead of having xxx_menu helpers.
This is the first step towards having a simple, lightweight and
unified API for module interaction.
2009-07-28 13:47:22 -07:00
Tim Almdal a7f4d7aced Revert commit 078c77a62b and change the
tag_event:item_edit_form to use the new Form_Script library to inject
script into a form.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-28 21:00:25 +08:00
Tim Almdal 2e8f73d4e9 Revert commit 078c77a62b and change the
tag_event:item_edit_form to use the new Form_Script library to inject
script into a form.
2009-07-28 05:40:28 -07:00
Tim Almdal 975a5ded7b Clean up amd simplify the tag processing: Only allow comma separators between
phrases.  Using only 1 separator cleans up the javascript as well, as we
can use some of the jquery autocomplete to set the tag separator.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-28 09:16:57 +08:00
Tim Almdal 4b6775e614 Clean up amd simplify the tag processing: Only allow comma separators between
phrases.  Using only 1 separator cleans up the javascript as well, as we
can use some of the jquery autocomplete to set the tag separator.
2009-07-27 18:04:55 -07:00
Tim Almdal ecc9203c23 Standardize the specification of tags.
With this patch a comma(,) is the only valid tag separator.  Spaces
are allowed in tags and phrases no longer need to be specified with a
dot.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-28 06:28:31 +08:00
Tim Almdal f21044ae1d Standardize the specification of tags.
With this patch a comma(,) is the only valid tag separator.  Spaces
are allowed in tags and phrases no longer need to be specified with a
dot.
2009-07-27 13:54:20 -07:00
Tim Almdal 1f014aae6c Allow a theme to override the page refresh mechanism. Create a new
javascript lib (gallery.reload.js) which defines the functions
gallery_reload() and gallery_location(new_location).  They just
do a window.location.reload() and window.location = new_location.

This change breaks the assumption that all themes will handle page reloads
the same and allows the theme to customize the page refresh.
2009-07-27 12:39:12 -07:00
Chad Kieffer 04ed02fedd Updated wording of tag separator tip 2009-07-26 15:57:26 -06:00
Tim Almdal 078c77a62b Add tag autocomplete to the album and photo edit pop up dialogs.
This required putting a wrapper view around the forms and passing
this view as the parameter to the item_edit_form event.  The view
contains a $script variable that the modules can add script to be
included in the form html when rendered as part of the ajax response.
2009-07-24 14:18:15 -07:00
Tim Almdal fa1d32e646 Partial implementation of ticket #80. Provide auto complete and suggestions on the tag add form in the tag sidebar block. Updated the xss golden file as well. Still to do figure out how toget it into the edit popup dialog 2009-07-24 11:24:43 -07:00
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