"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "aggregate_graphs.php" between
cacti-1.2.21.tar.gz and cacti-1.2.22.tar.gz

About: Cacti is a complete network graphing solution designed to harness the power of RRDTool’s data storage and graphing functionality.

aggregate_graphs.php  (cacti-1.2.21):aggregate_graphs.php  (cacti-1.2.22)
skipping to change at line 399 skipping to change at line 399
<p>" . __('In order to migrate th e Aggregate Graphs below to a Template based Aggregate, they must only be using one Graph Template. Please press \'Return\' and then select only Aggregate Grap h that utilize the same Graph Template.') . "</p> <p>" . __('In order to migrate th e Aggregate Graphs below to a Template based Aggregate, they must only be using one Graph Template. Please press \'Return\' and then select only Aggregate Grap h that utilize the same Graph Template.') . "</p>
<div class='itemlist'><ul>$graph_ list</ul></div> <div class='itemlist'><ul>$graph_ list</ul></div>
</td> </td>
</tr>"; </tr>";
$save_html = "<input type='button' class='ui-butt on ui-corner-all ui-widget' value='" . __esc('Return') . "' onClick='cactiReturn To()'>"; $save_html = "<input type='button' class='ui-butt on ui-corner-all ui-widget' value='" . __esc('Return') . "' onClick='cactiReturn To()'>";
} elseif (cacti_sizeof($graph_templates) == 0) { } elseif (cacti_sizeof($graph_templates) == 0) {
print "<tr> print "<tr>
<td class='textArea'> <td class='textArea'>
<p>" . __('The selected Aggregate Graphs does not appear to have any matching Aggregate Templates.') . "</p> <p>" . __('The selected Aggregate Graphs does not appear to have any matching Aggregate Templates.') . "</p>
<p>" . __('In order to migrate th e Aggregate Graphs below use an Aggregate Template, one must already exist. Ple ase press \'Return\' and then first create your Aggergate Template before retryi ng.') . "</p> <p>" . __('In order to migrate th e Aggregate Graphs below use an Aggregate Template, one must already exist. Ple ase press \'Return\' and then first create your Aggregate Template before retryi ng.') . "</p>
<div class='itemlist'><ul>$graph_ list</ul></div> <div class='itemlist'><ul>$graph_ list</ul></div>
</td> </td>
</tr>"; </tr>";
} else { } else {
$graph_template = $graph_templates[0]['graph_temp late_id']; $graph_template = $graph_templates[0]['graph_temp late_id'];
$aggregate_templates = db_fetch_assoc_prepared('S ELECT id, name $aggregate_templates = db_fetch_assoc_prepared('S ELECT id, name
FROM aggregate_graph_templates FROM aggregate_graph_templates
WHERE graph_template_id = ? WHERE graph_template_id = ?
ORDER BY name', ORDER BY name',
skipping to change at line 490 skipping to change at line 490
print '<tr><td>' . __('Align') . '<br>'; print '<tr><td>' . __('Align') . '<br>';
form_dropdown('align',$alignment, '', '', '', '', REPORTS_ALIGN_CENTER); form_dropdown('align',$alignment, '', '', '', '', REPORTS_ALIGN_CENTER);
print "</td></tr>"; print "</td></tr>";
$save_html = "<input type='button' class='ui-butt on ui-corner-all ui-widget' value='" . __esc('Cancel') . "' onClick='cactiReturn To()'>&nbsp;<input type='submit' class='ui-button ui-corner-all ui-widget' value ='" . __esc('Continue') . "' title='" . __esc('Add Graphs to Report') . "'>"; $save_html = "<input type='button' class='ui-butt on ui-corner-all ui-widget' value='" . __esc('Cancel') . "' onClick='cactiReturn To()'>&nbsp;<input type='submit' class='ui-button ui-corner-all ui-widget' value ='" . __esc('Continue') . "' title='" . __esc('Add Graphs to Report') . "'>";
} else { } else {
print "<tr><td class='even'><span class='textErro r'>" . __('You currently have no reports defined.') . "</span></td></tr>"; print "<tr><td class='even'><span class='textErro r'>" . __('You currently have no reports defined.') . "</span></td></tr>";
$save_html = "<input type='button' class='ui-butt on ui-corner-all ui-widget' value='" . __esc('Return') . "' onClick='cactiReturn To()'>"; $save_html = "<input type='button' class='ui-butt on ui-corner-all ui-widget' value='" . __esc('Return') . "' onClick='cactiReturn To()'>";
} }
} elseif (get_request_var('drp_action') == '5') { // conver to a normal graph } elseif (get_request_var('drp_action') == '5') { // convert to a normal graph
print "<tr> print "<tr>
<td colspan='2' class='textArea'> <td colspan='2' class='textArea'>
<p>" . __('Click \'Continue\' to convert the following Aggregate Graph(s) into a normal Graph.') . "</p> <p>" . __('Click \'Continue\' to convert the following Aggregate Graph(s) into a normal Graph.') . "</p>
<div class='itemlist'><ul>$graph_list</ul ></div> <div class='itemlist'><ul>$graph_list</ul ></div>
</td> </td>
</tr>"; </tr>";
$save_html = "<input type='button' class='ui-button ui-co rner-all ui-widget' value='" . __esc('Cancel') . "' onClick='cactiReturnTo()'>&n bsp;<input type='submit' class='ui-button ui-corner-all ui-widget' value='" . __ esc('Continue') . "' title='" . __esc('Convert to normal Graph(s)') . "'>"; $save_html = "<input type='button' class='ui-button ui-co rner-all ui-widget' value='" . __esc('Cancel') . "' onClick='cactiReturnTo()'>&n bsp;<input type='submit' class='ui-button ui-corner-all ui-widget' value='" . __ esc('Continue') . "' title='" . __esc('Convert to normal Graph(s)') . "'>";
} elseif (get_request_var('drp_action') == '10') { // associate w ith aggregate } elseif (get_request_var('drp_action') == '10') { // associate w ith aggregate
print "<tr> print "<tr>
skipping to change at line 774 skipping to change at line 774
} }
if (!isempty_request_var('id') && $current_tab == 'preview') { if (!isempty_request_var('id') && $current_tab == 'preview') {
$graph = db_fetch_row_prepared('SELECT * $graph = db_fetch_row_prepared('SELECT *
FROM graph_local FROM graph_local
WHERE id = ?', WHERE id = ?',
array(get_request_var('id'))); array(get_request_var('id')));
if (!cacti_sizeof($graph)) { if (!cacti_sizeof($graph)) {
html_start_box(__('Aggregate Preview Does Not Exist'), '1 00%', '', '3', 'center', ''); html_start_box(__('Aggregate Preview Does Not Exist'), '1 00%', '', '3', 'center', '');
print "<tr><td id='imagewindow' class='center'>" . __('Ag greage Graph does not Exist') . '</tr></tr>'; print "<tr><td id='imagewindow' class='center'>" . __('Ag gregate Graph does not Exist') . '</tr></tr>';
html_end_box(false); html_end_box(false);
raise_message('noaggregate', __('Aggregate Graph does not Exist'), MESSAGE_LEVEL_ERROR); raise_message('noaggregate', __('Aggregate Graph does not Exist'), MESSAGE_LEVEL_ERROR);
return false; return false;
} }
html_start_box(__('Aggregate Preview %s', $header_label), '100%', '', '3', 'center', ''); html_start_box(__('Aggregate Preview %s', $header_label), '100%', '', '3', 'center', '');
?> ?>
<tr><td id='imagewindow' class='center'> <tr><td id='imagewindow' class='center'>
<img src='<?php print html_escape($config['url_path'] . ' graph_image.php?action=edit&disable_cache=1&local_graph_id=' . get_request_var(' id') . '&rra_id=' . read_user_setting('default_rra_id') . '&random=' . mt_rand() );?>' alt=''> <img src='<?php print html_escape($config['url_path'] . ' graph_image.php?action=edit&disable_cache=1&local_graph_id=' . get_request_var(' id') . '&rra_id=' . read_user_setting('default_rra_id') . '&random=' . mt_rand() );?>' alt=''>
<script type='text/javascript'> <script type='text/javascript'>
skipping to change at line 825 skipping to change at line 825
} }
if (!isempty_request_var('id') && $current_tab == 'items') { if (!isempty_request_var('id') && $current_tab == 'items') {
aggregate_items(); aggregate_items();
bottom_footer(); bottom_footer();
exit; exit;
} }
form_start('aggregate_graphs.php', 'template_edit'); form_start('aggregate_graphs.php', 'template_edit');
/* we will show the templated representation only when when there is a te mplate and propagation is enabled */ /* we will show the templated representation only when there is a templat e and propagation is enabled */
if (!isempty_request_var('id') && $current_tab == 'details') { if (!isempty_request_var('id') && $current_tab == 'details') {
if (cacti_sizeof($template)) { if (cacti_sizeof($template)) {
print "<div id='templated'>"; print "<div id='templated'>";
html_start_box(__('Aggregate Graph %s', $header_label), ' 100%', true, '3', 'center', ''); html_start_box(__('Aggregate Graph %s', $header_label), ' 100%', true, '3', 'center', '');
$helper_string = '|host_description|'; $helper_string = '|host_description|';
if (isset($template)) { if (isset($template)) {
$data_query = db_fetch_cell_prepared('SELECT snmp _query_id $data_query = db_fetch_cell_prepared('SELECT snmp _query_id
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)