From df9bc84102b7bb5ee57ab07ccac816644057020f Mon Sep 17 00:00:00 2001 From: plegall Date: Tue, 13 Dec 2011 14:41:59 +0000 Subject: feature 2533 added: ability to deactivate uniqueness check on pwg.images.add git-svn-id: http://piwigo.org/svn/branches/2.3@12725 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/ws_functions.inc.php | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php index 3d5d823c3..dd3c79086 100644 --- a/include/ws_functions.inc.php +++ b/include/ws_functions.inc.php @@ -1634,24 +1634,27 @@ function ws_images_add($params, &$service) } // does the image already exists ? - if ('md5sum' == $conf['uniqueness_mode']) - { - $where_clause = "md5sum = '".$params['original_sum']."'"; - } - if ('filename' == $conf['uniqueness_mode']) + if ($params['check_uniqueness']) { - $where_clause = "file = '".$params['original_filename']."'"; - } + if ('md5sum' == $conf['uniqueness_mode']) + { + $where_clause = "md5sum = '".$params['original_sum']."'"; + } + if ('filename' == $conf['uniqueness_mode']) + { + $where_clause = "file = '".$params['original_filename']."'"; + } - $query = ' + $query = ' SELECT COUNT(*) AS counter FROM '.IMAGES_TABLE.' WHERE '.$where_clause.' ;'; - list($counter) = pwg_db_fetch_row(pwg_query($query)); - if ($counter != 0) { - return new PwgError(500, 'file already exists'); + list($counter) = pwg_db_fetch_row(pwg_query($query)); + if ($counter != 0) { + return new PwgError(500, 'file already exists'); + } } if ($params['resize']) -- cgit v1.2.3