Skip to content

Commit 9c1ccb4

Browse files
cigamitcigamit
committed
Preparing for release 2.2
* feature: Major rework of logic and code, make OpenFlashCharts work a little longer
1 parent 4017be7 commit 9c1ccb4

19 files changed

Lines changed: 1357 additions & 961 deletions

‎INFO‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[info]
22
name = flowview
3-
version = 2.1
3+
version = 2.2
44
longname = FlowView
55
author = The Cacti Group
66
email =
77
homepage = http://www.cacti.net
8-
compat = 1.1.17
8+
compat = 1.2
99
capabilities = online_view:0, online_mgmt:0, offline_view:0, offline_mgmt:0, remote_collect:0

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@ Got any ideas or complaints, please see the Cacti forums or GitHub for a resolut
4242

4343
# Changelog
4444

45-
--- develop ---
45+
--- 2.2 ---
4646

4747
* issue#27: Deprecated functions and legacy path causing issues with schedules
4848
* issue#28: Flowview filters not searchable using some international characters
49+
* feature: Major rework of logic and code, make OpenFlashCharts work a little longer
4950

5051
--- 2.1 ---
5152

‎arrays.php‎

Lines changed: 160 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
foreach ($devices_arr as $d) {
144144
$devices[$d['folder']] = $d['name'];
145145
}
146-
}else{
146+
} else {
147147
$ddevice = 0;
148148
}
149149

@@ -173,7 +173,7 @@
173173
'method' => 'drop_array',
174174
'default' => 0,
175175
'description' => '',
176-
'value' => (isset_request_var('device_name') ? get_nfilter_request_var('device_name') : $ddevice),
176+
'value' => (isset_request_var('device') ? get_nfilter_request_var('device') : $ddevice),
177177
'none_value' => __('None', 'flowview'),
178178
'array' => $devices
179179
);
@@ -183,7 +183,7 @@
183183
'method' => 'drop_array',
184184
'default' => 20,
185185
'description' => '',
186-
'value' => (isset_request_var('cutoff_lines') ? get_nfilter_request_var('cutoff_lines') : 0),
186+
'value' => (isset_request_var('cutofflines') ? get_nfilter_request_var('cutofflines') : 0),
187187
'array' => array(
188188
'999999' => __('All', 'flowview'),
189189
'5' => __('Top %d', 5, 'flowview'),
@@ -202,7 +202,7 @@
202202
'method' => 'drop_array',
203203
'default' => 0,
204204
'description' => '',
205-
'value' => (isset_request_var('cutoff_octets') ? get_nfilter_request_var('cutoff_octets'):''),
205+
'value' => (isset_request_var('cutoffoctets') ? get_nfilter_request_var('cutoffoctets'):''),
206206
'array' => array(
207207
'0' => __('No Limit', 'flowview'),
208208
'1024' => __('%s Bytes', '1K', 'flowview'),
@@ -232,11 +232,11 @@
232232

233233
$stat_report_field = array(
234234
'friendly_name' => '',
235-
'name' => 'stat_report',
235+
'name' => 'statistics',
236236
'method' => 'drop_array',
237237
'default' => 10,
238238
'description' => '',
239-
'value' => (isset_request_var('stat_report') ? get_nfilter_request_var('stat_report') : 10),
239+
'value' => (isset_request_var('statistics') ? get_nfilter_request_var('statistics') : 10),
240240
'array' => $stat_report_array
241241
);
242242

@@ -254,7 +254,7 @@
254254
'method' => 'drop_array',
255255
'default' => 0,
256256
'description' => '',
257-
'value' => (isset_request_var('print_report') ? get_nfilter_request_var('print_report') : 0),
257+
'value' => (isset_request_var('printed') ? get_nfilter_request_var('printed') : 0),
258258
'array' => $print_report_array
259259
);
260260

@@ -263,35 +263,166 @@
263263
'method' => 'drop_array',
264264
'default' => 'Y',
265265
'description' => '',
266-
'value' => (isset_request_var('resolve_addresses') ? get_nfilter_request_var('resolve_addresses') : 'Y'),
266+
'value' => (isset_request_var('resolve') ? get_nfilter_request_var('resolve') : 'Y'),
267267
'array' => $resolve_addresses_array
268268
);
269269

