diff --git a/proc/open_files.cgi b/proc/open_files.cgi index 94b40b5c7..866863b2c 100755 --- a/proc/open_files.cgi +++ b/proc/open_files.cgi @@ -17,75 +17,72 @@ print "",&text('open_proc', "$pinfo{'args'}", $in{'pid'}), "

\n"; # Show open files +print &ui_subheading($text{'open_header1'}); @files = &find_process_files($in{'pid'}); -print "\n"; -print "\n"; -print "
$text{'open_header1'}
\n"; - -print " ", - " ", - " ", - " ", - "\n"; +print &ui_columns_start([ $text{'open_fd'}, + $text{'open_type'}, + $text{'open_size'}, + $text{'open_inode'}, + $text{'open_file'} ], 100, 0); foreach $f (@files) { - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; + $f->{'type'}, + $f->{'size'}, + $f->{'inode'}, + $f->{'file'}, + ]); } -print "
$text{'open_fd'}$text{'open_type'}$text{'open_size'}$text{'open_inode'}$text{'open_file'}
",$f->{'fd'} eq 'cwd' ? $text{'open_cwd'} : + print &ui_columns_row([ + $f->{'fd'} eq 'cwd' ? $text{'open_cwd'} : $f->{'fd'} eq 'rtd' ? $text{'open_rtd'} : $f->{'fd'} eq 'txt' ? $text{'open_txt'} : $f->{'fd'} eq 'mem' ? $text{'open_mem'} : - $f->{'fd'},"",$f->{'type'} =~ /^v?dir$/ ? $text{'open_dir'} : + $f->{'fd'}, + $f->{'type'} =~ /^v?dir$/ ? $text{'open_dir'} : $f->{'type'} =~ /^v?reg$/ ? $text{'open_reg'} : $f->{'type'} =~ /^v?chr$/ ? $text{'open_chr'} : $f->{'type'} =~ /^v?blk$/ ? $text{'open_blk'} : - $f->{'type'},"",$f->{'size'} || "
","
$f->{'inode'}$f->{'file'}

\n"; +print &ui_columns_end(); # Show network connections @nets = &find_process_sockets($in{'pid'}); if (@nets) { - print "\n"; - print "\n"; - print "
$text{'open_header2'}
\n"; + print &ui_subheading($text{'open_header2'}); - print " ", - " ", - " ", - "\n"; + print &ui_columns_start([ $text{'open_type'}, + $text{'open_proto'}, + $text{'open_fd'}, + $text{'open_desc'} ], 100, 0, + [ "", "", "", "colspan=4" ]); foreach $n (@nets) { - print "\n"; - print "\n"; - print "\n"; - print "\n"; + @cols = ( uc($n->{'type'}), + uc($n->{'proto'}), + $n->{'fd'} ); + @tds = ( "", "", "" ); if ($n->{'listen'} && $n->{'lhost'} eq '*') { - print "\n"; + push(@cols, &text('open_listen1', + "$n->{'lport'}")); + push(@tds, "colspan=4"); } elsif ($n->{'listen'}) { - print "\n"; + push(@cols, &text('open_listen2', + "$n->{'lhost'}", + "$n->{'lport'}")); + push(@tds, "colspan=4"); } elsif ($n->{'rhost'}) { - print "\n"; - print "\n"; - print "\n"; - print "\n"; + push(@cols, "$n->{'lhost'}:$n->{'lport'}", + "->", + "$n->{'rhost'}:$n->{'rport'}", + "$n->{'state'}"); } else { - print "\n"; + push(@cols, &text('open_recv', "$n->{'lhost'}", + "$n->{'lport'}")); + push(@tds, "colspan=4"); } - print "\n"; + print &ui_columns_row(\@cols, \@tds); } - print "
$text{'open_type'}$text{'open_proto'}$text{'open_fd'}$text{'open_desc'}
",uc($n->{'type'}),"",uc($n->{'proto'}),"",$n->{'fd'},"", - &text('open_listen1', "$n->{'lport'}"), - "", - &text('open_listen2', "$n->{'lhost'}", - "$n->{'lport'}"),"$n->{'lhost'}:$n->{'lport'}->$n->{'rhost'}:$n->{'rport'}$n->{'state'}", - &text('open_recv', "$n->{'lhost'}", - "$n->{'lport'}"),"
\n"; + print &ui_columns_end(); } &ui_print_footer("edit_proc.cgi?$in{'pid'}", $text{'edit_return'},