--- expose/index.php	2003/11/05 14:21:33	1.3
+++ expose/index.php	2003/11/05 15:40:21	1.4
@@ -20,7 +20,7 @@
 | Version 2 along with this program; if not, visit GNU's Home Page
 | http://www.gnu.org/
 +----------------------------------------------------------------------+
-$Id: index.php,v 1.3 2003/11/05 14:21:33 cam Exp $
+$Id: index.php,v 1.4 2003/11/05 15:40:21 cam Exp $
 */
 
 $global_var['metadata']['author'] = "Carl Johan Schedvin <cjsc02@student.bth.se>";
@@ -41,7 +41,6 @@
 										'ql'	=>	70,
 										'wm'	=>	''
 											);
-
 $global_var['image_sz']['640'] = array	(
 									'x'		=>	640,
 									'y'		=>	480,
@@ -61,7 +60,7 @@
 									'wm'	=>	''
 										);
 
-
+$global_var['image_sz']['default']	=& $global_var['image_sz']['640'];
 
 if(isset($_SERVER['PHP_SELF'])) {
 	$php_self = $_SERVER['PHP_SELF'];
@@ -117,20 +116,34 @@
 	if(!file_exists($pwd.'/'.$global_var['path']['thumb_dir']))
 		mkdir($pwd.'/'.$global_var['path']['thumb_dir'],0777);
 
+	echo <<<EOT
+		<div id="thumbnails_container">\n
+		
+EOT;
+
 	foreach($image_files as $image) {
 
+		$thumb_image = $pwd.'/'.$global_var['path']['thumb_dir'].'/'.$image;
+
 		// check if a thumbnail for current image exists, if not create one.					
-		if(!file_exists($pwd.'/'.$global_var['path']['thumb_dir'].'/'.$image))
+		if(!file_exists($thumb_image))
 			create_thumbnail($image);
 
+	  	$thumb_sz = GetImageSize($thumb_image);
+	
 		echo <<<EOT
-		<div class="thumbnail">\n
-			<a href="$php_self?dir=$pwd&img=$image">
-				<img src="$pwd/{$global_var[path][thumb_dir]}/$image" alt=""/>
-			</a>
-		</div>\n
+			<div class="thumbnail" style="width: {$thumb_sz[0]}px; height: {$thumb_sz[1]}px;">\n
+				<a href="$php_self?dir=$pwd&img=$image">
+					<img src="$thumb_image" alt=""/>
+				</a>
+			</div>\n
 EOT;
 	}
+
+	echo <<<EOT
+		</div>\n		
+		<div style="clear: both;"><br/></div>\n
+EOT;
 }
 
 
@@ -140,10 +153,29 @@
 {
 	global $global_var, $get_vars, $pwd;
 
-	if(file_exists($pwd.'/'.$get_vars['img'])) {
+	$image = $pwd.'/'.$get_vars['img'];
+
+	$cached_image = $pwd.'/'.$global_var['path']['cache_dir'];
+
+	if(file_exists($image)) {
+
+		$image_size = GetImageSize($image);
+
+		if(isset($get_var['width'])) {
+			if($get_var['width'] >= $image_size[0])
+				$cache_image = $image;
+		} else {
+			if(!file_exists($cached_image.'/default_'.$get_vars['img'])) {
+				resize_image('default_');
+			}
+			$cached_image = $cached_image.'/default_'.$get_vars['img'];
+		}
+
+		$image_size = GetImageSize($cached_image);
+
 		echo <<<EOT
-			<div id="image">\n
-				<img src="$pwd/{$get_vars[img]}" alt="">
+			<div id="image" style="width: {$image_size[0]}px; height: {$image_size[1]}px;">\n
+				<a href="$image" target="_blank"><img src="$cached_image" alt=""></a>
 			</div>\n
 EOT;
 	}
@@ -152,8 +184,25 @@
 
 
 
-function resize_image()
+function resize_image($prefix)
 {
+	global $global_var, $get_vars, $pwd;
+	$src_image = $get_vars['img'];
+	if(isset($global_var['external']['magick'])) {
+		if(file_exists($pwd.'/'.$src_image)) {
+			$src_image_sz = GetImageSize($pwd.'/'.$src_image);
+			$resize_aspect = round(($global_var['image_sz']['default']['y'] / $src_image_sz[1])*100, 2);
+
+			// DEBUG: print "Quality: ".$global_var['image_sz']['default']['ql'] ." Resize Aspect: ". $resize_aspect ."%";
+
+			exec($global_var['external']['magick']
+				.' -geometry '.$resize_aspect.'%'
+				.' -quality '.$global_var['image_sz']['default']['ql']
+				.' '.$pwd.'/'.$src_image
+				.' '.$pwd.'/'.$global_var['path']['cache_dir'].'/'.$prefix.$src_image
+				);
+		}	
+	}	
 }
 
 
@@ -183,6 +232,7 @@
 
 
 
+
 /**
  * Retrieves all directory names present in $path. Using
  * eregi we exclude names we don't want in the list.
@@ -206,6 +256,7 @@
 
 
 
+
 if (isset($get_vars['dir']) && is_dir(rawurldecode($get_vars['dir'])))
 {
 	$pwd = rawurldecode($get_vars['dir']);
@@ -268,7 +319,7 @@
 	<meta name="description" content="{$global_var[metadata][description]}" />
 	<meta name="robots" content="all" />
 	
-	<title></title>
+	<title>expose: </title>
 	
 	<style type="text/css">
 		@import "/~ikea/style.css";
@@ -297,7 +348,7 @@
 echo <<<EOF
 	<div id="copyright">\n
 		{$global_var[str_msg][copyright]}<br />
-		<a href="">expose</a> <span style="font-style: italic;">cvs version: $Revision: 1.3 $</span>
+		<a href="">expose</a> <span style="font-style: italic;">Cvs version: \$Revision: 1.4 $</span>
 	</div>
 </div>
 </body>