Changeset 10157 for trunk/admin

Timestamp:

Apr 8, 2011, 11:09:13 AM (13 years ago)

Author:

mistic100

Message:

bug:1791 display hd dimensions instead of websize dimensions

Location:

trunk/admin

Files:

• include/functions_upload.inc.php (modified) (3 diffs)
• site_reader_local.php (modified) (2 diffs)
• site_reader_remote.php (modified) (1 diff)

trunk/admin/include/functions_upload.inc.php

@@ -348 +348 @@
       $update['has_high'] = 'true';
       $update['high_filesize'] = $high_infos['filesize'];
+      $update['high_width'] = $high_infos['width'];
+      $update['high_height'] = $high_infos['height'];
     }
     else
@@ -353 +355 @@
       $update['has_high'] = 'false';
       $update['high_filesize'] = null;
+      $update['high_width'] = null;
+      $update['high_height'] = null;
     }
 
@@ -388 +392 @@
       $insert['has_high'] = 'true';
       $insert['high_filesize'] = $high_infos['filesize'];
+      $insert['high_width'] = $high_infos['width'];
+      $insert['high_height'] = $high_infos['height'];
     }
 

trunk/admin/site_reader_local.php

@@ -155 +155 @@
   global $conf;
 
-  $update_fields = array('filesize', 'width', 'height', 'high_filesize');
+  $update_fields = array('filesize', 'width', 'height', 'high_filesize', 'high_width', 'high_height');
 
   if ($conf['use_exif'])
@@ -200 +200 @@
   {
     $high_file = dirname($file).'/pwg_high/'.basename($file);
-
     $data['high_filesize'] = floor(filesize($high_file)/1024);
+    
+    if ($high_size = @getimagesize($high_file))
+    {
+      $data['high_width'] = $high_size[0];
+      $data['high_height'] = $high_size[1];
+    }
   }
 

trunk/admin/site_reader_remote.php

@@ -44 +44 @@
     );
   $this->metadata_attributes = array(
-    'filesize', 'width', 'height', 'high_filesize'
+    'filesize', 'width', 'height', 'high_filesize', 'high_width', 'high_height',
     );