tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the massive operations in plugins. TICKET: #3221

This commit is contained in:
mdtrooper 2016-01-22 12:25:05 +01:00 committed by Hirofumi Kosaka
parent a63cf974ad
commit 02734c3b11
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/godmode/massive/massive_edit_plugins.php
View File

@ -163,7 +163,8 @@ if ($update) {
'id_agente' => $agent_ids, 'id_agente' => $agent_ids,
'nombre' => $module_names 'nombre' => $module_names
); );
$module_plugin_macros = db_get_all_rows_filter('tagente_modulo', $filter, $fields); $module_plugin_macros = db_get_all_rows_filter(
'tagente_modulo', $filter, $fields);
if (empty($module_plugin_macros)) $module_plugin_macros = array(); if (empty($module_plugin_macros)) $module_plugin_macros = array();
// Error // Error
@ -182,12 +183,16 @@ if ($update) {
// Macros retrieved from the agent module // Macros retrieved from the agent module
$module_macros = json_decode($module_macros_str, true); $module_macros = json_decode($module_macros_str, true);
// Error // Error
if (empty($module_macros)) if (empty($module_macros))
throw new Exception(__('Error retrieving the module plugin macros data')); throw new Exception(
__('Error retrieving the module plugin macros data'));
// Get the new module plugin macros // Get the new module plugin macros
$result_macros = array_map(function ($item) use ($macros, $module_macros) { $result_macros = array_map(
function ($item) use ($macros, $module_macros) {
$result = array( $result = array(
'macro' => $item['macro'], 'macro' => $item['macro'],
@ -218,7 +223,9 @@ if ($update) {
if (empty($result_macros)) if (empty($result_macros))
throw new Exception(__('Error building the new macros')); throw new Exception(__('Error building the new macros'));
$module_macros = json_encode($result_macros);
$module_macros = json_encode($result_macros, JSON_FORCE_OBJECT);
if (empty($module_macros)) { if (empty($module_macros)) {
$module_macros = $module_macros_str; $module_macros = $module_macros_str;
} }