diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions_user.inc.php | 10 | ||||
| -rw-r--r-- | include/ws_functions.inc.php | 47 |
2 files changed, 22 insertions, 35 deletions
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index a5d57daeb..6dc04b7b6 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -186,7 +186,7 @@ SELECT MAX('.$conf['user_fields']['id'].') + 1 $conf['user_fields']['email'] => $mail_address ); - mass_inserts(USERS_TABLE, array_keys($insert), array($insert)); + single_insert(USERS_TABLE, $insert); // Assign by default groups { @@ -435,14 +435,12 @@ DELETE FROM '.USER_CACHE_CATEGORIES_TABLE.' // Due to concurrency issues, we ask MySQL to ignore errors on // insert. This may happen when cache needs refresh and that Piwigo is // called "very simultaneously". - mass_inserts - ( + mass_inserts( USER_CACHE_CATEGORIES_TABLE, - array - ( + array( 'user_id', 'cat_id', 'date_last', 'max_date_last', 'nb_images', 'count_images', 'nb_categories', 'count_categories' - ), + ), $user_cache_cats, array('ignore' => true) ); diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php index 4d8a40af8..eb0399f2d 100644 --- a/include/ws_functions.inc.php +++ b/include/ws_functions.inc.php @@ -405,8 +405,11 @@ SELECT id } if (count($datas)) { - include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); - mass_inserts(CADDIE_TABLE, array('element_id','user_id'), $datas); + mass_inserts( + CADDIE_TABLE, + array('element_id','user_id'), + $datas + ); } return count($datas); } @@ -1726,8 +1729,6 @@ function ws_images_add($params, $service) $params['image_id'] = (int)$params['image_id']; if ($params['image_id'] > 0) { - include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); - $query=' SELECT * FROM '.IMAGES_TABLE.' @@ -1884,8 +1885,6 @@ function ws_images_addSimple($params, $service) $params['image_id'] = (int)$params['image_id']; if ($params['image_id'] > 0) { - include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); - $query=' SELECT * FROM '.IMAGES_TABLE.' @@ -1935,21 +1934,19 @@ SELECT * if (count(array_keys($update)) > 0) { $update['id'] = $image_id; - - include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); - mass_updates( + + single_update( IMAGES_TABLE, - array( - 'primary' => array('id'), - 'update' => array_diff(array_keys($update), array('id')) - ), - array($update) + $update, + array('id', $update['id']) ); } if (isset($params['tags']) and !empty($params['tags'])) { + include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); + $tag_ids = array(); if (is_array($params['tags'])) { @@ -2564,13 +2561,10 @@ SELECT * { $update['id'] = $params['image_id']; - mass_updates( + single_update( IMAGES_TABLE, - array( - 'primary' => array('id'), - 'update' => array_diff(array_keys($update), array('id')) - ), - array($update) + $update, + array('id', $update['id']) ); } @@ -2805,13 +2799,13 @@ SELECT ); } - include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); mass_inserts( IMAGE_CATEGORY_TABLE, array_keys($inserts[0]), $inserts ); + include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); update_category($new_cat_ids); } @@ -2860,17 +2854,12 @@ function ws_categories_setInfo($params, $service) if ($perform_update) { - include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); - mass_updates( + single_update( CATEGORIES_TABLE, - array( - 'primary' => array('id'), - 'update' => array_diff(array_keys($update), array('id')) - ), - array($update) + $update, + array('id', $update['id']) ); } - } function ws_categories_setRepresentative($params, $service) |