Commit Graph

3624 Commits

Author SHA1 Message Date
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
Andy Staudacher
176030f68a Partial fix for ticket 471 - Fix parsing of module/theme info files in l10n scanner. 2009-06-29 23:09:05 -07:00
Andy Staudacher
dd30ec012b Partial fix for ticket 471 - i18n of module names in upgrader. 2009-06-29 22:48:22 -07:00
hiwilson
a9b27fb352 Let the "Popular tags" sidebar block display on tag or search page. 2009-06-29 22:40:13 -07:00
Andy Staudacher
3bd5990056 i18n theme name / description in admin themes. Partial fix for ticket 471. 2009-06-29 22:22:27 -07:00
Andy Staudacher
b0bc99a81f Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-29 22:10:10 -07:00
Andy Staudacher
d4738ce484 Partial fix for ticket 471 - i18n of "Translate Text" button in l10n client 2009-06-29 22:05:55 -07:00
Bharat Mediratta
c9e8ff8fcb Use the appropriate content-type for javascript (application/javascript). 2009-06-29 21:59:00 -07:00
Bharat Mediratta
02b46833d6 Pass back Cache-Control and Expires headers when we send back a 304,
otherwise some browsers (Firefox, at least) thinks that it needs to
revalidate.  At least in my case, it appears that my proxy tacks on
restrictive Cache-Control headers if they aren't there.
2009-06-29 21:52:42 -07:00
Bharat Mediratta
980c589e3d Fix a few more issues
1) Don't use $_SERVER, use Input::instance()->server().  This fixes the problem
   that when you use a browser that doesn't pass in an Accept-Encoding, we'd
   barf on a missing array key

2) Don't bother looking up the _gz key if we don't have gzencode, because we
   probably didn't store one.

3) Only emit the gzip Content-Encoding header if we're actually sending back
   gzipped data.
2009-06-29 21:38:04 -07:00
Tim Almdal
6e80330e19 Remove the testing code to force rebuilding the cache. 2009-06-29 21:16:42 -07:00
Bharat Mediratta
77a78b4990 Revert to serializing and deserializing data. The cache table can't
accept PHP constructs like arrays (the tests were choking on this).

Update tests to reflect the new `key` column.
2009-06-29 20:53:55 -07:00
Bharat Mediratta
df17d576ab Checkpoint. 2009-06-29 20:33:34 -07:00
Bharat Mediratta
df84861833 If the argument to app() is not an album id, switch to the item parent.
Fixes ticket #489.
2009-06-29 20:23:23 -07:00
Bharat Mediratta
b579db5173 Oops, "head" => "admin_head" to make the admin dashboard work. 2009-06-29 20:08:35 -07:00
Andy Staudacher
06172ecdb9 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-29 19:56:52 -07:00
Andy Staudacher
333c9d47e3 Fix HTML in l10n message 2009-06-29 19:53:05 -07:00
Bharat Mediratta
8af19c0625 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-29 19:33:42 -07:00
Andy Staudacher
b57be646fe Don't repeat the default locale in the installed locales list. 2009-06-29 19:24:48 -07:00
Bharat Mediratta
95b900d4f4 Fix some bugs in the combined JS/CSS code (most of which I introduced
in my last refactor):

1) Actually combine the JS (I was only combining the CSS)
2) Add line breaks between the files and comment them so that we can
   find a specific file inside the blob.
3) Add an HTML comment to help developers figure out why they can't
   find their CSS/JS.
2009-06-29 19:11:59 -07:00
Bharat Mediratta
325203e1ca Add a media type using the most common media type from our CSS. This
doesn't fix the problem that we need to support multiple media types
(the original code had superfish using just "screen", and some other
deviations).

There's no code yet to support multiple media types, but it would not
be too difficult to create buckets based on media.
2009-06-29 18:27:29 -07:00
Bharat Mediratta
fa8ca2f7ad Refactor combine_xxx() functions together into combine_files() and use
html functions to generate the resulting elements.  Add phpdoc.
2009-06-29 18:12:53 -07:00
Bharat Mediratta
3080317d6e Refactor combined controller a bit
1) Create public javascript() and css() functions and turn __call()
   into a private function to protect us against having some random
   type show up in there.  Otherwise anything you put in the 2nd
   argument gets emitted in the header which is a security hole.

2) Fix a bug ("$key = $key[0]") which was breaking functionality.
   Eliminate the hex check, it's not really necessary in the majority
   case and doesn't hurt us in edge cases.

3) Convert some empty() calls to !, no need for a function call there.

4) Add phpDoc.
2009-06-29 17:44:02 -07:00
Tim Almdal
006b63030a Combine the Combined::javascript and Combined::css into a single method implemented
by the magic method __call. The first parameter is the content type for text/xxxx
and the 2nd parameter is the key of the combined file.
2009-06-29 15:38:55 -07:00