Commit Graph
1697 Commits
Author SHA1 Message Date
Tim Almdal d6648c0aff Fix for ticket #477. Use nl2br method when rendering comment::text and
item::description.  In addition add p::clean or p::purify to places that
xss cleaning had missed (i.e. rss feeds)
2009-07-04 08:17:12 -07:00
Tim Almdal 54ffea2419 Split the clean method into two clean and purify. clean is a light weight
approach using html::specialchars and purify uses HTMLPurifier to intelligently
cleanse the output fields. Use purifier for text and title fields where it is
likely that a user would enter html to format their data.
2009-07-03 21:44:10 -07:00
Bharat Mediratta 22b2e1044f Merge branch 'master' of git@github.com:/gallery/gallery3 2009-07-03 18:09:02 -07:00
Andy Staudacher a633c134b7 Ticket 104: Adding "Copy sourc text" button to l10n UI (usability / productivity improvement) 2009-07-03 16:14:05 -07:00
Andy Staudacher fb472da0ba Ignore lib/ folders in l10n_scanner task.
1. Because it makes sense.
2. As a quick fix - For some reason it wouldn't work properly anymore now with the HTMLPurifier lib
2009-07-03 16:11:17 -07:00
Andy Staudacher bafbe5a2d2 Fix for ticket 510: i18n fixes - localize module / theme name in some status messages 2009-07-03 14:58:33 -07:00
Tim Almdal f6d847739a Update the source so the third party code passes the File Structure Test 2009-07-03 14:18:45 -07:00
Tim Almdal 8d5900f639 Fix for ticket #400: Add HTMLPurifier to gallery3 and change p::clean() to call HTMLPurifier->purify() 2009-07-03 12:56:59 -07:00
Tim Almdal b6e5bf6eaa Fix for ticket #400: Add HTMLPurifier to gallery3 and change p::clean() to call HTMLPurifier->purify() 2009-07-03 12:56:29 -07:00
Bharat Mediratta 715d714ade Merge branch 'master' of git@github.com:/gallery/gallery3 2009-07-03 09:26:31 -07:00
Tim Almdal cf279fc315 Fix for #364 = G2 Import Doesn't support markup
Create a _transform_bbcode which coverts the g2 bbcode to html.
The html won't be rendered until ticket #400 is implemented as
pclean() excapse the html
2009-07-03 08:14:28 -07:00
Bharat Mediratta bd1b2f4147 Merge branch 'master' of git@github.com:/gallery/gallery3 2009-07-03 04:48:54 -07:00
Tim Almdal 85ea66d51e Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-02 20:52:55 -07:00
Andy Staudacher 72281d2b44 Fix for ticket 470. Replace ReCaptcha with reCAPTCHA in user visible strings. 2009-07-02 20:50:29 -07:00
Andy Staudacher 93e9efed97 Use Unicode characters (looks better to translator, and fixes normalization issue in translation server) 2009-07-02 20:49:47 -07:00
Tim Almdal adb820e37c Fix for ticket #359 and a partial fix for ticket #345.
In G2, text strings have the &, ", < and > replaced by &amp;, &quote;,
&lt; and &gt; respectively.  Created the _decode_html_special_chars
method in helpers/g2_import.php to revert these character strings.
2009-07-02 20:48:47 -07:00
Bharat Mediratta eb5538d135 Merge branch 'master' of git@github.com:/gallery/gallery3
Conflicts:
	modules/server_add/controllers/admin_server_add.php
2009-07-02 18:00:22 -07:00
Bharat Mediratta 1a5fe42b55 Temporary version add() that just dumps out the values for now. 2009-07-02 17:54:48 -07:00
Bharat Mediratta 9eee3b07a8 @todo if we uncheck all the children for a parent, we should uncheck the
parent itself, otherwise in the code we'll add the entire parent since if
we find an album as a leaf, we assume that it's never been expanded in the UI.
2009-07-02 17:54:22 -07:00
Bharat Mediratta 1cd321901b Properly manage disabled state for the [add] button. 2009-07-02 13:02:26 -07:00
Bharat Mediratta d4075a4657 Only enable the [add] button when boxes are checked. 2009-07-02 11:49:45 -07:00
Bharat Mediratta a619bb8196 Add some jsDoc. 2009-07-02 11:30:21 -07:00
Bharat Mediratta e5b6193b26 Partial pass of server_add cleanup. It's broken at this stage since
I've redone the browsing code but I have not implemented the adding
code.

1) Rename index() to browse() since index is too generic.
2) Simplify the data that we pass to _dialog and _tree
3) Change _tree to return list items only, so that the outer dialog
   can be a <ul> for consistency.
4) Simplify the data structures so that we're not tracking checked vs.
   unchecked status in the PHP code, it's all done in jquery where we
   can do it with just a line or two of JS
