adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-07 09:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Issue #1167 : Fixes and code cleaning

Browse Source
This commit is contained in:
Zacharie
2020-05-14 10:43:54 +02:00
committed by plegall
parent df46475e1b
commit c4b38d1a41
5 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ws_functions/pwg.groups.php
+8 -5
View File
@@ -214,8 +214,7 @@ SELECT COUNT(*)
mass_inserts(
USER_GROUP_TABLE,
array('group_id', 'user_id'),
$inserts,
array('ignore'=>true)
$inserts
);
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
@@ -246,6 +245,7 @@ function ws_groups_merge($params, &$service) {
$all_groups = array_unique($all_groups);
$merge_group = array_diff($params['merge_group_id'], array($params['destination_group_id']));
$merge_group_object = $service->invoke('pwg.groups.getList', array('group_id' => $params['merge_group_id']));
$query = '
SELECT COUNT(*)
@@ -266,7 +266,7 @@ SELECT COUNT(*)
SELECT DISTINCT(user_id)
FROM `'. USER_GROUP_TABLE .'`
WHERE
group_id in ('.implode(',', $merge_group) .')
group_id IN ('.implode(',', $merge_group) .')
;';
$user_in_merge_groups = query2array($query, null, 'user_id');
@@ -303,14 +303,17 @@ SELECT user_id
pwg_activity('group', $params['destination_group_id'], 'edit');
foreach ($user_to_add as $user_id)
{
pwg_activity('user', $user_id, 'edit');
pwg_activity('user', $user_id, 'edit', array("associated" => $params['destination_group_id']));
}
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
delete_groups($merge_group);
return $service->invoke('pwg.groups.getList', array('group_id' => $params['destination_group_id']));
return array(
"destination_group" => $service->invoke('pwg.groups.getList', array('group_id' => $params['destination_group_id'])),
"deleted_group" => $merge_group_object
);
}
/**