Changeset 13651


Ignore:
Timestamp:
03/20/12 05:13:35 (8 years ago)
Author:
rvelices
Message:

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

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/batch_manager_global.php

    r13646 r13651  
    678678  $del_deriv_map[$params->type] = l10n($params->type); 
    679679} 
     680$gen_deriv_map = $del_deriv_map; 
     681$del_deriv_map[IMG_CUSTOM] = l10n(IMG_CUSTOM); 
    680682$template->assign( 
    681683    array( 
    682684      'del_derivatives_types' => $del_deriv_map, 
    683       'generate_derivatives_types' => $del_deriv_map, 
     685      'generate_derivatives_types' => $gen_deriv_map, 
    684686    ) 
    685687  ); 
  • trunk/admin/include/functions.php

    r13077 r13651  
    171171function delete_element_files($ids) 
    172172{ 
     173  global $conf; 
    173174  if (count($ids) == 0) 
    174175  { 
     
    22782279 
    22792280  $pattern.='(_[a-zA-Z0-9]+)*\.[a-zA-Z0-9]{3,4}$#'; 
    2280   if ($contents = opendir(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR)) 
     2281  if ($contents = @opendir(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR)) 
    22812282  { 
    22822283    while (($node = readdir($contents)) !== false) 
  • trunk/admin/maintenance.php

    r13074 r13651  
    160160$url_format = get_root_url().'admin.php?page=maintenance&action=%s&pwg_token='.get_pwg_token(); 
    161161 
    162 $purge_urls[l10n('all')] = sprintf($url_format, 'derivatives').'&type=all'; 
     162$purge_urls[l10n('All')] = sprintf($url_format, 'derivatives').'&type=all'; 
    163163foreach(ImageStdParams::get_defined_type_map() as $params) 
    164164{ 
    165165  $purge_urls[ l10n($params->type) ] = sprintf($url_format, 'derivatives').'&type='.$params->type; 
    166166} 
     167$purge_urls[ l10n(IMG_CUSTOM) ] = sprintf($url_format, 'derivatives').'&type='.IMG_CUSTOM; 
    167168 
    168169$template->assign( 
  • trunk/i.php

    r13527 r13651  
    241241  { 
    242242    $params = $page['derivative_params'] = parse_custom_params($deriv); 
     243    ImageStdParams::apply_global($params); 
    243244 
    244245    if ($params->sizing->ideal_size[0] < 20 or $params->sizing->ideal_size[1] < 20) 
  • trunk/language/en_UK/admin.lang.php

    r13646 r13651  
    875875$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.'; 
    876876$lang['include photos with lower privacy level'] = 'include photos with lower privacy level'; 
     877$lang['custom']='Custom'; 
    877878?> 
Note: See TracChangeset for help on using the changeset viewer.