5) use glob() which pretty much entirely replaces _get_children
2009-07-02 11:23:40 -07:00
Tim Almdal 1c9dee93de Fix for ticket #390.
Added a call to GalleryCoreApi::fetchItemViewCounts to retrieve the gallery2
view counts forthe imported items.
2009-07-02 09:54:50 -07:00
Tim Almdal a13ddfea8f Suppress the filesize error if the thumbnail is not found so we can get
an EMPTY_INPUT_FILE exception which we can then log and continue.
2009-07-02 07:53:24 -07:00
Tim Almdal b6bf7a5881 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-02 07:36:00 -07:00
Bharat Mediratta 495c76f729 Eliminate temporary variables by passing the $item into the view and
making API calls on the item.
2009-07-02 05:11:03 -07:00
Bharat Mediratta d4e976cc53 Remove empty <script> block. 2009-07-02 05:06:17 -07:00
Bharat Mediratta c60d7f431d ORM::Factory -> ORM::factory 2009-07-02 04:37:03 -07:00
Bharat Mediratta 14d7797cda In remove_path(), if the path is invalid don't echo it back in the UI. 2009-07-02 04:35:03 -07:00
Tim Almdal 7bc40fd315 Start of fixing a problem with importing movies w/o a thumbnail 2009-07-01 23:14:01 -07:00
Bharat Mediratta a674170bf7 2 fixes:
1) Include the url in the cache key so that if the Gallery moves, we
   don't use old cached entries.

2) Use the relative path to files in the comments that we embed in our
   files so that we don't leak local paths.
2009-07-01 22:55:43 -07:00
Tim Almdal 6f3ec5f039 Fix for ticket #357.
Changed the set the created date as part of the import and change
models/comment::save() to not set the creation date if it is already
set.
2009-07-01 22:18:52 -07:00
Tim Almdal 588f991d55 Updated to Exifer r4159 2009-07-01 21:56:02 -07:00
Tim Almdal 60b201f23b Add the partner id to the message being sent to digibug 2009-07-01 18:01:15 -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
Bharat Mediratta 7b1e3c5021 Reapply c65bfb5a10 without extra
whitespace changes.
2009-07-01 11:32:27 -07:00
Bharat Mediratta 8f4c1c4ddf Revert "Fix for ticket #437"
This change had unintentional whitespace changes.  Reverting for now, will reapply it.

This reverts commit c65bfb5a10.
2009-07-01 11:31:12 -07:00
Tim Almdal c65bfb5a10 Fix for ticket #437
Tracking vendor ticket: http://bit.ly/16b7Zj
2009-07-01 10:45:37 -07:00
Chad Kieffer 0d105bcf9d Display owner's full name rather than username, ticket #421. 2009-06-30 23:29:53 -06:00
Bharat Mediratta 58e3e469b9 Merge branch 'master' of git://github.com/hiwilson/gallery3 2009-06-30 21:09:38 -07:00
Tim Almdal 200b78ee59 Revert the change that removed adding the click handler for the digibug print
functionality.  Just return false when using javascript:digibug_popup was not
enough from having the browser switch pages and show a page with the word false.
Using an event handler allows us to call event.preventDefault which cancels the
page switch.
2009-06-30 20:32:59 -07:00
Tim Almdal b541935d6f Fix issues with Digibug printing where the preview ws not showing up. 2009-06-30 20:17:48 -07:00
Bharat Mediratta 3ef39d4576 Update Exif_test to match change made in 4943103700
Get rid of vestigial third column in exif::_keys().
2009-06-30 19:17:45 -07:00
Bharat Mediratta d8e776cc88 Checkpoint. 2009-06-30 19:12:46 -07:00
Bharat Mediratta 5e8e3ab6b5 Rejigger the way we handle "done" status in the upgrader. Now we
present the done box if you're done and let you get rid of it if you
want.  It's not beautiful, by any means, but it gives you an easy link
back to your Gallery when you're finished.

Fixes ticket #479.
2009-06-30 18:28:55 -07:00
Bharat Mediratta 050c5a0383 Unlink the old rewritten path files in var/modules/g2_import when we
validate the embed path.  This resolves an issue with b1 installs
which had versions of the rewritten code that were buggy and can be
replaced.
2009-06-30 17:58:33 -07:00
Tim Almdal 8ed6d1183b Fix for #319.
Created a new view "movieplayer.html.php", which is rendered by
Item_Model::movie_img().  Changed movie.html.php to use movie_img to render
the movie player link.
2009-06-30 08:21:00 -07:00
Tim Almdal 4943103700 Fix for #437. Use Exposure Time instead of Shutter Speed as suggested by
hiwilson.
2009-06-30 07:22:03 -07:00
Andy Staudacher 4dfb5aaf25 Fix i18n issue - accidentally called t() on translated messages. Please truncate incoming_translations after this
update to get rid of bad messages in your DB.
2009-06-30 00:22:16 -07:00