Changeset 10157

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

Files:

• admin/include/functions_upload.inc.php (modified) (3 diffs)
• admin/site_reader_local.php (modified) (2 diffs)
• admin/site_reader_remote.php (modified) (1 diff)
• install/db/100-database.php (added)
• install/piwigo_structure-mysql.sql (modified) (1 diff)
• install/piwigo_structure-pdo-sqlite.sql (modified) (1 diff)
• install/piwigo_structure-pgsql.sql (modified) (1 diff)
• install/piwigo_structure-sqlite.sql (modified) (1 diff)
• picture.php (modified) (2 diffs)
• tools/create_listing_file.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',
     );
 

trunk/install/piwigo_structure-mysql.sql

@@ -193 +193 @@
   `storage_category_id` smallint(5) unsigned default NULL,
   `high_filesize` mediumint(9) unsigned default NULL,
+  `high_width` smallint(9) unsigned default NULL,
+  `high_height` smallint(9) unsigned default NULL,
   `level` tinyint unsigned NOT NULL default '0',
   `md5sum` char(32) default NULL,

trunk/install/piwigo_structure-pdo-sqlite.sql

@@ -189 +189 @@
   "storage_category_id" INTEGER,
   "high_filesize" INTEGER,
+  "high_width" INTEGER,
+  "high_height" INTEGER,
   "level" INTEGER default 0 NOT NULL,
   "md5sum" CHAR(32),

trunk/install/piwigo_structure-pgsql.sql

@@ -233 +233 @@
   "storage_category_id" INTEGER,
   "high_filesize" INTEGER,
+  "high_width" INTEGER,
+  "high_height" INTEGER,
   "level" INTEGER default 0 NOT NULL,
   "md5sum" CHAR(32),

trunk/install/piwigo_structure-sqlite.sql

@@ -189 +189 @@
   "storage_category_id" INTEGER,
   "high_filesize" INTEGER,
+  "high_width" INTEGER,
+  "high_height" INTEGER,
   "level" INTEGER default 0 NOT NULL,
   "md5sum" CHAR(32),

trunk/picture.php

@@ -920 +920 @@
 }
 
+// hd size in pixels
+if ($picture['current']['is_picture'] AND $picture['current']['has_high'])
+{
+  if (!empty($picture['current']['high_width']))
+  {
+    $infos['INFO_DIMENSIONS'] = $picture['current']['high_width'].'*'.$picture['current']['high_height'];
+  }
+  else
+  {
+    $hi_size = @getimagesize($hi_url);
+    if ($hi_size !== false)
+    {
+      pwg_query('
+        UPDATE ' . IMAGES_TABLE . '
+        SET 
+          high_width = \'' . $hi_size[0].'\',
+          high_height = \''.$hi_size[1] .'\'
+        WHERE id = ' . $picture['current']['id'] . ';
+      ');
+      
+      $infos['INFO_DIMENSIONS'] = $hi_size[0].'*'.$hi_size[1];
+    }
+  }
+}
+
 // filesize
 if (!empty($picture['current']['filesize']))
@@ -925 +950 @@
   $infos['INFO_FILESIZE'] =
     sprintf(l10n('%d Kb'), $picture['current']['filesize']);
+}
+
+// hd filesize
+if ($picture['current']['has_high'] and !empty($picture['current']['high_filesize']))
+{
+  $infos['INFO_FILESIZE'] =
+    sprintf(l10n('%d Kb'), $picture['current']['high_filesize']);
 }
 

trunk/tools/create_listing_file.php

@@ -739 +739 @@
         $high_file = $file_dir.'/'.$conf['high'].'/'.$file_base;
         $element['high_filesize'] = floor(filesize($high_file) / 1024);
+        
+        if ($high_size = @getimagesize($high_file))
+        {
+          $element['high_width'] = $high_size[0];
+          $element['high_height'] = $high_size[1];
+        }
       }