"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "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.

graphs.php  (cacti-1.2.21):graphs.php  (cacti-1.2.22)
skipping to change at line 675 skipping to change at line 675
// $i = 1; // $i = 1;
// foreach($member_graphs as $graph_id) { // foreach($member_graphs as $graph_id) {
// db_execute("INSERT INTO aggregate _graphs_items // db_execute("INSERT INTO aggregate _graphs_items
// (aggregate_graph_id, loca l_graph_id, sequence) // (aggregate_graph_id, loca l_graph_id, sequence)
// VALUES // VALUES
// ($aggregate_graph_id, $gr aph_id, $i)" // ($aggregate_graph_id, $gr aph_id, $i)"
// ); // );
// $i++; // $i++;
// } // }
/* save aggregate graph graph items */ /* save aggregate graph - graph items */
if (get_request_var('drp_action') == '9') { if (get_request_var('drp_action') == '9') {
/* get existing item ids and sequences fr om graph template */ /* get existing item ids and sequences fr om graph template */
$graph_templates_items = array_rekey( $graph_templates_items = array_rekey(
db_fetch_assoc_prepared('SELECT i d, sequence db_fetch_assoc_prepared('SELECT i d, sequence
FROM graph_templates_item FROM graph_templates_item
WHERE local_graph_id=0 WHERE local_graph_id=0
AND graph_template_id = ? ', AND graph_template_id = ? ',
array($ag_data['graph_tem plate_id'])), array($ag_data['graph_tem plate_id'])),
'id', array('sequence') 'id', array('sequence')
); );
skipping to change at line 2031 skipping to change at line 2031
</span> </span>
</td> </td>
</tr> </tr>
</table> </table>
<table class='filterTable'> <table class='filterTable'>
<tr> <tr>
<td> <td>
<?php print __('Search');?> <?php print __('Search');?>
</td> </td>
<td> <td>
<input type='text' class='ui-stat e-default ui-corner-all' id='rfilter' size='30' value='<?php print html_escape_r equest_var('rfilter');?>'> <input type='text' class='ui-stat e-default ui-corner-all' id='rfilter' size='55' value='<?php print html_escape_r equest_var('rfilter');?>'>
</td> </td>
<td> <td>
<?php print __('Graphs');?> <?php print __('Graphs');?>
</td> </td>
<td> <td>
<select id='rows' onChange='apply Filter()'> <select id='rows' onChange='apply Filter()'>
<option value='-1'<?php p rint (get_request_var('rows') == '-1' ? ' selected>':'>') . __('Default');?></op tion> <option value='-1'<?php p rint (get_request_var('rows') == '-1' ? ' selected>':'>') . __('Default');?></op tion>
<?php <?php
if (cacti_sizeof($item_ro ws)) { if (cacti_sizeof($item_ro ws)) {
foreach ($item_ro ws as $key => $value) { foreach ($item_ro ws as $key => $value) {
skipping to change at line 2071 skipping to change at line 2071
$sql_where = " WHERE (gtg.title_cache RLIKE '" . get_request_var( 'rfilter') . "'" . $sql_where = " WHERE (gtg.title_cache RLIKE '" . get_request_var( 'rfilter') . "'" .
" OR gt.name RLIKE '" . get_request_var('rfilter') . "'" . " OR gt.name RLIKE '" . get_request_var('rfilter') . "'" .
" OR gl.id = '" . get_request_var('rfilter') . "')"; " OR gl.id = '" . get_request_var('rfilter') . "')";
$sql_where2 = " AND (gl.id = '" . get_request_var('rfilter') . "' )"; $sql_where2 = " AND (gl.id = '" . get_request_var('rfilter') . "' )";
} }
if (get_request_var('host_id') == '-1') { if (get_request_var('host_id') == '-1') {
/* Show all items */ /* Show all items */
} elseif (isempty_request_var('host_id')) { } elseif (isempty_request_var('host_id')) {
$sql_where2 .= ($sql_where != '' ? ' AND ':'WHERE ') . ' gl.host_ id=0'; $sql_where .= ($sql_where != '' ? ' AND ':'WHERE ') . ' gl.host_ id=0';
$sql_where2 .= ' AND gl.host_id=0'; $sql_where2 .= ' AND gl.host_id=0';
} elseif (!isempty_request_var('host_id')) { } elseif (!isempty_request_var('host_id')) {
$sql_where .= ($sql_where != '' ? ' AND ':'WHERE ') . ' gl.host_ id=' . get_request_var('host_id'); $sql_where .= ($sql_where != '' ? ' AND ':'WHERE ') . ' gl.host_ id=' . get_request_var('host_id');
$sql_where2 .= ' AND gl.host_id=' . get_request_var('host_id'); $sql_where2 .= ' AND gl.host_id=' . get_request_var('host_id');
} }
if (get_request_var('site_id') == '-1') { if (get_request_var('site_id') == '-1') {
/* Show all items */ /* Show all items */
} elseif (isempty_request_var('site_id')) { } elseif (isempty_request_var('site_id')) {
$sql_where .= ($sql_where != '' ? ' AND ':'WHERE ') . ' h.site_i d=0'; $sql_where .= ($sql_where != '' ? ' AND ':'WHERE ') . ' h.site_i d=0';
skipping to change at line 2194 skipping to change at line 2194
print $nav; print $nav;
html_start_box('', '100%', '', '3', 'center', ''); html_start_box('', '100%', '', '3', 'center', '');
$display_text = array( $display_text = array(
'title_cache' => array( 'title_cache' => array(
'display' => __('Graph Name'), 'display' => __('Graph Name'),
'align' => 'left', 'align' => 'left',
'sort' => 'ASC', 'sort' => 'ASC',
'tip' => __('The Title of this Graph. Generally prog ramatically generated from the Graph Template definition or Suggested Naming rul es. The max length of the Title is controlled under Settings->Visual.') 'tip' => __('The Title of this Graph. Generally prog rammatically generated from the Graph Template definition or Suggested Naming ru les. The max length of the Title is controlled under Settings->Visual.')
), ),
'local_graph_id' => array( 'local_graph_id' => array(
'display' => __('ID'), 'display' => __('ID'),
'align' => 'right', 'align' => 'right',
'sort' => 'ASC', 'sort' => 'ASC',
'tip' => __('The internal database ID for this Graph. Useful when performing automation or debugging.') 'tip' => __('The internal database ID for this Graph. Useful when performing automation or debugging.')
), ),
'nosort_source' => array( 'nosort_source' => array(
'display' => __('Source Type'), 'display' => __('Source Type'),
'align' => 'center', 'align' => 'center',
 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)