Skip to content
Permalink
Browse files

bug 270 fixed: (yes "270", submitted in 2006), time (hour:minute:seco…

…nd) added

in the date_creation field and in the synchronization from EXIF metadata.


git-svn-id: http://piwigo.org/svn/trunk@9073 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
plegall committed Feb 3, 2011
1 parent 34538ef commit 1dc5c7ccfdba5f6177eeb7b9a5d10e9135ffabe8
Showing with 53 additions and 3 deletions.
  1. +5 −1 admin/include/functions_metadata.php
  2. +46 −0 install/db/96-database.php
  3. +1 −1 install/piwigo_structure-mysql.sql
  4. +1 −1 picture.php
@@ -89,7 +89,11 @@ function get_sync_exif_data($file)
{
if (in_array($pwg_key, array('date_creation', 'date_available')))
{
if (preg_match('/^(\d{4}).(\d{2}).(\d{2})/', $value, $matches))
if (preg_match('/^(\d{4}).(\d{2}).(\d{2}) (\d{2}).(\d{2}).(\d{2})/', $value, $matches))
{
$exif[$pwg_key] = $matches[1].'-'.$matches[2].'-'.$matches[3].' '.$matches[4].':'.$matches[5].':'.$matches[6];
}
elseif (preg_match('/^(\d{4}).(\d{2}).(\d{2})/', $value, $matches))
{
$exif[$pwg_key] = $matches[1].'-'.$matches[2].'-'.$matches[3];
}
@@ -0,0 +1,46 @@
<?php
// +-----------------------------------------------------------------------+
// | Piwigo - a PHP based photo gallery |
// +-----------------------------------------------------------------------+
// | Copyright(C) 2008-2011 Piwigo Team http://piwigo.org |
// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
// +-----------------------------------------------------------------------+
// | This program is free software; you can redistribute it and/or modify |
// | it under the terms of the GNU General Public License as published by |
// | the Free Software Foundation |
// | |
// | This program is distributed in the hope that it will be useful, but |
// | WITHOUT ANY WARRANTY; without even the implied warranty of |
// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
// | General Public License for more details. |
// | |
// | You should have received a copy of the GNU General Public License |
// | along with this program; if not, write to the Free Software |
// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
// | USA. |
// +-----------------------------------------------------------------------+

if (!defined('PHPWG_ROOT_PATH'))
{
die('Hacking attempt!');
}

$upgrade_description = 'add time in images.date_creation column';

// Only MySQL is concerned, other DB engines are already "timestamp"
if ('mysql' == $conf['dblayer'])
{
$query = '
ALTER TABLE '.IMAGES_TABLE.'
MODIFY date_creation datetime
;';
pwg_query($query);
}

echo
"\n"
. $upgrade_description
."\n"
;
?>
@@ -176,7 +176,7 @@ CREATE TABLE `piwigo_images` (
`id` mediumint(8) unsigned NOT NULL auto_increment,
`file` varchar(255) binary NOT NULL default '',
`date_available` datetime NOT NULL default '0000-00-00 00:00:00',
`date_creation` date default NULL,
`date_creation` datetime default NULL,
`tn_ext` varchar(4) default '',
`name` varchar(255) default NULL,
`comment` text,
@@ -859,7 +859,7 @@ function default_picture_content($content, $element_info)
'chronology_field'=>'created',
'chronology_style'=>'monthly',
'chronology_view'=>'list',
'chronology_date' => explode('-', $picture['current']['date_creation'])
'chronology_date' => explode('-', substr($picture['current']['date_creation'], 0, 10))
)
);
$infos['INFO_CREATION_DATE'] =

0 comments on commit 1dc5c7c

Please sign in to comment.
You can’t perform that action at this time.