rev
parent
3cc6e0b8c3
commit
69f3aca75c
10
CHANGELOG.md
10
CHANGELOG.md
|
@ -1,4 +1,6 @@
|
||||||
entryPhotoExifWidget 1.0 - 2016-11-04
|
20210817. entryPhotoExifWidget 1.0.1
|
||||||
===========================================================
|
- Move to Franck style
|
||||||
* First release
|
|
||||||
* Find images of an entry and paste their exif on a widget
|
20161104. entryPhotoExifWidget 1.0
|
||||||
|
- First release
|
||||||
|
- Find images of an entry and paste their exif on a widget
|
|
@ -20,3 +20,9 @@ First install entryPhotoExifWidget, manualy from a zip package or from
|
||||||
Dotaddict repository. (See Dotclear's documentation to know how do this)
|
Dotaddict repository. (See Dotclear's documentation to know how do this)
|
||||||
|
|
||||||
Add and configure "Photo Exif Widget" from widgets manager.
|
Add and configure "Photo Exif Widget" from widgets manager.
|
||||||
|
|
||||||
|
# MORE
|
||||||
|
|
||||||
|
* License : GNU GPL v2
|
||||||
|
* Source & contribution : [GitHub Page](https://github.com/JcDenis/entryPhotoExifWidget)
|
||||||
|
* Packages & details: [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/entryPhotoExifWidget)
|
|
@ -12,9 +12,8 @@
|
||||||
#
|
#
|
||||||
# -- END LICENSE BLOCK ------------------------------------
|
# -- END LICENSE BLOCK ------------------------------------
|
||||||
|
|
||||||
if (!defined('DC_CONTEXT_ADMIN'))
|
if (!defined('DC_CONTEXT_ADMIN')) {
|
||||||
{
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
require_once dirname(__FILE__).'/_widgets.php';
|
require_once dirname(__FILE__) . '/_widgets.php';
|
18
_define.php
18
_define.php
|
@ -12,22 +12,20 @@
|
||||||
#
|
#
|
||||||
# -- END LICENSE BLOCK ------------------------------------
|
# -- END LICENSE BLOCK ------------------------------------
|
||||||
|
|
||||||
if (!defined('DC_RC_PATH'))
|
if (!defined('DC_RC_PATH')) {
|
||||||
{
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->registerModule(
|
$this->registerModule(
|
||||||
/* Name */ "Entry Photo Exif Widget",
|
'Entry Photo Exif Widget', // Name
|
||||||
/* Description*/ "Show images exif of an entry",
|
'Show images exif of an entry', // Description
|
||||||
/* Author */ "Jean-Christian Denis and contibutors",
|
'Jean-Christian Denis and contibutors', // Author
|
||||||
/* Version */ '1.0',
|
'1.0.1', // Version
|
||||||
/* Properties */
|
[
|
||||||
array(
|
|
||||||
'permissions' => 'admin',
|
'permissions' => 'admin',
|
||||||
'type' => 'plugin',
|
'type' => 'plugin',
|
||||||
'dc_min' => '2.10',
|
'dc_min' => '2.10',
|
||||||
'support' => 'http://forum.dotclear.org/',
|
'support' => 'http://forum.dotclear.org/',
|
||||||
'details' => 'http://plugins.dotaddict.org/dc2/details/photoExifWidget'
|
'details' => 'https://plugins.dotaddict.org/dc2/details/entryPhotoExifWidget'
|
||||||
)
|
]
|
||||||
);
|
);
|
|
@ -12,9 +12,8 @@
|
||||||
#
|
#
|
||||||
# -- END LICENSE BLOCK ------------------------------------
|
# -- END LICENSE BLOCK ------------------------------------
|
||||||
|
|
||||||
if (!defined('DC_RC_PATH'))
|
if (!defined('DC_RC_PATH')) {
|
||||||
{
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
require_once dirname(__FILE__).'/_widgets.php';
|
require_once dirname(__FILE__) . '/_widgets.php';
|
132
_widgets.php
132
_widgets.php
|
@ -12,19 +12,15 @@
|
||||||
#
|
#
|
||||||
# -- END LICENSE BLOCK ------------------------------------
|
# -- END LICENSE BLOCK ------------------------------------
|
||||||
|
|
||||||
if (!defined('DC_RC_PATH'))
|
if (!defined('DC_RC_PATH')) {
|
||||||
{
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$core->addBehavior(
|
$core->addBehavior('initWidgets', ['entryPhotoExifWidget', 'setWidget']);
|
||||||
'initWidgets',
|
|
||||||
array('entryPhotoExifWidget','setWidget')
|
|
||||||
);
|
|
||||||
|
|
||||||
class entryPhotoExifWidget
|
class entryPhotoExifWidget
|
||||||
{
|
{
|
||||||
public static $supported_post_type = array('post','page','gal','galitem');
|
public static $supported_post_type = array('post', 'page', 'gal', 'galitem');
|
||||||
public static $widget_content = '<ul>%s</ul>';
|
public static $widget_content = '<ul>%s</ul>';
|
||||||
public static $widget_text = '<li class="epew-%s"><strong>%s</strong> %s</li>';
|
public static $widget_text = '<li class="epew-%s"><strong>%s</strong> %s</li>';
|
||||||
public static $widget_thumb = '<li><img class="img-thumbnail" alt="%s" src="%s" /></li>';
|
public static $widget_thumb = '<li><img class="img-thumbnail" alt="%s" src="%s" /></li>';
|
||||||
|
@ -33,7 +29,7 @@ class entryPhotoExifWidget
|
||||||
{
|
{
|
||||||
global $core;
|
global $core;
|
||||||
|
|
||||||
$categories_combo = array('-' => '',__('Uncategorized') => 'null');
|
$categories_combo = array('-' => '', __('Uncategorized') => 'null');
|
||||||
$categories = $core->blog->getCategories();
|
$categories = $core->blog->getCategories();
|
||||||
while($categories->fetch())
|
while($categories->fetch())
|
||||||
{
|
{
|
||||||
|
@ -52,7 +48,7 @@ class entryPhotoExifWidget
|
||||||
$w->create(
|
$w->create(
|
||||||
'epew',
|
'epew',
|
||||||
__('Entry Photo Exif'),
|
__('Entry Photo Exif'),
|
||||||
array('entryPhotoExifWidget','getWidget'),
|
array('entryPhotoExifWidget', 'getWidget'),
|
||||||
null,
|
null,
|
||||||
__('Show images exif of an entry')
|
__('Show images exif of an entry')
|
||||||
);
|
);
|
||||||
|
@ -65,85 +61,85 @@ class entryPhotoExifWidget
|
||||||
);
|
);
|
||||||
$w->epew->setting(
|
$w->epew->setting(
|
||||||
'showmeta_Title',
|
'showmeta_Title',
|
||||||
sprintf(__('Show metadata: %s'),__('Title')),
|
sprintf(__('Show metadata: %s'), __('Title')),
|
||||||
0,
|
0,
|
||||||
'check'
|
'check'
|
||||||
);
|
);
|
||||||
$w->epew->setting(
|
$w->epew->setting(
|
||||||
'showmeta_Description',
|
'showmeta_Description',
|
||||||
sprintf(__('Show metadata: %s'),__('Descritpion')),
|
sprintf(__('Show metadata: %s'), __('Descritpion')),
|
||||||
0,
|
0,
|
||||||
'check'
|
'check'
|
||||||
);
|
);
|
||||||
$w->epew->setting(
|
$w->epew->setting(
|
||||||
'showmeta_Location',
|
'showmeta_Location',
|
||||||
sprintf(__('Show metadata: %s'),__('Location')),
|
sprintf(__('Show metadata: %s'), __('Location')),
|
||||||
0,
|
0,
|
||||||
'check'
|
'check'
|
||||||
);
|
);
|
||||||
$w->epew->setting(
|
$w->epew->setting(
|
||||||
'showmeta_DateTimeOriginal',
|
'showmeta_DateTimeOriginal',
|
||||||
sprintf(__('Show metadata: %s'),__('Date')),
|
sprintf(__('Show metadata: %s'), __('Date')),
|
||||||
0,
|
0,
|
||||||
'check'
|
'check'
|
||||||
);
|
);
|
||||||
$w->epew->setting(
|
$w->epew->setting(
|
||||||
'showmeta_Make',
|
'showmeta_Make',
|
||||||
sprintf(__('Show metadata: %s'),__('Manufacturer')),
|
sprintf(__('Show metadata: %s'), __('Manufacturer')),
|
||||||
0,
|
0,
|
||||||
'check'
|
'check'
|
||||||
);
|
);
|
||||||
$w->epew->setting(
|
$w->epew->setting(
|
||||||
'showmeta_Model',
|
'showmeta_Model',
|
||||||
sprintf(__('Show metadata: %s'),__('Model')),
|
sprintf(__('Show metadata: %s'), __('Model')),
|
||||||
1,
|
1,
|
||||||
'check'
|
'check'
|
||||||
);
|
);
|
||||||
$w->epew->setting(
|
$w->epew->setting(
|
||||||
'showmeta_Lens',
|
'showmeta_Lens',
|
||||||
sprintf(__('Show metadata: %s'),__('Lens')),
|
sprintf(__('Show metadata: %s'), __('Lens')),
|
||||||
1,
|
1,
|
||||||
'check'
|
'check'
|
||||||
);
|
);
|
||||||
$w->epew->setting(
|
$w->epew->setting(
|
||||||
'showmeta_ExposureProgram',
|
'showmeta_ExposureProgram',
|
||||||
sprintf(__('Show metadata: %s'),__('Exposure program')),
|
sprintf(__('Show metadata: %s'), __('Exposure program')),
|
||||||
0,
|
0,
|
||||||
'check'
|
'check'
|
||||||
);
|
);
|
||||||
$w->epew->setting(
|
$w->epew->setting(
|
||||||
'showmeta_Exposure',
|
'showmeta_Exposure',
|
||||||
sprintf(__('Show metadata: %s'),__('Exposure time')),
|
sprintf(__('Show metadata: %s'), __('Exposure time')),
|
||||||
1,
|
1,
|
||||||
'check'
|
'check'
|
||||||
);
|
);
|
||||||
$w->epew->setting(
|
$w->epew->setting(
|
||||||
'showmeta_FNumber',
|
'showmeta_FNumber',
|
||||||
sprintf(__('Show metadata: %s'),__('Aperture')),
|
sprintf(__('Show metadata: %s'), __('Aperture')),
|
||||||
1,
|
1,
|
||||||
'check'
|
'check'
|
||||||
);
|
);
|
||||||
$w->epew->setting(
|
$w->epew->setting(
|
||||||
'showmeta_ISOSpeedRatings',
|
'showmeta_ISOSpeedRatings',
|
||||||
sprintf(__('Show metadata: %s'),__('Iso speed rating')),
|
sprintf(__('Show metadata: %s'), __('Iso speed rating')),
|
||||||
1,
|
1,
|
||||||
'check'
|
'check'
|
||||||
);
|
);
|
||||||
$w->epew->setting(
|
$w->epew->setting(
|
||||||
'showmeta_FocalLength',
|
'showmeta_FocalLength',
|
||||||
sprintf(__('Show metadata: %s'),__('Focal lengh')),
|
sprintf(__('Show metadata: %s'), __('Focal lengh')),
|
||||||
1,
|
1,
|
||||||
'check'
|
'check'
|
||||||
);
|
);
|
||||||
$w->epew->setting(
|
$w->epew->setting(
|
||||||
'showmeta_ExposureBiasValue',
|
'showmeta_ExposureBiasValue',
|
||||||
sprintf(__('Show metadata: %s'),__('Exposure bias value')),
|
sprintf(__('Show metadata: %s'), __('Exposure bias value')),
|
||||||
0,
|
0,
|
||||||
'check'
|
'check'
|
||||||
);
|
);
|
||||||
$w->epew->setting(
|
$w->epew->setting(
|
||||||
'showmeta_MeteringMode',
|
'showmeta_MeteringMode',
|
||||||
sprintf(__('Show metadata: %s'),__('Metering mode')),
|
sprintf(__('Show metadata: %s'), __('Metering mode')),
|
||||||
0,
|
0,
|
||||||
'check'
|
'check'
|
||||||
);
|
);
|
||||||
|
@ -203,7 +199,7 @@ class entryPhotoExifWidget
|
||||||
}
|
}
|
||||||
|
|
||||||
# Not supported post type
|
# Not supported post type
|
||||||
if (!in_array($_ctx->posts->post_type,self::$supported_post_type))
|
if (!in_array($_ctx->posts->post_type, self::$supported_post_type))
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -216,10 +212,10 @@ class entryPhotoExifWidget
|
||||||
}
|
}
|
||||||
|
|
||||||
# Content lookup
|
# Content lookup
|
||||||
$text = $_ctx->posts->post_excerpt_xhtml.$_ctx->posts->post_content_xhtml;
|
$text = $_ctx->posts->post_excerpt_xhtml . $_ctx->posts->post_content_xhtml;
|
||||||
|
|
||||||
# Find source images
|
# Find source images
|
||||||
$images = self::getImageSource($core,$text,$w->thumbsize);
|
$images = self::getImageSource($core, $text, $w->thumbsize);
|
||||||
|
|
||||||
# No images
|
# No images
|
||||||
if (empty($images))
|
if (empty($images))
|
||||||
|
@ -233,17 +229,17 @@ class entryPhotoExifWidget
|
||||||
foreach($images as $img)
|
foreach($images as $img)
|
||||||
{
|
{
|
||||||
# List metas
|
# List metas
|
||||||
$metas = self::getImageMeta($core,$img['source']);
|
$metas = self::getImageMeta($core, $img['source']);
|
||||||
|
|
||||||
$content = '';
|
$content = '';
|
||||||
foreach($metas as $k => $v)
|
foreach($metas as $k => $v)
|
||||||
{
|
{
|
||||||
# Don't show unwanted metadata or empty metadata
|
# Don't show unwanted metadata or empty metadata
|
||||||
if (!$w->__get('showmeta_'.$k) || !$w->showmeta && empty($v[1]))
|
if (!$w->__get('showmeta_' . $k) || !$w->showmeta && empty($v[1]))
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$content .= sprintf(self::$widget_text,$k,$v[0],$v[1]);
|
$content .= sprintf(self::$widget_text, $k, $v[0], $v[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
# No meta
|
# No meta
|
||||||
|
@ -255,7 +251,7 @@ class entryPhotoExifWidget
|
||||||
# Thumbnail
|
# Thumbnail
|
||||||
if ($img['thumb'])
|
if ($img['thumb'])
|
||||||
{
|
{
|
||||||
$content = sprintf(self::$widget_thumb,$img['title'],$img['thumb']).
|
$content = sprintf(self::$widget_thumb, $img['title'], $img['thumb']).
|
||||||
$content;
|
$content;
|
||||||
}
|
}
|
||||||
$contents .= $content;
|
$contents .= $content;
|
||||||
|
@ -270,32 +266,32 @@ class entryPhotoExifWidget
|
||||||
# Paste widget
|
# Paste widget
|
||||||
return $w->renderDiv(
|
return $w->renderDiv(
|
||||||
$w->content_only,
|
$w->content_only,
|
||||||
'photoExifWidget '.$w->class,
|
'photoExifWidget ' . $w->class,
|
||||||
'',
|
'',
|
||||||
($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
|
($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
|
||||||
sprintf(self::$widget_content,$contents)
|
sprintf(self::$widget_content, $contents)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getImageSource($core,$subject,$size='')
|
public static function getImageSource($core, $subject, $size='')
|
||||||
{
|
{
|
||||||
# Path and url
|
# Path and url
|
||||||
$p_url = $core->blog->settings->system->public_url;
|
$p_url = $core->blog->settings->system->public_url;
|
||||||
$p_site = preg_replace('#^(.+?//.+?)/(.*)$#','$1',$core->blog->url);
|
$p_site = preg_replace('#^(.+?//.+?)/(.*)$#', '$1', $core->blog->url);
|
||||||
$p_root = $core->blog->public_path;
|
$p_root = $core->blog->public_path;
|
||||||
|
|
||||||
# Image pattern
|
# Image pattern
|
||||||
$pattern = '(?:'.preg_quote($p_site,'/').')?'.preg_quote($p_url,'/');
|
$pattern = '(?:' . preg_quote($p_site,'/') . ')?' . preg_quote($p_url, '/');
|
||||||
$pattern = sprintf('/<img.+?src="%s(.*?\.(?:jpg|jpeg|png|gif))"[^>]+/msu',$pattern);
|
$pattern = sprintf('/<img.+?src="%s(.*?\.(?:jpg|jpeg|png|gif))"[^>]+/msu', $pattern);
|
||||||
|
|
||||||
# No image
|
# No image
|
||||||
if (!preg_match_all($pattern,$subject,$m))
|
if (!preg_match_all($pattern, $subject, $m))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$res = $duplicate = array();
|
$res = $duplicate = array();
|
||||||
$allowed_ext = array('.jpg','.JPG','.jpeg','.JPEG','.png','.PNG','.gif','.GIF');
|
$allowed_ext = array('.jpg', '.JPG', '.jpeg', '.JPEG', '.png', '.PNG', '.gif', '.GIF');
|
||||||
|
|
||||||
# Loop through images
|
# Loop through images
|
||||||
foreach ($m[1] as $i => $img)
|
foreach ($m[1] as $i => $img)
|
||||||
|
@ -306,26 +302,26 @@ class entryPhotoExifWidget
|
||||||
$ext = $info['extension'];
|
$ext = $info['extension'];
|
||||||
|
|
||||||
# Not original
|
# Not original
|
||||||
if (preg_match('/^\.(.+)_(sq|t|s|m)$/',$base,$mbase))
|
if (preg_match('/^\.(.+)_(sq|t|s|m)$/', $base, $mbase))
|
||||||
{
|
{
|
||||||
$base = $mbase[1];
|
$base = $mbase[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
# Full path
|
# Full path
|
||||||
$f = $p_root.'/'.$info['dirname'].'/'.$base;
|
$f = $p_root . '/' . $info['dirname'] . '/' . $base;
|
||||||
|
|
||||||
# Find extension
|
# Find extension
|
||||||
foreach($allowed_ext as $end)
|
foreach($allowed_ext as $end)
|
||||||
{
|
{
|
||||||
if (file_exists($f.$end))
|
if (file_exists($f . $end))
|
||||||
{
|
{
|
||||||
$src = $f.$end;
|
$src = $f . $end;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# No file
|
# No file
|
||||||
if (!$src || in_array($src,$duplicate))
|
if (!$src || in_array($src, $duplicate))
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -336,15 +332,15 @@ class entryPhotoExifWidget
|
||||||
# Find thumbnail
|
# Find thumbnail
|
||||||
if (!empty($size))
|
if (!empty($size))
|
||||||
{
|
{
|
||||||
$t = $p_root.'/'.$info['dirname'].'/.'.$base.'_'.$size.'.jpg';
|
$t = $p_root . '/' . $info['dirname'] . '/.' . $base . '_' . $size . '.jpg';
|
||||||
if (file_exists($t))
|
if (file_exists($t))
|
||||||
{
|
{
|
||||||
$thb = $p_url.(dirname($img) != '/' ? dirname($img) : '').'/.'.$base.'_'.$size.'.jpg';
|
$thb = $p_url . (dirname($img) != '/' ? dirname($img) : '') . '/.' . $base . '_' . $size . '.jpg';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# Find image description
|
# Find image description
|
||||||
if (preg_match('/alt="([^"]+)"/',$m[0][$i],$malt))
|
if (preg_match('/alt="([^"]+)"/', $m[0][$i], $malt))
|
||||||
{
|
{
|
||||||
$alt = $malt[1];
|
$alt = $malt[1];
|
||||||
}
|
}
|
||||||
|
@ -359,23 +355,23 @@ class entryPhotoExifWidget
|
||||||
return $res;
|
return $res;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getImageMeta($core,$src)
|
public static function getImageMeta($core, $src)
|
||||||
{
|
{
|
||||||
$metas = array(
|
$metas = array(
|
||||||
'Title' => array(__('Title:'),''),
|
'Title' => array(__('Title:'), ''),
|
||||||
'Description' => array(__('Description:'),''),
|
'Description' => array(__('Description:'), ''),
|
||||||
'Location' => array(__('Location:'),''),
|
'Location' => array(__('Location:'), ''),
|
||||||
'DateTimeOriginal' => array(__('Date:'),''),
|
'DateTimeOriginal' => array(__('Date:'), ''),
|
||||||
'Make' => array(__('Manufacturer:'),''),
|
'Make' => array(__('Manufacturer:'), ''),
|
||||||
'Model' => array(__('Model:'),''),
|
'Model' => array(__('Model:'), ''),
|
||||||
'Lens' => array(__('Lens:'),''),
|
'Lens' => array(__('Lens:'), ''),
|
||||||
'ExposureProgram' => array(__('Program:'),''),
|
'ExposureProgram' => array(__('Program:'), ''),
|
||||||
'Exposure' => array(__('Speed:'),''),
|
'Exposure' => array(__('Speed:'), ''),
|
||||||
'FNumber' => array(__('Aperture:'),''),
|
'FNumber' => array(__('Aperture:'), ''),
|
||||||
'ISOSpeedRatings' => array(__('ISO:'),''),
|
'ISOSpeedRatings' => array(__('ISO:'), ''),
|
||||||
'FocalLength' => array(__('Focal:'),''),
|
'FocalLength' => array(__('Focal:'), ''),
|
||||||
'ExposureBiasValue' => array(__('Exposure Bias:'),''),
|
'ExposureBiasValue' => array(__('Exposure Bias:'), ''),
|
||||||
'MeteringMode' => array(__('Metering mode:'),'')
|
'MeteringMode' => array(__('Metering mode:'), '')
|
||||||
);
|
);
|
||||||
|
|
||||||
$exp_prog = array(
|
$exp_prog = array(
|
||||||
|
@ -437,9 +433,9 @@ class entryPhotoExifWidget
|
||||||
# DateTimeOriginal
|
# DateTimeOriginal
|
||||||
if (!empty($m['DateTimeOriginal']))
|
if (!empty($m['DateTimeOriginal']))
|
||||||
{
|
{
|
||||||
$dt_ft = $core->blog->settings->system->date_format.', '.$core->blog->settings->system->time_format;
|
$dt_ft = $core->blog->settings->system->date_format . ', ' . $core->blog->settings->system->time_format;
|
||||||
$dt_tz = $core->blog->settings->system->blog_timezone;
|
$dt_tz = $core->blog->settings->system->blog_timezone;
|
||||||
$metas['DateTimeOriginal'][1] = dt::dt2str($dt_ft,$m['DateTimeOriginal'],$dt_tz);
|
$metas['DateTimeOriginal'][1] = dt::dt2str($dt_ft, $m['DateTimeOriginal'], $dt_tz);
|
||||||
}
|
}
|
||||||
|
|
||||||
# Make
|
# Make
|
||||||
|
@ -470,14 +466,14 @@ class entryPhotoExifWidget
|
||||||
# Exposure
|
# Exposure
|
||||||
if (!empty($m['Exposure']))
|
if (!empty($m['Exposure']))
|
||||||
{
|
{
|
||||||
$metas['Exposure'][1] = $m['Exposure'].'s';
|
$metas['Exposure'][1] = $m['Exposure'] . 's';
|
||||||
}
|
}
|
||||||
|
|
||||||
# FNumber
|
# FNumber
|
||||||
if (!empty($m['FNumber']))
|
if (!empty($m['FNumber']))
|
||||||
{
|
{
|
||||||
$ap = sscanf($m['FNumber'],'%d/%d');
|
$ap = sscanf($m['FNumber'], '%d/%d');
|
||||||
$metas['FNumber'][1] = $ap ? 'f/'.( $ap[0] / $ap[1]) : $m['FNumber'];
|
$metas['FNumber'][1] = $ap ? 'f/' . ( $ap[0] / $ap[1]) : $m['FNumber'];
|
||||||
}
|
}
|
||||||
|
|
||||||
# ISOSpeedRatings
|
# ISOSpeedRatings
|
||||||
|
@ -489,8 +485,8 @@ class entryPhotoExifWidget
|
||||||
# FocalLength
|
# FocalLength
|
||||||
if (!empty($m['FocalLength']))
|
if (!empty($m['FocalLength']))
|
||||||
{
|
{
|
||||||
$fl = sscanf($m['FocalLength'],'%d/%d');
|
$fl = sscanf($m['FocalLength'], '%d/%d');
|
||||||
$metas['FocalLength'][1] = $fl ? $fl[0]/$fl[1].'mm' : $m['FocalLength'];
|
$metas['FocalLength'][1] = $fl ? $fl[0]/$fl[1] . 'mm' : $m['FocalLength'];
|
||||||
}
|
}
|
||||||
|
|
||||||
# ExposureBiasValue
|
# ExposureBiasValue
|
||||||
|
|
Loading…
Reference in New Issue