270270
$stat_columns_array = array(
271-
5 => array(1, 2, '-1', '-1', '0', __('Port', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
272-
6 => array(1, 2, '-1', '-1', '0', __('Port', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
273-
7 => array(1, 2, '-1', '-1', '0', __('Port', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
274-
8 => array(1, 2, 0, '-1', '-1', __('Dest IP', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
275-
9 => array(1, 2, 0, '-1', '-1', __('Src IP', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
276-
10 => array(1, 3, '0,1', '-1', '-1', __('Src IP', 'flowview'), __('Dest IP', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
277-
11 => array(1, 2, 0, '-1', '-1', __('Src/Dest IP', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
278-
12 => array(1, 2, '-1', '0', '-1', __('Protocol', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
279-
17 => array(1, 2, '-1', '-1', '-1', __('Input IF', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
280-
18 => array(1, 2, '-1', '-1', '-1', __('Output IF', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
281-
19 => array(1, 2, '-1', '-1', '-1', __('Src AS', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
282-
20 => array(1, 2, '-1', '-1', '-1', __('Dest AS', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
283-
21 => array(1, 3, '-1', '-1', '-1', __('Src AS', 'flowview'), __('Dest AS', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
284-
22 => array(1, 2, '-1', '-1', '-1', __('TOS', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
285-
23 => array(1, 3, '-1', '-1', '-1', __('Input IF', 'flowview'), __('Output IF', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
286-
24 => array(1, 2, '0', '-1', '-1', __('Src Prefix', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
287-
25 => array(1, 2, '0', '-1', '-1', __('Dest Prefix', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
288-
26 => array(1, 3, '0,1', '-1', '-1', __('Src Prefix', 'flowview'), __('Dest Prefix', 'flowview'), __('Flows', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
271+
5 => array(1, 2, '-1', '-1', '0',
272+
__('Port', 'flowview'),
273+
__('Flows', 'flowview'),
274+
__('Bytes', 'flowview'),
275+
__('Packets', 'flowview')
276+
),
277+
6 => array(1, 2, '-1', '-1', '0',
278+
__('Port', 'flowview'),
279+
__('Flows', 'flowview'),
280+
__('Bytes', 'flowview'),
281+
__('Packets', 'flowview')
282+
),
283+
7 => array(1, 2, '-1', '-1', '0',
284+
__('Port', 'flowview'),
285+
__('Flows', 'flowview'),
286+
__('Bytes', 'flowview'),
287+
__('Packets', 'flowview')
288+
),
289+
8 => array(1, 2, 0, '-1', '-1',
290+
__('Dest IP', 'flowview'),
291+
__('Flows', 'flowview'),
292+
__('Bytes', 'flowview'),
293+
__('Packets', 'flowview')
294+
),
295+
9 => array(1, 2, 0, '-1', '-1',
296+
__('Src IP', 'flowview'),
297+
__('Flows', 'flowview'),
298+
__('Bytes', 'flowview'),
299+
__('Packets', 'flowview')
300+
),
301+
10 => array(1, 3, '0,1', '-1', '-1',
302+
__('Src IP', 'flowview'),
303+
__('Dest IP', 'flowview'),
304+
__('Flows', 'flowview'),
305+
__('Bytes', 'flowview'),
306+
__('Packets', 'flowview')
307+
),
308+
11 => array(1, 2, 0, '-1', '-1',
309+
__('Src/Dest IP', 'flowview'),
310+
__('Flows', 'flowview'),
311+
__('Bytes', 'flowview'),
312+
__('Packets', 'flowview')
313+
),
314+
12 => array(1, 2, '-1', '0', '-1',
315+
__('Protocol', 'flowview'),
316+
__('Flows', 'flowview'),
317+
__('Bytes', 'flowview'),
318+
__('Packets', 'flowview')
319+
),
320+
17 => array(1, 2, '-1', '-1', '-1',
321+
__('Input IF', 'flowview'),
322+
__('Flows', 'flowview'),
323+
__('Bytes', 'flowview'),
324+
__('Packets', 'flowview')
325+
),
326+
18 => array(1, 2, '-1', '-1', '-1',
327+
__('Output IF', 'flowview'),
328+
__('Flows', 'flowview'),
329+
__('Bytes', 'flowview'),
330+
__('Packets', 'flowview')
331+
),
332+
19 => array(1, 2, '-1', '-1', '-1',
333+
__('Src AS', 'flowview'),
334+
__('Flows', 'flowview'),
335+
__('Bytes', 'flowview'),
336+
__('Packets', 'flowview')
337+
),
338+
20 => array(1, 2, '-1', '-1', '-1',
339+
__('Dest AS', 'flowview'),
340+
__('Flows', 'flowview'),
341+
__('Bytes', 'flowview'),
342+
__('Packets', 'flowview')
343+
),
344+
21 => array(1, 3, '-1', '-1', '-1',
345+
__('Src AS', 'flowview'),
346+
__('Dest AS', 'flowview'),
347+
__('Flows', 'flowview'),
348+
__('Bytes', 'flowview'),
349+
__('Packets', 'flowview')
350+
),
351+
22 => array(1, 2, '-1', '-1', '-1',
352+
__('TOS', 'flowview'),
353+
__('Flows', 'flowview'),
354+
__('Bytes', 'flowview'),
355+
__('Packets', 'flowview')
356+
),
357+
23 => array(1, 3, '-1', '-1', '-1',
358+
__('Input IF', 'flowview'),
359+
__('Output IF', 'flowview'),
360+
__('Flows', 'flowview'),
361+
__('Bytes', 'flowview'),
362+
__('Packets', 'flowview')
363+
),
364+
24 => array(1, 2, '0', '-1', '-1',
365+
__('Src Prefix', 'flowview'),
366+
__('Flows', 'flowview'),
367+
__('Bytes', 'flowview'),
368+
__('Packets', 'flowview')
369+
),
370+
25 => array(1, 2, '0', '-1', '-1',
371+
__('Dest Prefix', 'flowview'),
372+
__('Flows', 'flowview'),
373+
__('Bytes', 'flowview'),
374+
__('Packets', 'flowview')
375+
),
376+
26 => array(1, 3, '0,1', '-1', '-1',
377+
__('Src Prefix', 'flowview'),
378+
__('Dest Prefix', 'flowview'),
379+
__('Flows', 'flowview'),
380+
__('Bytes', 'flowview'),
381+
__('Packets', 'flowview')
382+
),
289383
);
290384

291385
$print_columns_array = array(
292-
1 => array(2, 8, '1,3', '1', '4', '1', '5,6', __('Src IF', 'flowview'), __('Src IP', 'flowview'), __('Dest IF', 'flowview'), __('Dest IP', 'flowview'), __('Protocol', 'flowview'), __('Src Port', 'flowview'), __('Dest Port', 'flowview'), __('Packets', 'flowview'), __('Bytes', 'flowview'), __('Start Time', 'flowview'), __('End Time', 'flowview'), __('Active', 'flowview'), __('B/Pk', 'flowview'), __('Ts', 'flowview'), __('Fl', 'flowview')),
293-
4 => array(1, 5, '', '0', '2', '0', '', __('Src IP', 'flowview'), __('Dest IP', 'flowview'), __('Protocol', 'flowview'), __('Src AS', 'flowview'), __('Dest AS', 'flowview'), __('Bytes', 'flowview'), __('Packets', 'flowview')),
294-
5 => array(1, 11, '3,6', '0', '8', '0', '4,7', __('Start Time', 'flowview'), __('End Time', 'flowview'), __('Src IF', 'flowview'), __('Src IP', 'flowview'), __('Src Port', 'flowview'), __('Dest IF', 'flowview'), __('Dest IP', 'flowview'), __('Dest Port', 'flowview'), __('Protocol', 'flowview'), __('Flags', 'flowview'), __('Packets', 'flowview'), __('Bytes', 'flowview')),
386+
1 => array(2, 8, '1,3', '1', '4', '1', '5,6',
387+
__('Src IF', 'flowview'),
388+
__('Src IP', 'flowview'),
389+
__('Dest IF', 'flowview'),
390+
__('Dest IP', 'flowview'),
391+
__('Protocol', 'flowview'),
392+
__('Src Port', 'flowview'),
393+
__('Dest Port', 'flowview'),
394+
__('Packets', 'flowview'),
395+
__('Bytes', 'flowview'),
396+
__('Start Time', 'flowview'),
397+
__('End Time', 'flowview'),
398+
__('Active', 'flowview'),
399+
__('B/Pk', 'flowview'),
400+
__('Ts', 'flowview'),
401+
__('Fl', 'flowview')
402+
),
403+
4 => array(1, 5, '', '0', '2', '0', '',
404+
__('Src IP', 'flowview'),
405+
__('Dest IP', 'flowview'),
406+
__('Protocol', 'flowview'),
407+
__('Src AS', 'flowview'),
408+
__('Dest AS', 'flowview'),
409+
__('Bytes', 'flowview'),
410+
__('Packets', 'flowview')
411+
),
412+
5 => array(1, 11, '3,6', '0', '8', '0', '4,7',
413+
__('Start Time', 'flowview'),
414+
__('End Time', 'flowview'),
415+
__('Src IF', 'flowview'),
416+
__('Src IP', 'flowview'),
417+
__('Src Port', 'flowview'),
418+
__('Dest IF', 'flowview'),
419+
__('Dest IP', 'flowview'),
420+
__('Dest Port', 'flowview'),
421+
__('Protocol', 'flowview'),
422+
__('Flags', 'flowview'),
423+
__('Packets', 'flowview'),
424+
__('Bytes', 'flowview')
425+
)
295426
);
296427

297428

0 commit comments

Comments
 (0)