Changeset 13651

Timestamp:

Mar 20, 2012, 5:13:35 AM (12 years ago)

Author:

rvelices

Message:

multisize: remove 2 php warnings, delete custom derivatives (batch man + maintenance), watermark applied to custom derivatives

Location:

trunk

Files:

• admin/batch_manager_global.php (modified) (1 diff)
• admin/include/functions.php (modified) (2 diffs)
• admin/maintenance.php (modified) (1 diff)
• i.php (modified) (1 diff)
• language/en_UK/admin.lang.php (modified) (1 diff)

trunk/admin/batch_manager_global.php

@@ -678 +678 @@
   $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,
     )
   );

trunk/admin/include/functions.php

@@ -171 +171 @@
 function delete_element_files($ids)
 {
+  global $conf;
   if (count($ids) == 0)
   {
@@ -2278 +2279 @@
 
   $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)

trunk/admin/maintenance.php

@@ -160 +160 @@
 $url_format = get_root_url().'admin.php?page=maintenance&action=%s&pwg_token='.get_pwg_token();
 
-$purge_urls[l10n('all')] = sprintf($url_format, 'derivatives').'&type=all';
+$purge_urls[l10n('All')] = sprintf($url_format, 'derivatives').'&type=all';
 foreach(ImageStdParams::get_defined_type_map() as $params)
 {
   $purge_urls[ l10n($params->type) ] = sprintf($url_format, 'derivatives').'&type='.$params->type;
 }
+$purge_urls[ l10n(IMG_CUSTOM) ] = sprintf($url_format, 'derivatives').'&type='.IMG_CUSTOM;
 
 $template->assign(

trunk/i.php

@@ -241 +241 @@
   {
     $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)

trunk/language/en_UK/admin.lang.php

@@ -875 +875 @@
 $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';
 ?>