Changeset 493 for trunk/admin

Timestamp:

Aug 25, 2004, 11:09:09 PM (20 years ago)

Author:

z0rglub

Message:

"show metadata" feature added : you can ask to show metadata (EXIF and IPTC)
on picture.php page. Metadata read functions were moved from
admin/include/functions_metadata.php to include/functions_metadata.inc.php

Location:

trunk/admin

Files:

• configuration.php (modified) (3 diffs)
• include/functions_metadata.php (modified) (4 diffs)

trunk/admin/configuration.php

@@ -211 +211 @@
 $use_exif = ($conf['use_exif']=='true')?'USE_EXIF_YES':'USE_EXIF_NO';
 $use_iptc = ($conf['use_iptc']=='true')?'USE_IPTC_YES':'USE_IPTC_NO';
+$show_exif = ($conf['show_exif']=='true')?'SHOW_EXIF_YES':'SHOW_EXIF_NO';
+$show_iptc = ($conf['show_iptc']=='true')?'SHOW_IPTC_YES':'SHOW_IPTC_NO';
 
 //----------------------------------------------------- template initialization
@@ -245 +247 @@
   $use_exif=>'checked="checked"',
   $use_iptc=>'checked="checked"',
+  $show_exif=>'checked="checked"',
+  $show_iptc=>'checked="checked"',
   
   'L_CONFIRM'=>$lang['conf_confirmation'],
@@ -314 +318 @@
   'L_USE_IPTC'=>$lang['conf_use_iptc'],
   'L_USE_IPTC_INFO'=>$lang['conf_use_iptc_info'],
+  'L_SHOW_EXIF'=>$lang['conf_show_exif'],
+  'L_SHOW_EXIF_INFO'=>$lang['conf_show_exif_info'],
+  'L_SHOW_IPTC'=>$lang['conf_show_iptc'],
+  'L_SHOW_IPTC_INFO'=>$lang['conf_show_iptc_info'],
   
   'F_ACTION'=>add_session_id(PHPWG_ROOT_PATH.'admin.php?page=configuration')

trunk/admin/include/functions_metadata.php

@@ -26 +26 @@
 // +-----------------------------------------------------------------------+
 
-/**
- * returns informations from IPTC metadata, mapping is done at the beginning
- * of the function
- *
- * @param string $filename
- * @return array
- */
-function get_iptc_data($filename)
+include_once(PHPWG_ROOT_PATH.'/include/functions_metadata.inc.php');
+
+function get_sync_iptc_data($file)
 {
-  global $getimagesize_time;
-    
   $map = array(
     'keywords'        => '2#025',
@@ -46 +39 @@
   $datefields = array('date_creation', 'date_available');
   
-  $result = array();
-  
-  // Read IPTC data
-  $iptc = array();
-  
-  $start = get_moment();
-  getimagesize($filename, &$imginfo);
-  $getimagesize_time+= get_moment() - $start;
-  
-  if (is_array($imginfo) and isset($imginfo['APP13']))
-  {
-    $iptc = iptcparse($imginfo['APP13']);
-    if (is_array($iptc))
-    {
-      $rmap = array_flip($map);
-      foreach (array_keys($rmap) as $iptc_key)
-      {
-        if (isset($iptc[$iptc_key][0]) and $value = $iptc[$iptc_key][0])
-        {
-          // strip leading zeros (weird Kodak Scanner software)
-          while ($value[0] == chr(0))
-          {
-            $value = substr($value, 1);
-          }
-          // remove binary nulls
-          $value = str_replace(chr(0x00), ' ', $value);
-          
-          foreach (array_keys($map, $iptc_key) as $pwg_key)
-          {
-            if (in_array($pwg_key, $datefields))
-            {
-              if ( preg_match('/(\d{4})(\d{2})(\d{2})/', $value, $matches))
-              {
-                $value = $matches[1].'-'.$matches[2].'-'.$matches[3];
-              }
-              else
-              {
-                continue;
-              }
-            }
-            $result[$pwg_key] = $value;
-          }
-        }
-      }
-    }
-  }
-  return $result;
+  $iptc = get_iptc_data($file, $map);
+
+  foreach ($iptc as $pwg_key => $value)
+  {
+    if (in_array($pwg_key, $datefields))
+    {
+      if ( preg_match('/(\d{4})(\d{2})(\d{2})/', $value, $matches))
+      {
+        $iptc[$pwg_key] = $matches[1].'-'.$matches[2].'-'.$matches[3];
+      }
+    }
+  }
+
+  return $iptc;
 }
 
@@ -98 +58 @@
 {
   global $conf;
-
-//   $conf['use_iptc'] = true;
-//   $conf['use_exif'] = true;
   
   $inserts = array();
@@ -133 +90 @@
     if ($conf['use_iptc'])
     {
-      $iptc = get_iptc_data($file);
-      foreach (array_keys($iptc) as $key)
-      {
-        $insert[$key] = "'".addslashes($iptc[$key])."'";
+      $iptc = get_sync_iptc_data($file);
+      if (count($iptc) > 0)
+      {
+        foreach (array_keys($iptc) as $key)
+        {
+          $insert[$key] = "'".addslashes($iptc[$key])."'";
+        }
       }
     }