Commit Graph

460 Commits

Author SHA1 Message Date
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
Andy Staudacher
3bd5990056 i18n theme name / description in admin themes. Partial fix for ticket 471. 2009-06-29 22:22:27 -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
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
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
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
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
d90e30c378 Rename the combined javascript controller from javascript/combined to combined/javascript. 2009-06-28 17:07:12 -07:00
Bharat Mediratta
aa31e1f009 Tweak the cache implementation
1) Drop the *_modified key, we don't really need it.  The modification date is not
   relevant to our browser caching strategy.
2) Fix multiple issues with the Expires header and just hardcode it to the biggest
   possibly value for code clarity.
3) print the $content out directly instead of using fwrite
4) Minor cleanups in the installer.
2009-06-28 16:24:51 -07:00
Tim Almdal
bf26ca727e Change the combined javascript to use the new caching functionality and respect the HTTP_IF_MODIFIED_SINCE header request. 2009-06-28 15:30:13 -07:00
Tim Almdal
11f08ee439 Implement the combined javascript controller. 2009-06-26 21:42:02 -07:00
Tim Almdal
f4778699fc Change the movie controller to set the page type to "movie". Ticket #467 2009-06-26 08:19:06 -07:00
Bharat Mediratta
e44053f692 Cache the page_type in pane() instead of looking it up twice. 2009-06-23 21:42:25 -07:00
Bharat Mediratta
b9b68e0952 Add a new "show credits" check box in the theme options so that you
can disable any module credits if you want.  Update the theme to obey
it.
2009-06-23 16:05:32 -07:00
Bharat Mediratta
d5ee5741f2 Don't allow renaming of the root album. 2009-06-23 14:08:07 -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
Tim Almdal
fa4bb5b7ac Change the quick pan from static to dynamic. This allows modules to add buttons to the
quick pane.  The quick pane is now divided into 4 sections: left, center, right and
additional.  Additional items appear in the drop down box.  Buttons are not sorted
within the groupings.

In addition, the quick pane will overflow onto the "additional" dropdown if there is not
enough room to display all the buttons.

The use case is the digibug printing module needed to add a button to the quick pane, and
I don't like putting code into core that says if module is active... That's another one
of those code smells :-)

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-22 21:08:35 +08:00
Bharat Mediratta
06f066164f Add Session::abort_save() to Kohana.
Filed upstream as: http://dev.kohanaphp.com/issues/1801
2009-06-21 15:09:32 -07:00
Tim Almdal
1dccc0286f Change the page.html file so that if the type of page is login, the sidebar contents are are not shown 2009-06-16 22:09:02 -07:00
Andy Staudacher
06ed45f0cb Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-16 20:26:49 -07:00
Andy Staudacher
be226b9baa Add option to list *all* l10n messages (that have been indexed) in l10n UI
TODO: The "Show All" link is almost invisible (link color ~= background)
2009-06-16 20:25:01 -07:00
Bharat Mediratta
baea5e3a1b Add support for uploading .jpeg files (in addition to .jpg)
Fix for ticket #428
2009-06-16 20:10:25 -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
aaa215a285 Get rid of the word "items" in the delete confirmation dialog. 2009-06-14 10:41:34 -07:00
Chad Kieffer
390bc7c1f6 Switch quick delete from JS confirm to jQuery UI dialog, closes ticket #355. 2009-06-14 10:42:14 -06:00
Bharat Mediratta
68fd196d66 Rename theme_details to theme_options everywhere.
Fixes ticket #317
2009-06-10 21:23:57 -07:00
Bharat Mediratta
4118ca4f1d Provide a way for non-admins to authenticate and use the upgrader,
without using our regular code paths.
2009-06-10 21:05:24 -07:00
Bharat Mediratta
0d5826ab9f Fix log links. html::anchor() implicitly calls url::site(), calling
it a second time mangles the urls.

Fixes ticket #360.
2009-06-10 20:37:38 -07:00
Bharat Mediratta
8c0d48b001 Add CLI sapi support 2009-06-10 01:23:44 -07:00
Bharat Mediratta
73de6eedd9 Rename package -> packager (it's a noun which has verbs on it).
Force a HTTP_HOST so that url::base() works.
2009-06-10 01:23:18 -07:00
Bharat Mediratta
d6b808b726 Add security checks 2009-06-09 21:27:55 -07:00
Bharat Mediratta
2fd322deea ACtually implement the upgrader, and add a confirmation box when the
upgrade is complete.
2009-06-09 21:26:37 -07:00
Bharat Mediratta
a20246b738 Say hello to the new upgrader UI. 2009-06-09 20:33:06 -07:00
Bharat Mediratta
798444f40b Replace login_page.html.php with the form, wrapped in our default page
type.
2009-06-09 19:45:15 -07:00
Tim Almdal
b276eaa68b Add some window dressing to login_page.html in order to make it more in line
with the overall look of the Gallery3 theme

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-10 08:39:47 +08:00
Tim Almdal
a4a38ba760 Created not_authorized.html.php which is a prettier login screen if the root
album is not publicly browsable.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-10 08:39:45 +08:00
Tim Almdal
3c3a65b5a7 Rather than just displaying the "unformatted" login screen when the root album
is not viewable by a guest, display the root album as if it was empty. When
the page finishes loading force the login dialog to be displayed.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-09 22:22:57 +08:00
Chad Kieffer
d2b8ca241d Show status message when album cover is set (#257) 2009-06-09 00:25:49 -06:00
Bharat Mediratta
4f0a3fefa0 Fix a bug in Item_Model::get_position() where we incorrectly using the
grandparent id.  Oops.  This caused navigation from photo back up to
album to be broken.

Also update Photos_Controller to use the active sort order.. it was
still hardcoded to use the id.  It's more efficient now, yay.

Fixes ticket #340.
2009-06-04 22:11:08 -07:00
Andy Staudacher
1cfed1fac1 Extend L10n client to provide UI for plural translation.
Ticket 148.
2009-06-02 00:43:04 -07:00
Bharat Mediratta
3b6567f38c Unescape %20 into " " also. 2009-06-01 23:20:36 -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
c94c11eb3e Normalize the random values used in the blocks_dashboard_xxx vars so
that install.sql is more stable.
2009-06-01 00:22:30 -07:00
Bharat Mediratta
e4f4c8b2e8 Do a little cleanup and get rid of code left-over from when this
controller rendered HTML.  Also, catch all exceptions at the root
level and restore the change in
84ce0cdefd which appears to have gotten
lost in the shuffle.
2009-06-01 00:11:09 -07:00
Tim Almdal
3c24d94766 Merge branch 'master' of git@github.com:gallery/gallery3 2009-05-31 23:28:42 -07:00
Tim Almdal
463b3454ae Move the sql packaging code from installer into the gallery module. It must be run from the command line and will throw a 404 if it is run as a web request. 2009-05-31 23:28:27 -07:00