Commit 1d7a3777 authored by lucha's avatar lucha

[auto] plugin: nextgen-gallery 2.2.14

parent b62e9757
NextGEN Gallery
by Imagely
= V2.2.14 - 09.18.2017 =
* NEW: EXIF and IPTC metadata are copied to new images when generating thumbnails, watermarks, or new sizes
* Fixed: Metadata is read and preserved when "Resized images after upload" feature is enabled
= V2.2.12 - 08.01.2017 =
* Secured: Disabled Flash backend in plupload
* Changed: Upgraded PHP-Parser version used when building plugin zips
......
......@@ -4,7 +4,7 @@ if(preg_match('#' . basename(__FILE__) . '#', $_SERVER['PHP_SELF'])) { die('You
/**
* Plugin Name: NextGEN Gallery
* Description: The most popular gallery plugin for WordPress and one of the most popular plugins of all time with over 18 million downloads.
* Version: 2.2.12
* Version: 2.2.14
* Author: Imagely
* Plugin URI: https://www.imagely.com/wordpress-gallery-plugin/nextgen-gallery/
* Author URI: https://www.imagely.com
......@@ -644,7 +644,7 @@ class C_NextGEN_Bootstrap
define('NGG_PRODUCT_URL', path_join(str_replace("\\", '/', NGG_PLUGIN_URL), 'products'));
define('NGG_MODULE_URL', path_join(str_replace("\\", '/', NGG_PRODUCT_URL), 'photocrati_nextgen/modules'));
define('NGG_PLUGIN_STARTED_AT', microtime());
define('NGG_PLUGIN_VERSION', '2.2.12');
define('NGG_PLUGIN_VERSION', '2.2.14');
if (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG)
define('NGG_SCRIPT_VERSION', (string)mt_rand(0, mt_getrandmax()));
......
......@@ -884,11 +884,7 @@ class A_NextGen_Basic_Extended_Album_Form extends Mixin_NextGen_Basic_Album_Form
*/
function enqueue_static_resources()
{
wp_enqueue_script('nextgen_basic_extended_albums_settings_script', $this->object->get_static_url('photocrati-nextgen_basic_album#extended_settings.js'), array('jquery.nextgen_radio_toggle'), NGG_SCRIPT_VERSION);
$atp = C_Attach_Controller::get_instance();
if ($atp != null) {
$atp->mark_script('nextgen_basic_extended_albums_settings_script');
}
$this->object->enqueue_script('nextgen_basic_extended_albums_settings_script', $this->object->get_static_url('photocrati-nextgen_basic_album#extended_settings.js'), array('jquery.nextgen_radio_toggle'));
}
}
/**
......@@ -916,10 +912,6 @@ class A_NextGen_Basic_Compact_Album_Form extends Mixin_NextGen_Basic_Album_Form
*/
function enqueue_static_resources()
{
wp_enqueue_script('nextgen_basic_compact_albums_settings_script', $this->object->get_static_url('photocrati-nextgen_basic_album#compact_settings.js'), array('jquery.nextgen_radio_toggle'), NGG_SCRIPT_VERSION);
$atp = C_Attach_Controller::get_instance();
if ($atp != null) {
$atp->mark_script('nextgen_basic_compact_albums_settings_script');
}
$this->object->enqueue_script('nextgen_basic_compact_albums_settings_script', $this->object->get_static_url('photocrati-nextgen_basic_album#compact_settings.js'), array('jquery.nextgen_radio_toggle'));
}
}
\ No newline at end of file
......@@ -295,11 +295,7 @@ class A_NextGen_Basic_Slideshow_Form extends Mixin_Display_Type_Form
}
function enqueue_static_resources()
{
wp_enqueue_script('nextgen_basic_slideshow_settings-js', $this->get_static_url('photocrati-nextgen_basic_gallery#slideshow/nextgen_basic_slideshow_settings.js'), array('jquery.nextgen_radio_toggle'), NGG_SCRIPT_VERSION);
$atp = C_Attach_Controller::get_instance();
if ($atp != null) {
$atp->mark_script('nextgen_basic_slideshow_settings-js');
}
$this->object->enqueue_script('nextgen_basic_slideshow_settings-js', $this->get_static_url('photocrati-nextgen_basic_gallery#slideshow/nextgen_basic_slideshow_settings.js'), array('jquery.nextgen_radio_toggle'));
}
/**
* Returns a list of fields to render on the settings page
......@@ -357,12 +353,8 @@ class A_NextGen_Basic_Thumbnail_Form extends Mixin_Display_Type_Form
*/
function enqueue_static_resources()
{
wp_enqueue_style('nextgen_basic_thumbnails_settings', $this->object->get_static_url('photocrati-nextgen_basic_gallery#thumbnails/nextgen_basic_thumbnails_settings.css'), FALSE, NGG_SCRIPT_VERSION);
wp_enqueue_script('nextgen_basic_thumbnails_settings', $this->object->get_static_url('photocrati-nextgen_basic_gallery#thumbnails/nextgen_basic_thumbnails_settings.js'), array('jquery.nextgen_radio_toggle'), NGG_SCRIPT_VERSION);
$atp = C_Attach_Controller::get_instance();
if ($atp != null) {
$atp->mark_script('nextgen_basic_thumbnails_settings');
}
$this->object->enqueue_style('nextgen_basic_thumbnails_settings', $this->object->get_static_url('photocrati-nextgen_basic_gallery#thumbnails/nextgen_basic_thumbnails_settings.css'));
$this->object->enqueue_script('nextgen_basic_thumbnails_settings', $this->object->get_static_url('photocrati-nextgen_basic_gallery#thumbnails/nextgen_basic_thumbnails_settings.js'), array('jquery.nextgen_radio_toggle'));
}
/**
* Returns a list of fields to render on the settings page
......
......@@ -89,12 +89,7 @@ class A_NextGen_Basic_Tagcloud_Form extends Mixin_Display_Type_Form
}
function enqueue_static_resources()
{
$path = 'photocrati-nextgen_basic_tagcloud#settings.css';
wp_enqueue_style('nextgen_basic_tagcloud_settings-css', $this->get_static_url($path), FALSE, NGG_SCRIPT_VERSION);
$atp = C_Attach_Controller::get_instance();
if (!is_null($atp)) {
$atp->mark_script($path);
}
$this->object->enqueue_style('nextgen_basic_tagcloud_settings-css', $this->get_static_url('photocrati-nextgen_basic_tagcloud#settings.css'));
}
function _render_nextgen_basic_tagcloud_number_field($display_type)
{
......
......@@ -168,13 +168,9 @@ class A_NextGen_Basic_Template_Form extends Mixin
}
function enqueue_static_resources()
{
wp_enqueue_style('ngg_template_settings', $this->get_static_url('photocrati-nextgen_basic_templates#ngg_template_settings.css'), FALSE, NGG_SCRIPT_VERSION);
wp_enqueue_script('ngg_template_settings', $this->get_static_url('photocrati-nextgen_basic_templates#ngg_template_settings.js'), array('ngg_select2'), NGG_SCRIPT_VERSION, TRUE);
wp_enqueue_style('ngg_template_settings', $this->get_static_url('photocrati-nextgen_basic_templates#ngg_template_settings.css'));
wp_enqueue_script('ngg_template_settings', $this->get_static_url('photocrati-nextgen_basic_templates#ngg_template_settings.js'), array('ngg_select2'), TRUE);
wp_localize_script('ngg_template_settings', 'ngg_template_settings', array('placeholder_text' => __('No template selected')));
$atp = C_Attach_Controller::get_instance();
if ($atp != null) {
$atp->mark_script('ngg_template_settings');
}
}
}
/**
......
......@@ -50,6 +50,7 @@ class M_NextGen_Data extends C_Base_Module
function get_type_list()
{
return array(
'C_Exif_Writer_Wrapper' => 'class.exif_writer_wrapper.php',
'A_Attachment_Datamapper' => 'adapter.attachment_datamapper.php',
'A_Customtable_Sorting_Datamapper' => 'adapter.customtable_sorting_datamapper.php',
'A_Nextgen_Data_Factory' => 'adapter.nextgen_data_factory.php',
......
......@@ -235,6 +235,19 @@ class Mixin_Album_Mapper extends Mixin
}
}
}
class C_Exif_Writer_Wrapper
{
// Because our C_Exif_Writer class relies on PEL (a library which uses namespaces) we wrap
// its use through this method which performs a PHP version check before loading the class file
public static function copy_metadata($old_file, $new_file)
{
if (version_compare(phpversion(), '5.3.0', '<')) {
return;
}
require_once __DIR__ . DIRECTORY_SEPARATOR . 'pel-0.9.6' . DIRECTORY_SEPARATOR . 'class.exif_writer.php';
C_Exif_Writer::copy_metadata($old_file, $new_file);
}
}
class Mixin_NextGen_Gallery_Validation
{
/**
......@@ -1206,46 +1219,51 @@ class Mixin_GalleryStorage_Driver_Base extends Mixin
if (!is_writable($upload_dir)) {
throw new E_InsufficientWriteAccessException(FALSE, $upload_dir, FALSE);
}
// Save the image
if ($image_id = $this->object->_image_mapper->save($image)) {
try {
// Try writing the image
$fp = fopen($abs_filename, 'wb');
fwrite($fp, $this->maybe_base64_decode($data));
fclose($fp);
if ($settings->imgBackup) {
$this->object->backup_image($image);
}
if ($settings->imgAutoResize) {
$this->object->generate_image_clone($abs_filename, $abs_filename, $this->object->get_image_size_params($image_id, 'full'));
}
// Ensure that fullsize dimensions are added to metadata array
$dimensions = getimagesize($abs_filename);
$full_meta = array('width' => $dimensions[0], 'height' => $dimensions[1], 'md5' => $this->object->get_image_checksum($image, 'full'));
if (!isset($image->meta_data) or is_string($image->meta_data) && strlen($image->meta_data) == 0) {
$image->meta_data = array();
}
$image->meta_data = array_merge($image->meta_data, $full_meta);
$image->meta_data['full'] = $full_meta;
// Generate a thumbnail for the image
$this->object->generate_thumbnail($image);
// Set gallery preview image if missing
C_Gallery_Mapper::get_instance()->set_preview_image($gallery, $image_id, TRUE);
// Notify other plugins that an image has been added
do_action('ngg_added_new_image', $image);
// delete dirsize after adding new images
delete_transient('dirsize_cache');
// Seems redundant to above hook. Maintaining for legacy purposes
do_action('ngg_after_new_images_added', $gallery_id, array($image->{$image_key}));
} catch (E_No_Image_Library_Exception $ex) {
throw $ex;
} catch (E_Clean_Exit $ex) {
// pass
} catch (Exception $ex) {
throw new E_InsufficientWriteAccessException(FALSE, $abs_filename, FALSE, $ex);
try {
// Try writing the image
$fp = fopen($abs_filename, 'wb');
fwrite($fp, $this->maybe_base64_decode($data));
fclose($fp);
// Save the image
$image_id = $this->object->_image_mapper->save($image);
if (!$image_id) {
throw new E_InvalidEntityException();
}
} else {
throw new E_InvalidEntityException();
if ($settings->imgBackup) {
$this->object->backup_image($image);
}
if ($settings->imgAutoResize) {
$this->object->generate_image_clone($abs_filename, $abs_filename, $this->object->get_image_size_params($image_id, 'full'));
}
$this->object->_image_mapper->_use_cache = FALSE;
$image = $this->object->_image_mapper->find($image_id);
$this->object->_image_mapper->_use_cache = TRUE;
// Ensure that fullsize dimensions are added to metadata array
$dimensions = getimagesize($abs_filename);
$full_meta = array('width' => $dimensions[0], 'height' => $dimensions[1], 'md5' => $this->object->get_image_checksum($image, 'full'));
if (!isset($image->meta_data) or is_string($image->meta_data) && strlen($image->meta_data) == 0) {
$image->meta_data = array();
}
$image->meta_data = array_merge($image->meta_data, $full_meta);
$image->meta_data['full'] = $full_meta;
// Don't forget to append the 'full' entry in meta_data in the db
$this->object->_image_mapper->save($image);
// Generate a thumbnail for the image
$this->object->generate_thumbnail($image);
// Set gallery preview image if missing
C_Gallery_Mapper::get_instance()->set_preview_image($gallery, $image_id, TRUE);
// Notify other plugins that an image has been added
do_action('ngg_added_new_image', $image);
// delete dirsize after adding new images
delete_transient('dirsize_cache');
// Seems redundant to above hook. Maintaining for legacy purposes
do_action('ngg_after_new_images_added', $gallery_id, array($image->{$image_key}));
} catch (E_No_Image_Library_Exception $ex) {
throw $ex;
} catch (E_Clean_Exit $ex) {
// pass
} catch (Exception $ex) {
throw new E_InsufficientWriteAccessException(FALSE, $abs_filename, FALSE, $ex);
}
} else {
throw new E_EntityNotFoundException();
......@@ -1643,6 +1661,7 @@ class Mixin_GalleryStorage_Driver_Base extends Mixin
* @param string $image_path
* @param string $clone_path
* @param array $params
* @param bool $save Whether to call the image save() method
* @return object
*/
function generate_image_clone($image_path, $clone_path, $params)
......@@ -1777,13 +1796,7 @@ class Mixin_GalleryStorage_Driver_Base extends Mixin
}
$thumbnail = apply_filters('ngg_before_save_thumbnail', $thumbnail);
$thumbnail->save($destpath, $quality);
// IF the original contained IPTC metadata we should attempt to copy it
if (isset($detailed_size['APP13']) && function_exists('iptcembed')) {
$metadata = @iptcembed($detailed_size['APP13'], $destpath);
$fp = @fopen($destpath, 'wb');
@fwrite($fp, $metadata);
@fclose($fp);
}
C_Exif_Writer_Wrapper::copy_metadata($image_path, $destpath);
}
}
return $thumbnail;
......@@ -1958,7 +1971,7 @@ class Mixin_Gallery_Image_Mapper extends Mixin
function _save_entity($entity)
{
$entity->updated_at = time();
// If successfully saved, then import metadata and
// If successfully saved then import metadata
$retval = $this->call_parent('_save_entity', $entity);
if ($retval) {
include_once NGGALLERY_ABSPATH . '/admin/functions.php';
......
AUTHORS file for PEL: PHP Exif Library. A library with support for
reading and writing Exif headers in JPEG and TIFF images using PHP.
Copyright (C) 2004, 2005, 2006, 2007 Martin Geisler.
Copyright (c) 2008, 2009 Lars Olesen
Copyright (c) 2015 Johannes Weberhofer
Licensed under the GNU GPL, see COPYING for details.
Credits
*******
PEL is written by Martin Geisler <mgeisler@users.sourceforge.net> and
is now maintained by Lars Olesen <lars@intraface.dk>
and <jweberhofer@weberhofer.at>
The source started out as a port of the nice, clean C code found in
libexif. Most of the translations included with PEL also originates
from the libexif project, see below for details.
Test Image Contributors
***********************
Bernhard Bittel: Nikon E950 and E5000 test images.
Stéphanie Bittel: Canon IXUS II test image.
Lars Geisler: Nikon Coolscan IV ED test image.
Mikkel Krøigård: Canon PowerShot S60 test image.
Paul Mitchum: Pentax *ist DS and Olympus C-5050z test images.
Lisbeth Nygaard Pedersen: Leica D-LUX test image.
Thomas B. Pedersen: Olympus C-50z and C-765z test images.
Translators
***********
Danish: Martin Geisler.
French: Arnaud Launay (for libexif) and David Lesieur.
German: Hans Ulrich Niedermann, Lutz Möller (for libexif).
Japanese: Tadashi Jokagi.
Polish: Jakub Bogusz (for libexif).
Spanish: Fabian Mandelbaum (for libexif).
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made