archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature 2626: fix watermark form submission (with the help of rvelices)

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@14580 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2012-04-30 09:44:51 +00:00
parent 1468b3adc5
commit b219d87284
1 changed files with 13 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
admin/include/configuration_watermark_process.inc.php
View file

@ -129,62 +129,28 @@ if (count($errors) == 0)
|| $watermark->xrepeat != $old_watermark->xrepeat
|| $watermark->opacity != $old_watermark->opacity;
// do we have to regenerate the derivatives?
$old_enabled = ImageStdParams::get_defined_type_map();
// $disabled = @unserialize( @$conf['disabled_derivatives'] );
// if ($disabled===false)
// {
// $disabled = array();
// }
// save the new watermark configuration
ImageStdParams::set_watermark($watermark);
$new_enabled = ImageStdParams::get_defined_type_map();
// do we have to regenerate the derivatives (and which types)?
$types = ImageStdParams::get_defined_type_map();
$changed_types = array();
foreach(ImageStdParams::get_all_types() as $type)
foreach ($types as $type => $params)
{
if (isset($old_enabled[$type]))
{
$old_params = $old_enabled[$type];
// echo '<pre>old '.$type."\n"; print_r($old_params); echo '</pre>';
$new_params = $new_enabled[$type];
ImageStdParams::apply_global($new_params);
// echo '<pre>new '.$type."\n"; print_r($old_params); echo '</pre>';
$same = true;
if ($new_params->use_watermark != $old_params->use_watermark
or $new_params->use_watermark and $watermark_changed)
{
$same = false;
}
$old_use_watermark = $params->use_watermark;
ImageStdParams::apply_global($params);
if (!$same)
{
$new_params->last_mod_time = time();
$changed_types[] = $type;
}
else
{
$new_params->last_mod_time = $old_params->last_mod_time;
}
$new_enabled[$type] = $new_params;
if ($params->use_watermark != $old_use_watermark
or $params->use_watermark and $watermark_changed)
{
$params->last_mod_time = time();
$changed_types[] = $type;
$types[$type] = $params;
}
}
$enabled_by = array(); // keys ordered by all types
foreach(ImageStdParams::get_all_types() as $type)
{
if (isset($new_enabled[$type]))
{
$enabled_by[$type] = $new_enabled[$type];
}
}
ImageStdParams::set_and_save($enabled_by);
ImageStdParams::set_and_save($types);
if (count($changed_types))
{