diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php index 4a459a52c6..468985f61d 100644 --- a/pandora_console/godmode/reporting/reporting_builder.list_items.php +++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php @@ -212,12 +212,6 @@ $table = null; $table->style[0] = 'text-align: right;'; -// Build link for sort actions: metaconsole and normal console -$variable_link = ui_get_full_url(false); -// Metaconsole -if ($config['metaconsole'] == 1 and defined('METACONSOLE')) - $variable_link .= '/enterprise/meta/'; - if ($items) { $table->width = '100%'; @@ -231,19 +225,19 @@ if ($items) { $table->head[0] = '' . __('P.') . ''; $table->head[1] = __('Type'); if (!$filterEnable) { - $table->head[1] .= ' ' . html_print_image("images/sort_up.png", true, array("title" => __('Ascendent'))) . '' . - '' . html_print_image("images/sort_down.png", true, array("title" => __('Descent'))) . ''; + $table->head[1] .= ' ' . html_print_image("images/sort_up.png", true, array("title" => __('Ascendent'))) . '' . + '' . html_print_image("images/sort_down.png", true, array("title" => __('Descent'))) . ''; } $table->head[2] = __('Agent'); if (!$filterEnable) { - $table->head[2] .= ' ' . html_print_image("images/sort_up.png", true, array("title" => __('Ascendent'))) . '' . - '' . html_print_image("images/sort_down.png", true, array("title" => __('Descent'))) . ''; + $table->head[2] .= ' ' . html_print_image("images/sort_up.png", true, array("title" => __('Ascendent'))) . '' . + '' . html_print_image("images/sort_down.png", true, array("title" => __('Descent'))) . ''; } $table->head[3] = __('Module'); if (!$filterEnable) { - $table->head[3] .= ' ' . html_print_image("images/sort_up.png", true, array("title" => __('Ascendent'))) . '' . - '' . html_print_image("images/sort_down.png", true, array("title" => __('Descent'))) . ''; + $table->head[3] .= ' ' . html_print_image("images/sort_up.png", true, array("title" => __('Ascendent'))) . '' . + '' . html_print_image("images/sort_down.png", true, array("title" => __('Descent'))) . ''; } $table->head[4] = __('Period'); $table->head[5] = __('Description'); @@ -341,9 +335,9 @@ foreach ($items as $item) { $row[6] = ''; - $row[6] .= '' . html_print_image("images/wrench_orange.png", true, array("title" => __('Edit'))) . ''; + $row[6] .= '' . html_print_image("images/wrench_orange.png", true, array("title" => __('Edit'))) . ''; $row[6] .= '  '; - $row[6] .= '' . html_print_image("images/cross.png", true, array("title" => __('Delete'))) .''; + $row[6] .= '' . html_print_image("images/cross.png", true, array("title" => __('Delete'))) .''; $row[6] .= html_print_checkbox_extended ('delete_multiple[]', $item['id_rc'], false, false, '', 'class="check_delete"', true); $row[7] = ''; @@ -358,11 +352,11 @@ foreach ($items as $item) { metaconsole_restore_db(); } } -ui_pagination ($countItems, $variable_link . 'index.php?sec=reporting&sec2=' . $config['homedir'] . '/godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report=' . $idReport . $urlFilter); +ui_pagination ($countItems, 'index.php?sec=reporting&sec2=' . $config['homedir'] . '/godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report=' . $idReport . $urlFilter); html_print_table($table); -ui_pagination ($countItems, $variable_link . 'index.php?sec=reporting&sec2=' . $config['homedir'] . '/godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report=' . $idReport . $urlFilter); +ui_pagination ($countItems, 'index.php?sec=reporting&sec2=' . $config['homedir'] . '/godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report=' . $idReport . $urlFilter); -echo "
"; echo "
"; html_print_input_hidden('ids_items_to_delete', ''); @@ -388,7 +382,7 @@ $table->data[1][2] = html_print_input_text_extended('position_to_sort', 1, $table->data[1][2] .= html_print_input_hidden('ids_items_to_sort', '', true); $table->data[1][3] = html_print_submit_button(__('Sort'), 'sort_submit', false, 'class="sub upd"', true); -echo ""; html_print_table($table); echo ""; @@ -411,7 +405,7 @@ $table->data[1][2] = html_print_input_text_extended('position_to_delete', 1, $table->data[1][2] .= html_print_input_hidden('ids_items_to_delete', '', true); $table->data[1][3] = html_print_submit_button(__('Delete'), 'delete_submit', false, 'class="sub upd"', true); -echo "
"; html_print_table($table); echo "
"; diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index f325a2d567..9e1392cc52 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -231,7 +231,7 @@ switch ($action) { case 'list': $buttons = array( 'list_reports' => array('active' => false, - 'text' => '' . + 'text' => '' . html_print_image("images/god6.png", true, array ("title" => __('Main'))) .'') ); @@ -255,7 +255,7 @@ switch ($action) { // Bread crumbs ui_meta_add_breadcrumb( array( - 'link' => 'index.php?sec=reporting&sec2=' . $config['homedir'] . '/godmode/reporting/reporting_builder', + 'link' => 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder', 'text' => __('Reporting'))); ui_meta_print_page_header($nav_bar); @@ -298,7 +298,7 @@ switch ($action) { $table_aux->data[0][6] = html_print_submit_button(__('Search'), 'search_submit', false, 'class="sub upd"', true); - echo "
"; html_print_table($table_aux); echo "
"; @@ -392,7 +392,7 @@ switch ($action) { $data = array (); if (check_acl ($config["id_user"], $report["id_group"], "AW")) { - $data[0] = ''.$report['name'].''; } else { @@ -402,7 +402,7 @@ switch ($action) { $data[1] = $report['description']; - $data[2] = '' . + $data[2] = '' . html_print_image("images/reporting.png", true) . ''; $data[3] = '' . html_print_image("images/database_lightning.png", true) . ''; //I chose ajax.php because it's supposed to give XML anyway @@ -443,7 +443,7 @@ switch ($action) { } if ($edit) { - $data[$next] = '
'; + $data[$next] = ''; $data[$next] .= html_print_input_hidden ('id_report', $report['id_report'], true); $data[$next] .= html_print_input_image ('edit', 'images/config.png', 1, '', true, array ('title' => __('Edit'))); $data[$next] .= '
'; @@ -468,7 +468,7 @@ switch ($action) { if (check_acl ($config['id_user'], 0, "IW")) { - echo '
'; + echo ''; echo '
'; html_print_submit_button (__('Create report'), 'create', false, 'class="sub next"'); echo "
"; @@ -1299,13 +1299,13 @@ if ($enterpriseEnable) { $buttons = array( 'main' => array('active' => false, - 'text' => '' . + 'text' => '' . html_print_image("images/reporting_edit.png", true, array ("title" => __('Main'))) .''), 'list_items' => array('active' => false, - 'text' => '' . + 'text' => '' . html_print_image("images/god6.png", true, array ("title" => __('List items'))) .''), 'item_editor' => array('active' => false, - 'text' => '' . + 'text' => '' . html_print_image("images/config.png", true, array ("title" => __('Item editor'))) .'') ); @@ -1314,7 +1314,7 @@ if ($enterpriseEnable) { } $buttons['view'] = array('active' => false, - 'text' => '' . + 'text' => '' . html_print_image("images/reporting.png", true, array ("title" => __('View report'))) .''); $buttons[$activeTab]['active'] = true; @@ -1333,7 +1333,7 @@ else { // Page header for metaconsole if ($enterpriseEnable and defined('METACONSOLE')) { // Bread crumbs - ui_meta_add_breadcrumb(array('link' => 'index.php?sec=reporting&sec2=' . $config['homedir'] . '/godmode/reporting/reporting_builder', 'text' => __('Reporting'))); + ui_meta_add_breadcrumb(array('link' => 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder', 'text' => __('Reporting'))); ui_meta_print_page_header($nav_bar); diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index 5108987d01..369b20677c 100644 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -67,13 +67,10 @@ $enable_init_date = get_parameter('enable_init_date', 0); // Build link for sort actions: metaconsole and normal console $variable_link = ui_get_full_url(false); -// Metaconsole -if ($config['metaconsole'] == 1 and defined('METACONSOLE')) - $variable_link .= '/enterprise/meta/'; -$url = $variable_link . "index.php?sec=reporting&sec2=" . $config['homedir'] . "/operation/reporting/reporting_viewer&id=$id_report&date=$date&time=$time"; +$url = $variable_link . "index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id=$id_report&date=$date&time=$time"; -$options['setup'] = "" +$options['setup'] = "" . html_print_image ("images/setup.png", true, array ("title" => __('Setup'))) . ""; @@ -91,7 +88,7 @@ else { // Page header for metaconsole if ($config['metaconsole'] == 1 and defined('METACONSOLE')) { // Bread crumbs - ui_meta_add_breadcrumb(array('link' => 'index.php?sec=reporting&sec2=' . $config['homedir'] . '/godmode/reporting/reporting_builder', 'text' => __('Reporting'))); + ui_meta_add_breadcrumb(array('link' => 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder', 'text' => __('Reporting'))); ui_meta_print_page_header($nav_bar);