Commit Graph

225 Commits

Author SHA1 Message Date
Rasmus Lerdorf
ce97f5ff26 There is no $g2_album_id here
I assume this should be $g2_album->getId() instead
2013-05-05 08:42:48 -07:00
shadlaws
b43349f4de #2048 - Remove unneeded jquery.autocomplete.css/js inclusions.
- removed autocomplete.css/js calls in server_add, tag, and g2_import.
- revised xss_data.txt golden file (line number changes only).
2013-03-10 22:08:16 +01:00
shadlaws
891a24151e #2021 - Cleanup thumb_dirty and resize_dirty instances.
- g2_import: changed "false" assignment to "0" assignment for consistency.
- admin_theme_options: removed unused variables (they're called/used nowhere else).
- graphics: removed stanza that clears thumb_dirty and resize_dirty and returns
if we have no ops.  This has no effect on Gallery currently (for one,
graphics::generate doesn't normally get called on an item with no dirty flags),
but can inconsistently set resize_dirty of albums and movies to 0 where it's
otherwise left at 1.  Going forward, it may be useful to be consistent here.
- gallery_installer: added v57 stanza to correct any resize_dirty flags of
movies/albums that were previously reset to 0.
- module.info, install.sql: update to v57
2013-02-27 07:11:52 +01:00
Bharat Mediratta
9345dde83e Fix autocomplete for admin_g2_import. 2013-02-17 00:39:30 -05:00
Bharat Mediratta
a000540565 Updated for the new jQuery tabs API. 2013-02-17 00:30:56 -05:00
Bharat Mediratta
3b9eb29d89 Merge pull request #143 from mikeage/g2_import
Replace = with ==
2013-02-13 13:55:27 -08:00
Mike Miller
d3ca2617f2 Replace = with ==
This was my mistake; I didn't test it thoroughly. It results in all g2 mappings being broken!
2013-02-13 23:11:32 +02:00
Mike Miller
6e757f9988 #1987 g2_import module should redirect with a 301, not 302
As the g2_import process is generally assumed to be permanent, the
redirect should be a 301, and not a 302.
2013-02-01 15:36:49 +02:00
Bharat Mediratta
9396342250 Drop the requirement to have the install() function set the module
version.  It's redundant.  Fixes #1985.
2013-01-31 19:55:53 -05:00
Bharat Mediratta
6e609c249a Merge pull request #110 from mikeage/g2_import
#1973 Handle redirected G2 URLs for tags, including g2_itemId passed
2013-01-30 07:53:56 -08:00
Mike Miller
91acf812a1 #1973 Handle redirected G2 URLs for tags, including g2_itemId passed 2013-01-30 05:59:08 +02:00
shadlaws
48bd19808c #1956 - Escape LIKE queries (for _ and %).
In MySQL queries, _ and % characters are treated as wildcards (similar to ? and *, respectively).
- Added escape_for_like function to MY_Database.php
- Added unit test to Database_Test
- Corrected the five unescaped instances in the code using this function.
2013-01-25 08:47:29 +01:00
Bharat Mediratta
49f6ce2d94 gallery.menalto.com -> galleryproject.org
codex.gallery2.org -> codex.galleryproject.org

Fixes #1957.
2013-01-22 18:39:24 -05:00
Bharat Mediratta
d45a737779 Update copyright to 2013. Fixes #1953. 2013-01-21 01:22:01 -05:00
Mike Miller
f92982c59c Tags by name (includes a G2 mapping) 2013-01-13 05:36:50 +02:00
Bharat Mediratta
b416d7e3d5 Follow on to a9be0691d9 for #1872. 2012-06-05 21:15:21 -07:00
Bharat Mediratta
a9be0691d9 Create an ajax response framework that inserts <meta> tags to guard
against UTF-7, and create a $.gallery_autocomplete variant of jQuery's
autocomplete that expects the first line to be a <meta> tag and
discards it.  More complete fix for #1871.
2012-05-19 11:31:25 -07:00
Bharat Mediratta
6aebc2598e Fix canonical name for this module. Fixes #1858. 2012-05-11 17:12:10 -07:00
Bharat Mediratta
bf2bb3e1ea Update copyright to 2012. #1822 2012-02-27 09:48:23 -08:00
Andy Lindeman
784c429070 [Fixes #1757] Redirect to root album if path comes in as main.php or index.php 2011-06-27 07:24:37 -04:00
Bharat Mediratta
f567bdde28 Clear any existing, matching g2_map rows before mapping new rows.
This is an extra query, but should keep duplicate rows out of the
database and let new rows supercede old ones.  Fixes #1737.
2011-05-22 21:36:16 -07:00
Bharat Mediratta
784ebe7532 Leave the "updated" field alone when importing comments so that if
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-22 21:24:27 -07:00
Bharat Mediratta
229bfc5c7c Track and redirect core.DownloadItem requests properly. This can
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-05-02 21:37:04 -07:00
Bharat Mediratta
68370b92f5 Map the G2 album highlight thumbnail derivative id to the G3 album's
thumbnail.  Fixes #1729.
2011-05-02 21:36:17 -07:00
Bharat Mediratta
9e080efff3 Differentiate between invalid, missing and broken G2 configs and
present the user with feedback in the form.  Fixes #1727.
2011-04-30 15:44:24 -07:00
Bharat Mediratta
4e7524664a Show the tabs after the page has loaded to prevent Firefox from rendering the
unstyled page and then flashing.  Fixes #1705.
2011-04-24 23:04:50 -07:00
Bharat Mediratta
41bc967808 Merge branch 'master' of git://github.com/ckieffer/gallery3 2011-04-24 22:57:24 -07:00
Bharat Mediratta
8533420f5d Look for and return embed.php files in the autocomplete list if we can
find them.  Fixes #1708.
2011-04-24 22:55:08 -07:00
Bharat Mediratta
953be781dc Refactor the meat of g2_import::import_album() off into a separate
function so taht we can call it on the root album as well.  Fixes
2011-04-24 22:51:14 -07:00
Bharat Mediratta
701c1fb12f Ignore the presort when transferring over sort orders. Fixes #1710. 2011-04-24 22:45:45 -07:00
Chad Kieffer
1950f9c466 Merge branch 'master' of git://github.com/gallery/gallery3 2011-04-24 23:05:03 -06:00
Bharat Mediratta
ea2127c3b2 Fix a bug introduced in f2477703fa which
was a fix for #1581 that caused us to skip adding highlights for any
albums that had no sub-albums.
2011-04-24 21:02:34 -07:00
Chad Kieffer
90458673f4 Merge branch 'master' of git://github.com/gallery/gallery3 2011-04-24 11:56:12 -04:00
Chad Kieffer
b4cdd016dc Third times the charm. Rethink unordered lists and bullets. Revert to turning them off by default and provide a new class, g-text, to define a list or a section of text as needing to display bullets. 2011-04-24 11:53:29 -04:00
Bharat Mediratta
b89c40242f Sentence-case the url. Fixes #1706. 2011-04-24 07:49:41 -07:00
Bharat Mediratta
c07af35a19 Oops, fix broken codex urls. For #1698. 2011-04-23 14:53:39 -07:00
Bharat Mediratta
ba20d5a500 Oops, this is the rest of the modules and themes for #1696 and #1698. 2011-04-23 14:46:07 -07:00
Chad Kieffer
c2abd476c7 Merge branch 'master' of git://github.com/gallery/gallery3 2011-04-23 10:29:06 -04:00
Chad Kieffer
bb23e28035 Remove enumeration unordered list class, it's no longer needed. 2011-04-23 10:28:39 -04:00
Bharat Mediratta
07c266b973 Enable autocomplete for the embed path. Fixes #1687. 2011-04-23 07:20:58 -07:00
Bharat Mediratta
5040adebb5 Totally revamp the G2 Import UI to make it sexxxy. Fixes #1683. 2011-04-22 16:30:37 -07:00
colings
ca47b887f5 Added extra arg to gallery_graphics calls and updated users 2011-02-23 20:31:07 -06:00
Bharat Mediratta
423daa52d5 Update copyright to 2011. 2011-01-21 23:01:06 -08:00
Joe7
e86e8b8bd1 Added missing spaces (manual merging from 0d36b97aca3b5ed53ea3ea398ce28b0f6198e577) 2011-01-07 17:53:37 +01:00
Joe7
5bfb7fb96a Added batch importer for groups
Added missing ordering for comments and tags retrieving queries
(One might gets the same output without ordering especially if column is the primary key, but the only way to go for sure it by setting it)
2011-01-07 17:52:12 +01:00
Joe7
c338d3138e Importing Gallery2 users in batches
Fixes Ticket #1554
2011-01-07 17:51:21 +01:00
Joe7
f2477703fa Fix against ticket #1581 - based on 0d36b97aca 2011-01-07 17:33:37 +01:00
Bharat Mediratta
a36c894c63 Fix g2_import::g2_url() to only replace the $g2_base_url once at the
beginning of the url string.  Also, only do this when we're about to
put it into the map, not when we're getting the g2 url else the url is
mangled for other purposes.  Fixes #1512.
2010-11-28 17:01:51 -08:00
Bharat Mediratta
f0781a9162 Add an extra line break after the RewriteBase line so that the
RewriteBase and RewriteRule lines don't get merged in the resulting
textarea.  Fixes #1481.
2010-11-09 09:17:13 -08:00
Bharat Mediratta
35d933cf7f Dump something in the logs if GalleryEmbed::init() fails. 2010-11-08 10:06:56 -08:00