[Openfirst-cvscommit] photogallery gallery.php,1.8,1.9

[<xt...@us...>]

Update of /cvsroot/openfirst/photogallery
In directory sc8-pr-cvs1:/tmp/cvs-serv15538

Modified Files:
	gallery.php 
Log Message:
Remove duplicate image preview bug introduced by me when I incorrectly handled CVS conflicts.

Index: gallery.php
===================================================================
RCS file: /cvsroot/openfirst/photogallery/gallery.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gallery.php	22 Aug 2003 15:49:12 -0000	1.8
--- gallery.php	22 Aug 2003 16:49:33 -0000	1.9
***************
*** 62,83 ****
    // Begin reading the directory for images
    while(! (($file = readdir($dir)) === false)){
- 
-     // If the directory is not a dir then continue the process
-     if (! is_dir($dirlocate."/".$file)){
-       if ($num > 3){
-         echo "</tr><tr>";
-         $num = 1;
-       }
-       echo "<td width='34%'><center><a target='_blank' href='viewphoto.php?ID=".$_GET['ID']."&PHOTO=".$file."'>";
- 
-       if(file_exists($dirlocate."/thumbs/".$file)){
-         echo "<img border='1px' height=100 width=152 src='".$dirlocate."/thumbs/".$file."'>";
-       } else {
-         echo "<img border='1px' height=100 width=152 src='".$dirlocate."/".$file."'>";
-       }
- 
-       echo "</a><br><a href='email.php?PHOTO=".$dirlocate."/".$file."'><img border='0' src=email.PNG alt='Email to a friend'></a><img border='0' src='spacer.PNG'><a target='_blank' href='viewphoto.php?ID=".$_GET['ID']."&PHOTO=".$file."'><img border='0' alt='Enlarge' src='enlarge.PNG'>
-             </a></center></a></td>";
- 
      // Explode file type then check if the file is allowed by the photogallery globals
      $imgtype = explode(",",$imgtypes);
--- 62,65 ----
***************
*** 121,125 ****
        }
      }
-   }
  
    // If no photos have been found then preview a no photos message
--- 103,106 ----