Commit Graph
137 Commits
Author SHA1 Message Date
Andy Staudacher bca3eeb923 Import G2 permissions in the import process. Ignores user and item specific permissions. 2010-02-07 21:39:26 -08:00
Andy Staudacher a6170dc065 Fix maintenance view for the case when g2_import is configured and the user replaced the original g2 directory with the .htaccess file only. 2010-02-06 18:37:25 -08:00
Andy Staudacher 7232b6c026 Fixing G2 url mapping for G2 default style URLs (where ShowItem and DownloadItem URLs aren't rewritten in G2).
Note: For a perfect solution, we should add 2 map entries for each of G2's ShowItem and DownloadItem URLs, one for short and one for long style URLs.
E.g. A G2 installation might have been using short style URLs not for its complete lifetime. And long style URLs are supposed to work in G2 even when short style URLs are enabled (and its used that way in bbcode / as a way to get permenant, id based URLs from G2).
2010-02-06 16:29:51 -08:00
Andy Staudacher 33b39efb49 Add core.DownloadItem redirect for G2's Photo and Movie items (was previously omitted, but we already had core.DownloadItem redirects for derivatives) 2010-02-06 15:46:13 -08:00
Andy Staudacher d069155228 Fix g2 redirects for non-admins. The g2 URL mapping controller was accidentally declared as admin controller.
(The previous attempt to fix this isn't a bad change either, thus keeping the external permenant redirect).
2010-02-06 15:08:10 -08:00
Andy Staudacher e092405fdf Fix g2 redirect to use external redirect (and declare it as permanent).
Redirects weren't working for me in Firefox 3.5 when not signed into G3 (and all items are public).
2010-02-06 14:59:28 -08:00
Andy Staudacher d8d1155615 Fix maintenance view, which was broken when the g2_import module was installed but not configured correctly. 2010-02-06 14:20:19 -08:00
Andy Staudacher 9bede5763a Fix g2_import admin screen: It wouldn't work if it didn't know the location of G2 yet. 2010-02-06 13:15:02 -08:00
Tim Almdal aa2e4de024 Corrected copy paste errors in g2_import task. Fixes ticket #949. 2010-02-01 22:55:47 -08:00
Bharat Mediratta c050acf30a Fix lots of warnings that pop up when we're in E_STRICT mode. They're
mostly issues around uninitialized variables, calling non-static
functions in a static context, calling Session functions directly
instead of on its singleton, passing non-variables by reference, and
subclasses not using the same interface as the parent class.
2010-01-31 16:07:41 -08:00
Bharat Mediratta 844d40a759 Oops, forgot to bump the version to 2 in install(). 2010-01-29 14:12:07 -08:00
Bharat Mediratta 4b32a71afc Convert back to using ORM::factory(..., $id) instead of calling where(). 2010-01-27 22:34:11 -08:00
Bharat Mediratta cfbbf9ef60 Convert __toString() to use (string) cast instead. 2010-01-27 21:58:06 -08:00
Bharat Mediratta a4519c6dce Updated for model based validation. 2010-01-24 14:03:36 -08:00
Bharat Mediratta b3023493f4 Clean the G2 base url so that we can't leak XSS vulnerabilities that
way (highly unlikely, but now it's impossible).
2010-01-02 14:00:00 -08:00
Bharat Mediratta 1544bea535 Add a tip about deactivating some modules to make importing faster.
Combine two tips into one.
2010-01-02 12:46:28 -08:00
Bharat Mediratta 0be0111b74 Remove an obsolete todo. 2010-01-01 22:11:08 -08:00
Bharat Mediratta c3075d8181 Add a code block showing how to add a mod_rewrite block to the old Gallery2 install to redirect urls to Gallery 3. 2010-01-01 21:58:07 -08:00
Bharat Mediratta 80e35affcb Improve the PHPdoc for map()
We now expect to either get query parameters from the Gallery2 url so
we can pick off g2_itemId, or we'll get the rewrite url in the path
query param.
2010-01-01 21:56:29 -08:00
Bharat Mediratta 161366e51d New controller for remapping Gallery 2 urls to Gallery 3 urls. 2010-01-01 21:02:52 -08:00
Bharat Mediratta 6d5d68a3f9 Start tracking the original G2 url and id for all entities. This will
allow us to map G2 image urls to the appropriate G3 ones.
2010-01-01 17:41:20 -08:00
Bharat Mediratta b16ab9d94a Don't treat objects like strings. 2009-12-24 03:08:06 -08:00
Bharat Mediratta 2ff84b092d Update database query. 2009-12-06 21:35:04 -08:00
Bharat Mediratta 1fd0e14359 Convert all DB where() calls to take 3 arguments.
Convert all open_paren() calls to and_open() or or_open() as appropriate.
2009-11-26 12:09:04 -08:00
Bharat Mediratta 2e420522ec Preliminary work to cut over to Kohana 2.4
- Kohana::log() -> Kohana_Log::add()
- Kohana::config_XXX -> Kohana_Config::instance()->XXX
- Implement View::set_global in MY_View
- Updated Cache_Database_Driver to latest APIs
- ORM::$loaded -> ORM::loaded()
- Updated item::viewable() to use K2.4 parenthesization
2009-11-25 13:22:24 -08:00
Tim Almdal 57adefc5ba Revert "Create theme::get_var(), theme::set_var() methods to set the options of the active site theme. Change all refrences to theme options to use these methods. Update the version number of Gallery to 20 and move any them related options to the be stored under the active theme."
This reverts commit 26114972c3.
2009-11-19 11:44:01 -08:00
Tim Almdal 4db92d53b0 Revert "Make sure that calls to the theme::get_var() have sane defaults in the event that the theme does not supply them."
This reverts commit 51f2b54767.
2009-11-19 11:43:44 -08:00
Tim Almdal 51f2b54767 Make sure that calls to the theme::get_var() have sane defaults in the event that the theme does not supply them. 2009-11-19 08:48:23 -08:00
Tim Almdal 26114972c3 Create theme::get_var(), theme::set_var() methods to set the options of the active site theme. Change all refrences to theme options to use these methods. Update the version number of Gallery to 20 and move any them related options to the be stored under the active theme. 2009-11-18 15:36:13 -08:00
Chad Kieffer 42ce291d58 Stop overlap of g2_import messages and info icon in the background. Fixes #765. 2009-11-17 15:25:22 -07:00
Bharat Mediratta 595e03b556 Get rid of "skipping" messages because they're overly verbose if you resume an import. This fixes ticket #856. 2009-11-03 13:28:04 -08:00
Tim Almdal 7ea13b3869 Normalize capitalization ticket #596 2009-10-28 12:15:52 -07:00
Tim Almdal 6fb116c53b Merge branch 'master' into talmdal_dev 2009-10-26 06:24:51 -07:00
Chad Kieffer a5d2af336a Move g2_import styles from the theme to the module. 2009-10-25 16:51:24 -06:00
Tim Almdal 3c936d661a Change the name of identity library from Identity to IdentityProvider. Create a helper class called identity to simplify call the Identity Provider. Move the contents of MY_Session.php to the new helper class and remove the MY_Session class 2009-10-22 13:11:03 -07:00
Tim Almdal b528fbde57 Change this files to use the API instead of referencing the group tables directly 2009-10-21 11:50:42 -07:00
Tim Almdal 1b530e4680 Merge branch 'master' into talmdal_dev
Conflicts:
	modules/user/views/admin_users.html.php
2009-10-19 06:27:18 -07:00
Chad Kieffer 5f56cbf997 Wrap all admin views in g-block and g-block content. This provides the means to visually separate the view's title and description from everything else. Primary admin view title should always be h1, and only one h1 per view. Removed some unused admin CSS id's. 2009-10-18 20:22:10 -06:00
Tim Almdal 00eacd659f Start simplifying the interface by moving the static methods from user.php and group.php. Tried creating a identity helper, but the helper identity.php was confused with the library Identity.php. So got around this by making the methods on Identity static and calling the instance within the static methods. Also temporarily moved the user.php and group.php back into the user module. 2009-10-16 08:53:31 -07:00
Chad Kieffer 859f8dc558 Consolidated the rest of the base message styles into lib/gallery.common.css and applied updates to views. Moved over draggable/droppable styles. Use g-target consistently for drag/drop interactions. Minor re-ordering of selectors in gallery.common.css. Updates to css comments. 2009-10-07 00:21:23 -06:00
Chad Kieffer 048e540a98 Fixed previous over zealous find and replace. 2009-10-04 15:44:24 -06:00
Chad Kieffer 3e6ba7acc3 Renamed most, if not all css selectors from gName to g-name. Moved a few shared images from wind to lib. Deleted unused images in the admin_wind. This will likely break a few ajax features. 2009-10-04 00:27:22 -06:00
Chad Kieffer e1e8904e4a Convert gDialog and gCancel over to g-dialog and g-cancel. Refactor CSS id's and classes in the login/reset password dialog. 2009-09-30 22:49:36 -06:00
Chad Kieffer 72672bda39 Replaced gButtonLink with g-button. 2009-09-30 08:04:49 -06:00
Andy Staudacher ddb84c84e1 Rename mark_safe() to mark_clean() 2009-08-31 00:42:18 -07:00
Andy Staudacher effccfd41d Change all instances of SafeString::of_safe_html() to html::mark_safe() in views. 2009-08-30 07:00:56 -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 b4b638be44 Undo url helper changes - url methods no longer return a SafeString.
Adding SafeString::of_safe_html() calls where urls are passed as parameters to t() and t2().
2009-08-29 16:28:30 -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