mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-27 15:54:29 +02:00
Merge branch '3373-Añadir-opcion-a-mas-parametros-en-api_get_groups' into 'develop'
ent-3373-Añadir-opcion-a-mas-parametros-en-api_get_groups See merge request artica/pandorafms!2127 Former-commit-id: a614183a0f077c8fb88c5b3eb5e52aa3c31e8e23
This commit is contained in:
commit
28472ddc7d
@ -363,31 +363,26 @@ function api_get_test_event_replication_db()
|
||||
// -------------------------DEFINED OPERATIONS FUNCTIONS-----------------
|
||||
function api_get_groups($thrash1, $thrash2, $other, $returnType, $user_in_db)
|
||||
{
|
||||
if (defined('METACONSOLE')) {
|
||||
return;
|
||||
}
|
||||
$returnAllGroup = true;
|
||||
$returnAllColumns = false;
|
||||
|
||||
if ($other['type'] == 'string') {
|
||||
if ($other['data'] != '') {
|
||||
returnError('error_parameter', 'Error in the parameters.');
|
||||
return;
|
||||
} else {
|
||||
// Default values
|
||||
$separator = ';';
|
||||
}
|
||||
} else if ($other['type'] == 'array') {
|
||||
$separator = $other['data'][0];
|
||||
}
|
||||
if (isset($other['data'][1]))
|
||||
$returnAllGroup = ( $other['data'][1] == '1' ? true : false);
|
||||
|
||||
if (isset($other['data'][2]))
|
||||
$returnAllColumns = ( $other['data'][2] == '1' ? true : false);
|
||||
|
||||
$groups = users_get_groups($user_in_db, 'IR');
|
||||
$groups = users_get_groups ($user_in_db, "IR", $returnAllGroup, $returnAllColumns);
|
||||
|
||||
$data_groups = [];
|
||||
foreach ($groups as $id => $group) {
|
||||
$data_groups[] = [
|
||||
$id,
|
||||
$group,
|
||||
];
|
||||
}
|
||||
$data_groups = array();
|
||||
foreach ($groups as $id => $group) {
|
||||
$data_groups[] = array($id, $group);
|
||||
}
|
||||
|
||||
if (!isset($other['data'][0]))
|
||||
$separator = ';'; // by default
|
||||
else
|
||||
$separator = $other['data'][0];
|
||||
|
||||
$data['type'] = 'array';
|
||||
$data['data'] = $data_groups;
|
||||
|
Loading…
x
Reference in New Issue
Block a user