Commit Graph
2269 Commits
Author SHA1 Message Date
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
Bharat Mediratta bd1b2f4147 Merge branch 'master' of git@github.com:/gallery/gallery3 2009-07-03 04:48:54 -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
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
Bharat Mediratta c60d7f431d ORM::Factory -> ORM::factory 2009-07-02 04:37:03 -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
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 132bd8306e Re-add Session::abort_save(). It was reverted as part of the earlier
change, but this is the part that we want to keep.
2009-06-30 20:51:02 -07:00
Bharat Mediratta 666c807fcc Revert "Add Session::abort_save() to Kohana."
Obsoleted by upstream fix.

This reverts commit 06f066164f.
2009-06-30 20:47:51 -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
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
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
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
Tim Almdal 86596f9595 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-29 15:04:15 -07:00
jhilden 4dab7f8dd0 admin dashboard blocks can now be moved from left to right sidebar
fix for bug report #92
removed containment parameter for the jQuery sortable plugin
seems to work in Firefox, Chrome and IE 8
2009-06-29 16:23:12 -04:00
jhilden b31b3bd5bf Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-29 16:03:45 -04:00
jhilden eb82f6a64a added textual description of upload progress
moved the cancel link to above the upload queue (where the textual upload progress also is)
2009-06-29 16:02:11 -04:00
Tim Almdal 34c76c0906 A Combined javascript seems to work.
1) CSS files are added to the combined version by use of $theme->css() or $theme->css_theme() methods
2) url references in the css are converted to full paths as opposed to relative
3) @import statements in the css are resolved as well.
4) need to move the [if IE] statements into the css files so the will be honored in the browser. currently the ie fix css are always included.
2009-06-29 12:32:11 -07:00
Bharat Mediratta 16d4922e3a Remove unused $theme_relative arg from theme_script(). 2009-06-29 09:07:29 -07:00
Tim Almdal 6ec293dfe7 *Note* work in progress.
Implement the combined css functionality.  Local url references and replace with absolute urls instead of relative.
2009-06-29 08:24:42 -07:00
Tim Almdal 10b4eda6f0 Merge branch 'master' of git@github.com:gallery/gallery3
Conflicts:
	modules/gallery/libraries/Theme_View.php
	themes/admin_default/views/admin.html.php
2009-06-29 06:44:05 -07:00
Tim Almdal 42c82ef7f0 Temporary checkin to allow merge with trunk... don't integrate 2009-06-29 06:08:50 -07:00
Bharat Mediratta 6e8a8c53e6 Rename $theme->url() to $theme->theme_url() for consistency wiht
$theme->theme_script().
2009-06-28 19:49:48 -07:00
Bharat Mediratta c4f991bb7d Clean up the combined javascript change and refactor out the
Gallery_View base class from Theme_View and Admin_View.

1) Move all the theme specific jquery stuff from gallery_theme::head()
and admin_head() into the theme files.  Use $theme->script() as
appropriate.

2) Get rid of the extra boolean on $theme->url() that we were using so
that we could call $theme->script($theme->url(...)) -- add
$theme->theme_script() instead (poorly named, but still clearer than
what we had before)

3) Fix the bug that combined scripts didn't work at all in the admin
theme.

4) Get rid of $theme->display() in favor of new View(...)
2009-06-28 19:45:11 -07:00
Bharat Mediratta 5b2c08d797 Set the gallery module version to 6 in install() (missed this in my last change).
Refresh the install.sql.
2009-06-28 17:37:14 -07:00