Update of /cvsroot/leaf/src/config/webconf/var/webconf/www
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13353

Modified Files:
        logfiles.cgi 
Log Message:
Formatted shorewall rules can be sorted by clicking on the link for the
column header (Enhancement supplied by Eric House)


Index: logfiles.cgi
===================================================================
RCS file: /cvsroot/leaf/src/config/webconf/var/webconf/www/logfiles.cgi,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** logfiles.cgi        29 Nov 2004 16:51:12 -0000      1.2
--- logfiles.cgi        12 May 2005 16:46:19 -0000      1.3
***************
*** 33,38 ****
                                        for a in Date Time Host Rule Action "In 
I/F" "Out I/F" "From IP" "Target IP" \
                                                Protocol "Src Port" "Dest 
Port"; do
!                                               echo -n "<th>$a</th>"
!                                               done
                                        echo "</tr>"
                                        sed 's-^\([A-z]*\) \+-\1\&nbsp;-;
--- 33,43 ----
                                        for a in Date Time Host Rule Action "In 
I/F" "Out I/F" "From IP" "Target IP" \
                                                Protocol "Src Port" "Dest 
Port"; do
!                         key=$(echo $a | tr ' //' '__')
!                         if [ x"$key" = x"$FORM_key" ]; then
!                             echo -n "<th>$a</th>"
!                         else
!                             echo -n "<th><a 
href=\"logfiles.cgi?cmd=View&style=shorewall&key=$key&name=$FORM_name\">$a</a></th>"
!                                               fi
!                         done
                                        echo "</tr>"
                                        sed 's-^\([A-z]*\) \+-\1\&nbsp;-;
***************
*** 45,49 ****
                                        s-^-<tr><td>-; s-$-</td></tr>-'
                                        }
!               
                                if [ "$FORM_name" != "${FORM_name%.gz}" ]; then
                                        pager="zcat"
--- 50,132 ----
                                        s-^-<tr><td>-; s-$-</td></tr>-'
                                        }
! 
!               setpats () {
!             minus_n=""
!             case "$1" in
! 
!                 "Date" )  
!                     pat1=""
!                     pat2="[A-Za-z]\+ \+[0-9]\+ "
!                     pat3=".*"
!                     minus_n="-n"
!                     ;;
!                 "Time" )  
!                     pat1=".* \+"
!                                   pat2="[0-9]\+:[0-9]\+:[0-9]\+"
!                                   pat3=" \+[a-zA-Z0-9].*"
!                     minus_n="-n"
!                     ;;
!                 "Host" )
!                     pat1=".*"
!                     pat2="[a-zA-Z0-9]\+"
!                                   pat3=" Shore.*"
!                     ;;
!                 "Rule" )
!                                   pat1=".*Shorewall:"
!                     pat2="[^:]\+"
!                     pat3=":.*"
!                     ;;
!                 "Action" )
!                     pat1=".*:"
!                     pat2="[A-Z]\+"
!                                   pat3=": IN=.*"
!                     ;;
!                 "In_I_F" )
!                                   pat1=".*IN="
!                     pat2="[^ ]\+"
!                     pat3=" .*"
!                     ;;
!                 "Out_I_F" )
!                                   pat1=".*OUT="
!                     pat2="[^ ]*"
!                     pat3=" .*"
!                     ;;
!                 "From_IP" )
!                     pat1=".*SRC="
!                     pat2="[^ ]\+"
!                     pat3=" .*"
!                     minus_n="-n"
!                     ;;
!                 "Target_IP" )
!                                   pat1=".*DST="
!                     pat2="[^ ]\+"
!                     pat3=" .*"
!                     minus_n="-n"
!                     ;;
!                 "Protocol" )
!                                   pat1=".*PROTO="
!                     pat2="[A-Z]\+"
!                     pat3=" .*"
!                     ;;
!                 "Src_Port" )
!                                   pat1=".*SPT="
!                     pat2="[^ ]\+"
!                     pat3=" .*"
!                     minus_n="-n"
!                     ;;
!                 "Dest_Port" )
!                                   pat1=".*DPT="
!                     pat2="[^ ]\+"
!                     pat3=" .*"
!                     minus_n="-n"
!                     ;;
!                 * )
!                                   pat1=".*"
!                     pat2=""
!                     pat3=""
!                     ;;
!             esac
!         }
! 
                                if [ "$FORM_name" != "${FORM_name%.gz}" ]; then
                                        pager="zcat"
***************
*** 55,59 ****
--- 138,149 ----
                                        "shorewall" )
                                                echo "<table width=100% 
border=1>"
+                         if [ "$FORM_key" = "" ]; then
                                                $pager $FORM_name | grep 
"Shorewall:" | shorewall_table_view
+                         else
+                     setpats $FORM_key
+                     $pager $FORM_name | grep "Shorewall:" | 
+                     sed "s-^\(${pat1}\)\(${pat2}\)\(${pat3}\)\$-\2##\1\2\3-" 
| 
+                     sort $minus_n | sed "s-^.*##--" | shorewall_table_view
+                     fi
                                                echo "</table>"
                                                ;;



-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7393&alloc_id=16281&op=click
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits

Reply via email to