- Timestamp:
- Mar 1, 2010, 12:11:38 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.0/tools/create_listing_file.php
r5008 r5009 208 208 209 209 // Backup input/output format support 210 array_push($pwg_conf['gd_supported_format'], $info['JPG Support'] or $info['JPEG Support']? 'jpeg' : NULL);210 array_push($pwg_conf['gd_supported_format'], isset($info['JPG Support']) or isset($info['JPEG Support']) ? 'jpeg' : NULL); 211 211 array_push($pwg_conf['gd_supported_format'], $info['PNG Support'] ? 'png' : NULL); 212 212 array_push($pwg_conf['gd_supported_format'], ($info['GIF Read Support'] and $info['GIF Create Support']) ? 'gif' : NULL); … … 509 509 * @return string 510 510 */ 511 function pwg_get_thumbnail_ext($file_dir, $file_short, $file_ext, &$error_log )511 function pwg_get_thumbnail_ext($file_dir, $file_short, $file_ext, &$error_log, &$icon_log) 512 512 { 513 513 //~ pwg_log('>>>>> pwg_get_thumbnail_ext($file_dir = '.var_export($file_dir, TRUE).', $file_short = '.var_export($file_short, TRUE).') >>>>>'."\n"); … … 534 534 $thumb_ext = $conf['thumbnail_format']; 535 535 } 536 $ error_log .= $log;536 $icon_log .= $log; 537 537 } 538 538 } … … 708 708 709 709 $error_log =''; 710 $icon_log = ''; 710 711 711 712 $file_base = basename($file_full); … … 720 721 { 721 722 // Here we scan a picture : thumbnail is mandatory, high is optionnal, representative is not scanned 722 $element['tn_ext'] = pwg_get_thumbnail_ext($file_dir, $file_short, $file_ext, $error_log );723 $element['tn_ext'] = pwg_get_thumbnail_ext($file_dir, $file_short, $file_ext, $error_log, $icon_log); 723 724 if ($element['tn_ext'] != '') 724 725 { … … 811 812 $line .= '/>'."\n"; 812 813 } 813 814 815 // Adding Icon generation log to message 816 $error_log .= $icon_log; 817 814 818 //~ pwg_log('<<<<< pwg_scan_file() returns '.var_export($error_log, TRUE).' <<<<<'."\n"); 815 819 return $error_log; … … 1103 1107 $format = ($info['GIF Create Support']) ? '<code>gif</code>' : NULL; 1104 1108 array_push($format_list, $format); 1105 $format = ( $info['JPG Support'] or $info['JPEG Support']) ? '<code>jpg</code>' : NULL;1109 $format = (isset($info['JPG Support']) or isset($info['JPEG Support'])) ? '<code>jpg</code>' : NULL; 1106 1110 array_push($format_list, $format); 1107 1111 $format = ($info['PNG Support']) ? '<code>png</code>' : NULL;
Note: See TracChangeset
for help on using the changeset viewer.