aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-03-20 04:13:35 +0000
committerrvelices <rv-github@modusoptimus.com>2012-03-20 04:13:35 +0000
commitb95925dcaa7e9fb17c0bdc938be1b43f0e2c5111 (patch)
tree59a070ae4bd819746cfe709ff67279fb275510fc
parentbd0cf9cab448d1c3084e1a0d8d370ed9adb8145e (diff)
multisize: remove 2 php warnings, delete custom derivatives (batch man + maintenance), watermark applied to custom derivatives
git-svn-id: http://piwigo.org/svn/trunk@13651 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/batch_manager_global.php4
-rw-r--r--admin/include/functions.php3
-rw-r--r--admin/maintenance.php3
-rw-r--r--i.php1
-rw-r--r--language/en_UK/admin.lang.php1
5 files changed, 9 insertions, 3 deletions
diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php
index 95cddf520..ed27c4817 100644
--- a/admin/batch_manager_global.php
+++ b/admin/batch_manager_global.php
@@ -677,10 +677,12 @@ foreach(ImageStdParams::get_defined_type_map() as $params)
{
$del_deriv_map[$params->type] = l10n($params->type);
}
+$gen_deriv_map = $del_deriv_map;
+$del_deriv_map[IMG_CUSTOM] = l10n(IMG_CUSTOM);
$template->assign(
array(
'del_derivatives_types' => $del_deriv_map,
- 'generate_derivatives_types' => $del_deriv_map,
+ 'generate_derivatives_types' => $gen_deriv_map,
)
);
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 3afb705d0..9218ce3e3 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -170,6 +170,7 @@ DELETE FROM '.USER_CACHE_CATEGORIES_TABLE.'
// @return image ids where files are deleted successfully
function delete_element_files($ids)
{
+ global $conf;
if (count($ids) == 0)
{
return 0;
@@ -2277,7 +2278,7 @@ function clear_derivative_cache($types='all')
}
$pattern.='(_[a-zA-Z0-9]+)*\.[a-zA-Z0-9]{3,4}$#';
- if ($contents = opendir(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR))
+ if ($contents = @opendir(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR))
{
while (($node = readdir($contents)) !== false)
{
diff --git a/admin/maintenance.php b/admin/maintenance.php
index 78c4d0a7d..28a20dd4d 100644
--- a/admin/maintenance.php
+++ b/admin/maintenance.php
@@ -159,11 +159,12 @@ $template->set_filenames(array('maintenance'=>'maintenance.tpl'));
$url_format = get_root_url().'admin.php?page=maintenance&amp;action=%s&amp;pwg_token='.get_pwg_token();
-$purge_urls[l10n('all')] = sprintf($url_format, 'derivatives').'&amp;type=all';
+$purge_urls[l10n('All')] = sprintf($url_format, 'derivatives').'&amp;type=all';
foreach(ImageStdParams::get_defined_type_map() as $params)
{
$purge_urls[ l10n($params->type) ] = sprintf($url_format, 'derivatives').'&amp;type='.$params->type;
}
+$purge_urls[ l10n(IMG_CUSTOM) ] = sprintf($url_format, 'derivatives').'&amp;type='.IMG_CUSTOM;
$template->assign(
array(
diff --git a/i.php b/i.php
index ffcd6a507..ff4520e92 100644
--- a/i.php
+++ b/i.php
@@ -240,6 +240,7 @@ function parse_request()
if ($page['derivative_type'] == IMG_CUSTOM)
{
$params = $page['derivative_params'] = parse_custom_params($deriv);
+ ImageStdParams::apply_global($params);
if ($params->sizing->ideal_size[0] < 20 or $params->sizing->ideal_size[1] < 20)
{
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 68eab7860..e1a518b8b 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -874,4 +874,5 @@ $lang['Permission granted for users'] = 'Permission granted for users';
$lang['Select users...'] = 'Select users...';
$lang['%u users have automatic permission because they belong to a granted group.'] = '%u users have automatic permission because they belong to a granted group.';
$lang['include photos with lower privacy level'] = 'include photos with lower privacy level';
+$lang['custom']='Custom';
?> \ No newline at end of file