summaryrefslogtreecommitdiff
path: root/modules/g2_import/controllers
AgeCommit message (Collapse)Author
2011-07-21Squashed commit of the following:Chad Parry
commit 41d379c2b777ae7b3a11f528971228e234f8976f Author: Chad Parry <github@chad.parry.org> Date: Thu Jul 21 00:10:10 2011 -0600 Replace an overly-complicated regular expression with a simple in_array, at Bharat's suggestion. commit 1b3f7111d4c2607baaa2da0aab3b501f2d9a1426 Merge: 8f7904a 403f64b Author: Chad Parry <github@chad.parry.org> Date: Wed Jul 20 21:02:56 2011 -0600 Merge branch 'master' into rawphoto commit 403f64bf2a91fe3ac2496a0a6a6180ece26afd82 Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com> Date: Tue Jul 12 21:44:14 2011 -0700 Automated update of .build_number to 163 for branch master Last update: e8382b960a3c19bb28140833e348e6c9c9db8a8a (1 commits ago) commit 51726f9e4b8372c40b27f843fca7b783e6db9623 Author: Tim Almdal <tnalmdal@shaw.ca> Date: Tue Jul 12 21:44:40 2011 -0700 Fix for ticket #1752. Add an RSS field link for the current album. Or, in the case of a photo or movie, add a link to the rss field of the parent album. commit e8382b960a3c19bb28140833e348e6c9c9db8a8a Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com> Date: Mon Jun 27 22:27:04 2011 -0700 Automated update of .build_number to 162 for branch master Last update: 40cda7fa3fa8d9ede1f24bfa8460aab1ac681c34 (1 commits ago) commit 1afbcafe0e556ac571a5282f8b481fb90f5fb05a Merge: 40cda7f fc6c139 Author: Bharat Mediratta <bharat@menalto.com> Date: Mon Jun 27 22:26:41 2011 -0700 Merge pull request #56 from alindeman/alindeman/1758 [Fixes #1758] Link to themes codex page instead of modules codex page commit 40cda7fa3fa8d9ede1f24bfa8460aab1ac681c34 Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com> Date: Mon Jun 27 22:25:54 2011 -0700 Automated update of .build_number to 161 for branch master Last update: 771de0a3746ac0d780cb5dce2a14aa5a6ddf06d7 (1 commits ago) commit aa08df7f0a839c95d268853cd745f622c98cadd0 Merge: 771de0a 784c429 Author: Bharat Mediratta <bharat@menalto.com> Date: Mon Jun 27 22:25:46 2011 -0700 Merge pull request #55 from alindeman/alindeman/1757 [Fixes #1757] Redirect to root album if path comes in as main.php or index.php commit fc6c1390d3d5f3d99d75b04acf208ae3729c11ce Author: Andy Lindeman <alindeman@gmail.com> Date: Mon Jun 27 08:25:50 2011 -0400 [Fixes #1758] Link to themes codex page instead of modules codex page commit 784c429070db54e183feb3e0ea6f2726b6507081 Author: Andy Lindeman <alindeman@gmail.com> Date: Mon Jun 27 07:24:37 2011 -0400 [Fixes #1757] Redirect to root album if path comes in as main.php or index.php commit 8f7904ab62c71a7e4ee68762f936030b4dcb4ea1 Merge: e950573 771de0a Author: Chad Parry <github@chad.parry.org> Date: Sat Jun 25 14:12:39 2011 -0600 Merge branches 'master' and 'rawphoto' into rawphoto commit e95057337996351e49915d9f85d007d50103a4be Author: Chad Parry <github@chad.parry.org> Date: Wed Jun 15 20:24:18 2011 -0600 Merge branches 'rawphoto-squash' and 'rawphoto' into rawphoto
2011-05-22Leave the "updated" field alone when importing comments so that ifBharat Mediratta
Akismet marks them as spam, we don't immediately flush them out of the database on the next visit to Admin > Content > Comments. Also warn the user about Akismet, and fix up the G2 import code to reimport deleted comments.
2011-05-02Track and redirect core.DownloadItem requests properly. This canBharat Mediratta
happen if the G2 was imported with rewrite on, so the g2_url in the g2_map table has a shortened url, but then rewrite is disabled and the .htaccess mod_rewrite rules are sending over a &g2_view=core.DownloadItem request. Fixes #1728.
2011-04-30Differentiate between invalid, missing and broken G2 configs andBharat Mediratta
present the user with feedback in the form. Fixes #1727.
2011-04-24Look for and return embed.php files in the autocomplete list if we canBharat Mediratta
find them. Fixes #1708.
2011-04-23Enable autocomplete for the embed path. Fixes #1687.Bharat Mediratta
2011-04-22Totally revamp the G2 Import UI to make it sexxxy. Fixes #1683.Bharat Mediratta
2011-01-21Update copyright to 2011.Bharat Mediratta
2010-09-18When looking for G2 urls in the g2_map, try also swapping spaces for +Bharat Mediratta
in case the url had spaces in it. Fixes ticket #1388.
2010-09-18Fix a bug in that last commit where I was treating resource_type as a function.Bharat Mediratta
2010-09-18Redirect to the root album when there's an empty path and empty id.Bharat Mediratta
Fixes ticket #1387.
2010-08-29Reformat comment.Bharat Mediratta
2010-07-03Internationalize the "Gallery 2 path saved." message and remove the trailing ↵Bharat Mediratta
period. Fixes ticket #1171.
2010-06-15The fact that we have a path to a G2 embed file doesn't mean that it's stillBharat Mediratta
valid so check to see that it's ok before proceeding. This should resolve #458.
2010-04-30Add page_title to admin views. Closes #1038.ckieffer
2010-03-03Update the copyright to 2010. It's only 3 months into the year :-)Bharat Mediratta
2010-02-09Change access::can to access::required in g2 redirect, to please the ↵Andy Staudacher
controller auth code audit test.
2010-02-06Fixing G2 url mapping for G2 default style URLs (where ShowItem and ↵Andy Staudacher
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-06Add core.DownloadItem redirect for G2's Photo and Movie items (was ↵Andy Staudacher
previously omitted, but we already had core.DownloadItem redirects for derivatives)
2010-02-06Fix g2 redirects for non-admins. The g2 URL mapping controller was ↵Andy Staudacher
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-06Fix g2_import admin screen: It wouldn't work if it didn't know the location ↵Andy Staudacher
of G2 yet.
2010-01-31Fix lots of warnings that pop up when we're in E_STRICT mode. They'reBharat Mediratta
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-27Convert back to using ORM::factory(..., $id) instead of calling where().Bharat Mediratta
2010-01-01Improve the PHPdoc for map()Bharat Mediratta
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-01New controller for remapping Gallery 2 urls to Gallery 3 urls.Bharat Mediratta
2009-11-19Revert "Revert "Revert "Use call_user_func instead of call_user_func_array ↵Tim Almdal
as we don't need to pass the parameters by reference.""" This reverts commit 05b5a2c9ed9e5c3ed05eec8748f4bebc381993c4.
2009-11-19Revert "Revert "Use call_user_func instead of call_user_func_array as we ↵Tim Almdal
don't need to pass the parameters by reference."" This reverts commit 630099364515fd0fd0453b4b548048c8a32c831c.
2009-11-19Revert "Use call_user_func instead of call_user_func_array as we don't need ↵Tim Almdal
to pass the parameters by reference." This reverts commit 75cc4962a2c945e3e3ad37fda3b5de32d512b929. 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 51f2b547672ab69a7a04d37b723c6afbeb584a59. Revert "Update the installer to reflect the new location of the theme related options." This reverts commit 678e22996d73b96833c48d94751344a6bd8f2899. 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 26114972c3388f065220b94a0d5962f20a6ccd0c. Revert "Currently Admin_Theme_Options controller assumes that all the themes will provide the same values. This change corrects that assumption and moves the management of the theme options, including creating the form and updating the theme options into the theme." This reverts commit 1692ee130887a6ad1ba68aa34a96ad36161600f9.
2009-11-19Make sure that calls to the theme::get_var() have sane defaults in the event ↵Tim Almdal
that the theme does not supply them.
2009-11-18Create theme::get_var(), theme::set_var() methods to set the options of the ↵Tim Almdal
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-10-04Renamed most, if not all css selectors from gName to g-name. Moved a few ↵Chad Kieffer
shared images from wind to lib. Deleted unused images in the admin_wind. This will likely break a few ajax features.
2009-06-23Gracefully handle the case when the gallery2 instances moves somewhereBharat Mediratta
else (or gets deleted). Fixes ticket #458
2009-06-01Security pass over all controller code. Mostly adding CSRF checkingBharat Mediratta
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-05-27Update all references to the core application to now point to theBharat Mediratta
gallery module. This type of mass update is prone to some small bugs.
2009-05-13Gee it's May already. Update copyright to 2009.Bharat Mediratta
2009-05-12Deal with the user-entered g2 embed.php path a little more sanely so that if ↵Bharat Mediratta
the user enters the path to G2 itself, we find the embed.php path from there.
2009-05-09Don't try to put g2_stats and g2_size into the view if g2 is not initialized.Bharat Mediratta
2009-05-09Usability and performance improvementsBharat Mediratta
Significantly speed up the process by copying Gallery2 thumbnails and resizes wherever possible instead of regenerating them. This requires us to figure out the dimensions of the original G2 derivative and make sure that it matches in some reasonable way. To allow users to take advantage of this, calculate the optimal thumb and resize size to set in G3 to match what was used in G2. While we're at it, give the user some idea of how much data is available in G2 to import.
2009-04-15Very early round of Gallery 2 import code. It can import users (withBharat Mediratta
the wrong password) and import groups, with a basic UI. Needs a ton more work.
generated by cgit v1.2.3 (git 2.51.0) at 2026-04-20 22:07:25 +0000