diff options
| -rw-r--r-- | include/ws_functions.inc.php | 25 | ||||
| -rw-r--r-- | ws.php | 1 |
2 files changed, 15 insertions, 11 deletions
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']) @@ -241,6 +241,7 @@ function ws_addDefaultMethods( $arr ) 'maxValue' => $conf['available_permission_levels'] ), 'resize' => array('default' => false), + 'check_uniqueness' => array('default' => true), ), 'POST method only. <br><b>categories</b> is a string list "category_id[,rank];category_id[,rank]" The rank is optional and is equivalent to "auto" if not given.' |