--- qdig-20051005cnj.php Wed Oct 5 18:04:03 2005
+++ qdig-20051203cnj.php Sat Dec 3 22:13:15 2005
@@ -37,9 +37,9 @@
| Version 2 along with this program; if not, visit GNU's Home Page
| http://www.gnu.org/
+----------------------------------------------------------------------+
-CVS: $Id: qdig.php,v 1.19 2005/10/05 22:02:00 matt Exp $#
+CVS: $Id: qdig.php,v 1.21 2005/12/04 00:22:39 matt Exp $#
*/#
-$qdig_version = '20051005cnj [based on 20050509]';
+$qdig_version = '20051203cnj [based on 20050509]';
$mtime = microtime();
$mtime = explode(' ', $mtime);
$start_time = $mtime[1] + $mtime[0];
@@ -217,8 +217,8 @@
$exif_camera['padding'] = '3px';
$exif_camera['above'] = TRUE; // Place camera line above the image, not below.
$exif_verbose['enable'] = TRUE; // Show verbose EXtendedInFormation on the side
-$exif_verbose['min_width'] = 300; /// XXX these need to change
-$exif_verbose['padding'] = '3px';
+//$exif_verbose['min_width'] = 300; /// XXX these need to change
+//$exif_verbose['padding'] = '3px';
$exif_verbose['above'] = FALSE; // Plase verbose above image, not below
$exif_verbose_ignore[] = 'EXIF.MakerNote'; // Ignore these fields
$exif_verbose_ignore[] = 'THUMBNAIL'; // or an entire section
@@ -227,6 +227,7 @@
$exif_verbose_ignore[] = 'EXIF.ComponentsConfiguration';
$exif_verbose_ignore[] = 'IFD0'; // We're ignoring everything.
$exif_verbose_ignore[] = 'EXIF'; // We're ignoring everything.
+$exif_verbose_ignore[] = 'MAKERNOTE'; // We're ignoring everything.
$exif_verbose_show[] = 'EXIF.ISOSpeedRatings'; // Allow these back in
$exif_verbose_show[] = 'EXIF.FNumber';
//$exif_verbose_show[] = 'COMPUTED.ApertureFNumber';
@@ -249,6 +250,7 @@
$exif_verbose_show[] = 'FILE.MimeType';
$exif_verbose_show[] = 'COMPUTED.Height';
$exif_verbose_show[] = 'COMPUTED.Width';
+$exif_columns = 2; // How many elements to display across (verbose)
// Settings for making the displayed image an active link
@@ -356,6 +358,7 @@
* To use the one that isn't the default, set the default one to FALSE.
*/
$convert_magick = TRUE; // Use Image Magick, if available, to convert images.
+$convert_magick_force = TRUE; // Use Image Magick, even in safe_mode (add to safe_mode_exec_dir! path)
$convert_cmd = '/usr/local/bin/convert'; // Full pathname to `convert'.
// Example $convert_cmd for Win32 users:
//$convert_cmd = '"C:\\Program Files\\ImageMagick-5.5.3-Q16\\convert.exe"';
@@ -1095,7 +1098,7 @@
/**
* Generate thumbnail images for images that do not have thumbnails yet.
*/
-function createThumbs($cnvrt_thmb)
+function createThumbs($cnvrt_thmb, $bCallHook = false)
{
global $platform, $pwd, $imgs, $convert_magick, $cnvrt_path, $convert_cmd,
$convert_GD, $thmbs_ena, $convert_writable, $caption_path,
@@ -1127,6 +1130,11 @@
|| ! file_exists($caption_file))
{
touch($caption_file);
+ $caption="";
+ }
+ else
+ {
+ $caption=file_get_contents($caption_file);
}
}
$orig_img = $pwd.'/'.$img_file;
@@ -1191,6 +1199,9 @@
.$img_file.$using.".\n"
." \n
\n";
}
+ if($bCallHook===true) {
+ $str .= genthmHook($pwd, $img_file, $cnvrtd_img, $caption);
+ }
}
}
if (isset($str)) { return $str; }
@@ -1916,7 +1927,7 @@
$num_imgs = count($imgs);
if (isset($imgs) && $num_imgs > 1) {
$str = " \n";
- $str .= "
$name | $val | ${desc_name} | ${av} | "; + } + } + } + } + $ee_cnt=0; + foreach($exif_entry as $ee) { + if(++$ee_cnt==1){ + $str .= "\t\t
"; + } + $str .= $ee; + if($exif_columns==$ee_cnt) { + $str .= " |