From 7cf45f1b8c3580962bd13b7fabf9215206c39660 Mon Sep 17 00:00:00 2001 From: KIKUCHI Koichiro Date: Fri, 16 Jan 2015 18:38:17 +0900 Subject: [PATCH 1/4] Small cleanup to prepare for the next changes. --- .../include/functions_treeview.php | 9 +-- pandora_console/operation/tree.php | 63 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index 17f0ea5bfe..03c36ccfa8 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -527,23 +527,24 @@ function treeview_printTree($type) { $first = true; foreach ($list as $item) { $lessBranchs = 0; + $tree_img_id = "tree_image_" . $type . "_" . $item['_id_']; if ($first) { if ($item != end($list)) { - $img = html_print_image ("operation/tree/first_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image_" . $type . "_" . $item['_id_'], "pos_tree" => "0")); + $img = html_print_image ("operation/tree/first_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => $tree_image_id, "pos_tree" => "0")); $first = false; } else { $lessBranchs = 1; - $img = html_print_image ("operation/tree/one_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image_" . $type . "_" . $item['_id_'], "pos_tree" => "1")); + $img = html_print_image ("operation/tree/one_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => $tree_img_id, "pos_tree" => "1")); } } else { if ($item != end($list)) - $img = html_print_image ("operation/tree/closed.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image_" . $type . "_" . $item['_id_'], "pos_tree" => "2")); + $img = html_print_image ("operation/tree/closed.png", true, array ("style" => 'vertical-align: middle;', "id" => $tree_img_id, "pos_tree" => "2")); else { $lessBranchs = 1; - $img = html_print_image ("operation/tree/last_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image_" . $type . "_" . $item['_id_'], "pos_tree" => "3")); + $img = html_print_image ("operation/tree/last_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => $tree_img_id, "pos_tree" => "3")); } } diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index d941324600..5dba1169ad 100755 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -224,11 +224,12 @@ if (is_ajax ()) { } $less = $lessBranchs; + $tree_img_id = "tree_image" . $id . "_agent_" . $type . "_" . $row["id_agente"]; if ($count != $countRows) - $img = html_print_image ("operation/tree/closed.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image" . $id . "_agent_" . $type . "_" . $row["id_agente"], "pos_tree" => "2")); + $img = html_print_image ("operation/tree/closed.png", true, array ("style" => 'vertical-align: middle;', "id" => $tree_img_id, "pos_tree" => "2")); else { $less = $less + 2; // $less = $less or 0b10 - $img = html_print_image ("operation/tree/last_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => "tree_image" . $id . "_agent_" . $type . "_" . $row["id_agente"], "pos_tree" => "3")); + $img = html_print_image ("operation/tree/last_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => $tree_img_id, "pos_tree" => "3")); } echo "
  • "; echo ""); - $('#tree_div' + id_father + '_' + type + '_' + div_id) + $('#tree_div' + id) .show('normal'); - $('#tree_div'+id_father+'_'+type+'_'+div_id).attr('loadDiv', 2); + $('#tree_div'+id).attr('loadDiv', 2); $.ajax({ type: "POST", url: , @@ -739,9 +738,9 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri }, success: function(msg) { if (msg.length != 0) { - $('#tree_div'+id_father+'_'+type+'_'+div_id).hide(); - $('#tree_div'+id_father+'_'+type+'_'+div_id).html(msg); - $('#tree_div'+id_father+'_'+type+'_'+div_id).show('normal'); + $('#tree_div'+id).hide(); + $('#tree_div'+id).html(msg); + $('#tree_div'+id).show('normal'); //change image of tree [+] to [-] switch (pos) { case 0: - $('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src',icon_path+'/first_expanded.png'); + $('#tree_image'+id).attr('src',icon_path+'/first_expanded.png'); break; case 1: - $('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src',icon_path+'/one_expanded.png'); + $('#tree_image'+id).attr('src',icon_path+'/one_expanded.png'); break; case 2: - $('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src',icon_path+'/expanded.png'); + $('#tree_image'+id).attr('src',icon_path+'/expanded.png'); break; case 3: - $('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src',icon_path+'/last_expanded.png'); + $('#tree_image'+id).attr('src',icon_path+'/last_expanded.png'); break; } - $('#tree_div'+id_father+'_'+type+'_'+div_id).attr('hiddendiv',0); - $('#tree_div'+id_father+'_'+type+'_'+div_id).attr('loadDiv', 1); + $('#tree_div'+id).attr('hiddendiv',0); + $('#tree_div'+id).attr('loadDiv', 1); } // Refresh forced title callback to work with html code created dinamicly @@ -784,22 +783,22 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri } ?> if (hiddenDiv == 0) { - $('#tree_div'+id_father+'_'+type+'_'+div_id).hide('normal'); - $('#tree_div'+id_father+'_'+type+'_'+div_id).attr('hiddenDiv',1); + $('#tree_div'+id).hide('normal'); + $('#tree_div'+id).attr('hiddenDiv',1); //change image of tree [-] to [+] switch (pos) { case 0: - $('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src',icon_path+'/first_closed.png'); + $('#tree_image'+id).attr('src',icon_path+'/first_closed.png'); break; case 1: - $('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src',icon_path+'/one_closed.png'); + $('#tree_image'+id).attr('src',icon_path+'/one_closed.png'); break; case 2: - $('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src',icon_path+'/closed.png'); + $('#tree_image'+id).attr('src',icon_path+'/closed.png'); break; case 3: - $('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src',icon_path+'/last_closed.png'); + $('#tree_image'+id).attr('src',icon_path+'/last_closed.png'); break; } } @@ -807,21 +806,21 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri //change image of tree [+] to [-] switch (pos) { case 0: - $('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src',icon_path+'/first_expanded.png'); + $('#tree_image'+id).attr('src',icon_path+'/first_expanded.png'); break; case 1: - $('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src',icon_path+'/one_expanded.png'); + $('#tree_image'+id).attr('src',icon_path+'/one_expanded.png'); break; case 2: - $('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src',icon_path+'/expanded.png'); + $('#tree_image'+id).attr('src',icon_path+'/expanded.png'); break; case 3: - $('#tree_image'+id_father+'_'+type+'_'+div_id).attr('src',icon_path+'/last_expanded.png'); + $('#tree_image'+id).attr('src',icon_path+'/last_expanded.png'); break; } - $('#tree_div'+id_father+'_'+type+'_'+div_id).show('normal'); - $('#tree_div'+id_father+'_'+type+'_'+div_id).attr('hiddenDiv',0); + $('#tree_div'+id).show('normal'); + $('#tree_div'+id).attr('hiddenDiv',0); } } } From f5e6be1dba8c2c9ed4f6ca292342014abb316402 Mon Sep 17 00:00:00 2001 From: KIKUCHI Koichiro Date: Fri, 16 Jan 2015 18:40:24 +0900 Subject: [PATCH 2/4] Fixed typo --- pandora_console/include/functions_treeview.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index 03c36ccfa8..8bef86ed09 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -530,7 +530,7 @@ function treeview_printTree($type) { $tree_img_id = "tree_image_" . $type . "_" . $item['_id_']; if ($first) { if ($item != end($list)) { - $img = html_print_image ("operation/tree/first_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => $tree_image_id, "pos_tree" => "0")); + $img = html_print_image ("operation/tree/first_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => $tree_img_id, "pos_tree" => "0")); $first = false; } else { From 1cc9937422dd3b111bb45095f3f7bd64859c12a1 Mon Sep 17 00:00:00 2001 From: KIKUCHI Koichiro Date: Fri, 16 Jan 2015 19:12:45 +0900 Subject: [PATCH 3/4] Fixed the bug that tree view in meta console does not work properly. --- pandora_console/include/functions_treeview.php | 4 ++-- pandora_console/operation/tree.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index 8bef86ed09..d518a3a00c 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -527,7 +527,7 @@ function treeview_printTree($type) { $first = true; foreach ($list as $item) { $lessBranchs = 0; - $tree_img_id = "tree_image_" . $type . "_" . $item['_id_']; + $tree_img_id = "tree_image_" . $type . "__" . $item['_id_']; if ($first) { if ($item != end($list)) { $img = html_print_image ("operation/tree/first_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => $tree_img_id, "pos_tree" => "0")); @@ -581,7 +581,7 @@ function treeview_printTree($type) { echo ') '. ""; - echo "
    "; + echo "
    "; echo "
    • \n"; } echo "\n"; diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index 5dba1169ad..4c77a2021d 100755 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -224,7 +224,7 @@ if (is_ajax ()) { } $less = $lessBranchs; - $tree_img_id = "tree_image" . $id . "_agent_" . $type . "_" . $row["id_agente"]; + $tree_img_id = "tree_image" . $id . "_agent_" . $type . "_" . $row["server_name"] . "_" . $row["id_agente"]; if ($count != $countRows) $img = html_print_image ("operation/tree/closed.png", true, array ("style" => 'vertical-align: middle;', "id" => $tree_img_id, "pos_tree" => "2")); else { @@ -263,7 +263,7 @@ if (is_ajax ()) { html_print_image("images/dot_green.disabled.png", false, array("border" => '0', "title" => __('Quiet'), "alt" => "")); } echo ""; - echo "
    "; + echo "
    "; echo ""; } @@ -703,7 +703,7 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri * id_father int use in js and ajax php, its useful when you have a two subtrees with same agent for diferent each one */ function loadSubTree(type, div_id, less_branchs, id_father, server_name) { - var id = id_father + '_' + type + '_' + div_id; + var id = id_father + '_' + type + '_' + server_name + '_' + div_id; var hiddenDiv = $('#tree_div' + id).attr('hiddenDiv'); var loadDiv = $('#tree_div' + id).attr('loadDiv'); From a91cde0748f0caf8058e63eb51aee94e51d3fd7c Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Fri, 16 Jan 2015 13:00:49 +0100 Subject: [PATCH 4/4] Fixed the PHP warning with undefined var. TICKET: #1552 (cherry picked from commit 5a5abe8e5318383473657ec31b2e687cae19a598) --- pandora_console/extensions/resource_registration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php index 0a77928765..cdb8fa8e08 100644 --- a/pandora_console/extensions/resource_registration.php +++ b/pandora_console/extensions/resource_registration.php @@ -656,7 +656,7 @@ function process_upload_xml_component($xml) { $tcp_send = $snmp_version; $plugin_user = $auth_user; $plugin_pass = $auth_password; - $plugin_parameter = $auth_method; + $plugin_parameters = $auth_method; $custom_string_1 = $privacy_method; $custom_string_2 = $privacy_pass; $custom_string_3 = $security_level;