diff options
| -rw-r--r-- | admin/include/functions_upload.inc.php | 4 | ||||
| -rw-r--r-- | admin/site_update.php | 1 | ||||
| -rw-r--r-- | install/db/117-database.php | 65 |
3 files changed, 69 insertions, 1 deletions
diff --git a/admin/include/functions_upload.inc.php b/admin/include/functions_upload.inc.php index 648b8ddc6..2a5206c1b 100644 --- a/admin/include/functions_upload.inc.php +++ b/admin/include/functions_upload.inc.php @@ -296,8 +296,10 @@ SELECT else { // database registration + $file = pwg_db_real_escape_string(isset($original_filename) ? $original_filename : basename($file_path)); $insert = array( - 'file' => pwg_db_real_escape_string(isset($original_filename) ? $original_filename : basename($file_path)), + 'file' => $file, + 'name' => get_name_from_file($file), 'date_available' => $dbnow, 'path' => preg_replace('#^'.preg_quote(PHPWG_ROOT_PATH).'#', '', $file_path), 'filesize' => $file_infos['filesize'], diff --git a/admin/site_update.php b/admin/site_update.php index ef73e0104..2021ac984 100644 --- a/admin/site_update.php +++ b/admin/site_update.php @@ -410,6 +410,7 @@ SELECT id, path $insert = array( 'id' => $next_element_id++, 'file' => $filename, + 'name' => get_name_from_file($filename), 'date_available' => CURRENT_DATE, 'path' => $path, 'representative_ext' => $fs[$path]['representative_ext'], diff --git a/install/db/117-database.php b/install/db/117-database.php new file mode 100644 index 000000000..0551b44ae --- /dev/null +++ b/install/db/117-database.php @@ -0,0 +1,65 @@ +<?php +// +-----------------------------------------------------------------------+ +// | Piwigo - a PHP based photo gallery | +// +-----------------------------------------------------------------------+ +// | Copyright(C) 2008-2012 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 = 'fill empty images name with filename'; + +include_once(PHPWG_ROOT_PATH.'include/constants.php'); + +// +-----------------------------------------------------------------------+ +// | Upgrade content | +// +-----------------------------------------------------------------------+ + +$query = 'SELECT id, file FROM '.IMAGES_TABLE.' WHERE name IS NULL;'; +$images = pwg_query($query); + +$updates = array(); +while ($row = pwg_db_fetch_assoc($images)) +{ + $updates[] = array( + 'id' => $row['id'], + 'name' => get_name_from_file($row['file']), + ); +} + +mass_updates( + IMAGES_TABLE, + array( + 'primary' => array('id'), + 'update' => array('name'), + ), + $updates + ); + + +echo +"\n" +.'"'.$upgrade_description.'"'.' ended' +."\n" +; + +?> |