Araxis Merge File Comparison Report

Produced by Araxis Merge on Mon Jan 24 00:14:39 2005 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Internet Explorer. For optimum results when printing this report, enable printing of background images and colours in your browser and use landscape orientation.

1. Files compared

# Location File Last Modified
1 e:\tech\cvs\coppermine\stable-head displayimage.php Mon Aug 23 06:39:53 2004 UTC
2 e:\tech\cvs\coppermine\stable displayimage.php Sun Jan 23 23:31:59 2005 UTC

2. Comparison summary

Description Between
Files 1 and 2
Blocks Lines
Unchanged 4 636
Changed 3 18
Inserted 0 0
Removed 0 0

3. Comparison options

Whitespace All differences in whitespace within lines are ignored
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Hidden in comparison detail

4. Active regular expressions

No regular expressions were active.

5. Comparison detail

1   <?php   1   <?php
2   // ------------------------------------------------------------------------- //   2   // ------------------------------------------------------------------------- //
3   // Coppermine Photo Gallery 1.3.2                                            //   3   // Coppermine Photo Gallery 1.3.2                                            //
4   // ------------------------------------------------------------------------- //   4   // ------------------------------------------------------------------------- //
(247 unchanged lines omitted)
252   {   252   {
253       global $CONFIG, $CURRENT_PIC_DATA, $CURRENT_ALBUM_DATA, $THEME_DIR, $FAVPICS;   253       global $CONFIG, $CURRENT_PIC_DATA, $CURRENT_ALBUM_DATA, $THEME_DIR, $FAVPICS;
254       global $album, $lang_picinfo, $lang_display_image_php, $lang_byte_units;   254       global $album, $lang_picinfo, $lang_display_image_php, $lang_byte_units;
255     255  
256       if ($C   URRENT_PIC_DATA['owner_id'] && $CURRENT_PIC_DATA['owner_name']) {   256       if ($C ONFIG['show_upload_user'] && $C URRENT_PIC_DATA['owner_id'] && $CURRENT_PIC_DATA['owner_name']) {
257           $owner_link = '<a href ="profile.php?uid=' . $CURRENT_PIC_DATA['owner_id'] . '">' . $CURRENT_PIC_DATA['owner_name'] . '</a> ';   257           $owner_link = '<a href ="profile.php?uid=' . $CURRENT_PIC_DATA['owner_id'] . '">' . $CURRENT_PIC_DATA['owner_name'] . '</a> ';
258       } else {   258       } else {
259           $owner_link = '';   259           $owner_link = '';
260       }   260       }
261     261  
262       if (   GALLERY_ADMIN_MODE && $CURRENT_PIC_DATA['pic_raw_ip']) {   262       if ( $CONFIG['show_upload_user'] && GALLERY_ADMIN_MODE && $CURRENT_PIC_DATA['pic_raw_ip']) {
263           if ($CURRENT_PIC_DATA['pic_hdr_ip']) {   263           if ($CURRENT_PIC_DATA['pic_hdr_ip']) {
264               $ipinfo = ' (' . $CURRENT_PIC_DATA['pic_hdr_ip'] . '[' . $CURRENT_PIC_DATA['pic_raw_ip'] . ']) / ';   264               $ipinfo = ' (' . $CURRENT_PIC_DATA['pic_hdr_ip'] . '[' . $CURRENT_PIC_DATA['pic_raw_ip'] . ']) / ';
265           } else {   265           } else {
266               $ipinfo = ' (' . $CURRENT_PIC_DATA['pic_raw_ip'] . ') / ';   266               $ipinfo = ' (' . $CURRENT_PIC_DATA['pic_raw_ip'] . ') / ';
(39 unchanged lines omitted)
306     306  
307       if ($CONFIG['read_exif_data']) $exif = exif_parse_file($path_to_pic);   307       if ($CONFIG['read_exif_data']) $exif = exif_parse_file($path_to_pic);
308     308  
309       if (isset($exif) && is_array($exif)) {   309       if (isset($exif) && is_array($exif)) {
310           if (isset($exif['Camera'])) $info[$lang_picinfo['Camera']] = $exif['Camera'];   310           foreach ($exif as $key=>$val)
311           if (isset($exif['DateTaken'])) $info[$lang_picinfo['Date taken']] = $exif['DateTaken'];   311           {
312           if (isset($exif['Aperture'])) $info[$lang_picinfo['Aperture']] = $exif['Aperture'];   312                   $val = trim($val);
313           if (isset($exif['ISO'])) $info[$lang_picinfo['ISO']] = $exif['ISO'];   313                   if (   strlen(   $ val ) > 0   ) {
314           if (isset($exif['ExposureTime'])) $info[$lang_picinfo['Exposure time']] = $exif['ExposureTime'];   314                           $info[$key] = $val;
315           if (isset($exif['FocalLength'])) $info[$lang_picinfo['Focal length']] = $exif['FocalLength'];   315                   }
316           if ( @ strlen( trim( $ exif['Comment']) ) > 0   ) {    
317                   $info[$lang_picinfo['Comment']] = trim($exif['Comment']);    
318           }   316           }
319       }   317       }
320     318  
321       if ($CONFIG['read_iptc_data']) $iptc = get_IPTC($path_to_pic);   319       if ($CONFIG['read_iptc_data']) $iptc = get_IPTC($path_to_pic);
(321 unchanged lines omitted)
643       ob_end_flush();   641       ob_end_flush();
644   }   642   }
645     643  
646   ?>   644   ?>