Changeset 1615

Timestamp:

07/06/08 20:50:47 (5 months ago)

Author:

vollmerk

Message:

add image dimensions on find album art page

Location:

trunk

Files:

• docs/CHANGELOG (modified) (1 diff)
• lib/class/core.class.php (modified) (1 diff)
• lib/class/vainfo.class.php (modified) (1 diff)
• templates/show_album_art.inc.php (modified) (1 diff)

trunk/docs/CHANGELOG

@@ -5 +5 @@
 --------------------------------------------------------------------------
   v.3.5-Alpha1
+        - Added Image Dimensions on Find Album Art page
         - Added Confirmation Screen to Catalog Deletion
         - Reorganized Menu System and Added Modules section

trunk/lib/class/core.class.php

@@ -88 +88 @@
         } // form_verify
 
+        /**
+        * image_dimensions
+        * This returns the dimensions of the passed song of the passed type
+        * returns an empty array if PHP-GD is not currently installed, returns
+        * false on error
+        */ 
+        public static function image_dimensions($image_data) { 
+
+                if (!function_exists('ImageCreateFromString')) { return false; } 
+
+                $image = ImageCreateFromString($image_data); 
+
+                if (!$image) { return false; } 
+
+                $width = imagesx($image); 
+                $height = imagesy($image); 
+
+                if (!$width || !$height) { return false; } 
+
+                return array('width'=>$width,'heigh'=>$height); 
+
+        } // image_dimensions
+
 } // Core
 ?>

trunk/lib/class/vainfo.class.php

@@ -495 +495 @@
         private function _clean_tag($tag,$encoding='') { 
 
+                return $tag; 
+
                 // If we've got iconv then go ahead and clear her up            
                 if ($this->_iconv) { 

trunk/templates/show_album_art.inc.php

@@ -34 +34 @@
                 $key = $i*4+$j;
                 $image_url = Config::get('web_path') . '/image.php?type=session&image_index=' . $key; 
+                $dimensions = Core::image_dimensions(get_image_from_source($_SESSION['form']['images'][$key])); 
                 if (!isset($images[$key])) { echo "<td>&nbsp;</td>\n"; } 
                 else { 
 ?>
                         <td align="center">
-                                <a href="<?php echo $image_url; ?>" target="_blank">
-                                <img src="<?php echo $image_url; ?>" alt="Album Art" border="0" height="175" width="175" /><br />
-                                </a>
+                                <a href="<?php echo $image_url; ?>" target="_blank"><img src="<?php echo $image_url; ?>" alt="Album Art" border="0" height="175" width="175" /></a>
+                                <br />
                                 <p align="center">
-                                [<a href="<?php echo Config::get('web_path'); ?>/albums.php?action=select_art&amp;image=<?php echo $key; ?>&amp;album_id=<?php echo urlencode($_REQUEST['album_id']); ?>">Select</a>]
+                                <?php if (is_array($dimensions)) { ?>
+                                [<?php echo intval($dimensions['width']); ?>x<?php echo intval($dimensions['heigh']); ?>] 
+                                <?php } ?>      
+                                [<a href="<?php echo Config::get('web_path'); ?>/albums.php?action=select_art&amp;image=<?php echo $key; ?>&amp;album_id=<?php echo intval($_REQUEST['album_id']); ?>">Select</a>]
                                 </p>
                         </td>