[Astlinux-commits] SF.net SVN: astlinux:[3590] branches/0.7/package/webinterface/altweb

[<abe...@us...>]

Revision: 3590
          http://astlinux.svn.sourceforge.net/astlinux/?rev=3590&view=rev
Author:   abelbeck
Date:     2009-12-30 01:58:54 +0000 (Wed, 30 Dec 2009)

Log Message:
-----------
Web interface, added two Prefs tab options for the Status tab, 'Hide SRC Ports:' and 'Hide DST Ports:' when 'Show Firewall States' is enabled

Modified Paths:
--------------
    branches/0.7/package/webinterface/altweb/admin/prefs.php
    branches/0.7/package/webinterface/altweb/common/status.inc
    branches/0.7/package/webinterface/altweb/common/version.php

Modified: branches/0.7/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/0.7/package/webinterface/altweb/admin/prefs.php	2009-12-30 01:58:26 UTC (rev 3589)
+++ branches/0.7/package/webinterface/altweb/admin/prefs.php	2009-12-30 01:58:54 UTC (rev 3590)
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2008-2009 Lonnie Abelbeck
+// Copyright (C) 2008-2010 Lonnie Abelbeck
 // This is free software, licensed under the GNU General Public License
 // version 3 as published by the Free Software Foundation; you can
 // redistribute it and/or modify it under the terms of the GNU
@@ -83,6 +83,14 @@
       $value = 'status_show_firewall_states = yes';
       fwrite($fp, $value."\n");
     }
+    if (($value = trim($_POST['firewall_sports'])) !== '') {
+      $value = 'status_firewall_sports_cmdstr = "'.$value.'"';
+      fwrite($fp, $value."\n");
+    }
+    if (($value = trim($_POST['firewall_dports'])) !== '') {
+      $value = 'status_firewall_dports_cmdstr = "'.$value.'"';
+      fwrite($fp, $value."\n");
+    }
     if (isset($_POST['exclude_extensions'])) {
       $value = 'status_exclude_extensions = yes';
       fwrite($fp, $value."\n");
@@ -395,9 +403,17 @@
   putHtml('<tr class="dtrow1"><td style="text-align: right;">');
   $sel = (getPREFdef($global_prefs, 'status_voicemail_show_users') === 'yes') ? ' checked="checked"' : '';
   putHtml('<input type="checkbox" value="voicemail_users" name="voicemail_users"'.$sel.' /></td><td colspan="5">Show Voicemail User Status</td></tr>');
+  
   putHtml('<tr class="dtrow1"><td style="text-align: right;">');
   $sel = (getPREFdef($global_prefs, 'status_show_firewall_states') === 'yes') ? ' checked="checked"' : '';
   putHtml('<input type="checkbox" value="firewall_states" name="firewall_states"'.$sel.' /></td><td colspan="5">Show Firewall States</td></tr>');
+  putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">Hide SRC Ports:</td><td colspan="4">');
+  $value = getPREFdef($global_prefs, 'status_firewall_sports_cmdstr');
+  putHtml('<input type="text" size="48" maxlength="128" value="'.$value.'" name="firewall_sports" /></td></tr>');
+  putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">Hide DST Ports:</td><td colspan="4">');
+  $value = getPREFdef($global_prefs, 'status_firewall_dports_cmdstr');
+  putHtml('<input type="text" size="48" maxlength="128" value="'.$value.'" name="firewall_dports" /></td></tr>');
+  
   putHtml('<tr class="dtrow1"><td style="text-align: right;">');
   $sel = (getPREFdef($global_prefs, 'status_exclude_extensions') === 'yes') ? ' checked="checked"' : '';
   putHtml('<input type="checkbox" value="exclude_extensions" name="exclude_extensions"'.$sel.' /></td><td colspan="5">Exclude 4-digit Extensions in SIP/IAX2 Peer Status</td></tr>');

Modified: branches/0.7/package/webinterface/altweb/common/status.inc
===================================================================
--- branches/0.7/package/webinterface/altweb/common/status.inc	2009-12-30 01:58:26 UTC (rev 3589)
+++ branches/0.7/package/webinterface/altweb/common/status.inc	2009-12-30 01:58:54 UTC (rev 3590)
@@ -131,6 +131,8 @@
 // Function: parseFIREWALLstates
 //
 function parseFIREWALLstates(&$status, $log) {
+  global $global_prefs;
+  
   $proto = array (
     1  => 'ICMP',
     6  => 'TCP',
@@ -139,6 +141,12 @@
     50 => 'ESP',
     51 => 'AH'
   );
+  if (($str = getPREFdef($global_prefs, 'status_firewall_sports_cmdstr')) !== '') {
+    $hide_sports = explode(' ', $str);
+  }
+  if (($str = getPREFdef($global_prefs, 'status_firewall_dports_cmdstr')) !== '') {
+    $hide_dports = explode(' ', $str);
+  }
   $cid = 0;
   if (($ph = @fopen($log, "r")) !== FALSE) {
     while (! feof($ph)) {
@@ -166,10 +174,20 @@
             } elseif (strncmp($pair, 'sport=', 6) == 0) {
               if ($sport === '') {
                 $sport = substr($pair, 6);
+                if (isset($hide_sports)) {
+                  if (in_array($sport, $hide_sports)) {
+                    continue 2; // next line
+                  }
+                }
               }
             } elseif (strncmp($pair, 'dport=', 6) == 0) {
               if ($dport === '') {
                 $dport = substr($pair, 6);
+                if (isset($hide_dports)) {
+                  if (in_array($dport, $hide_dports)) {
+                    continue 2; // next line
+                  }
+                }
               }
             } elseif (strncmp($pair, 'bytes=', 6) == 0) {
               $bytes += (float)substr($pair, 6);

Modified: branches/0.7/package/webinterface/altweb/common/version.php
===================================================================
--- branches/0.7/package/webinterface/altweb/common/version.php	2009-12-30 01:58:26 UTC (rev 3589)
+++ branches/0.7/package/webinterface/altweb/common/version.php	2009-12-30 01:58:54 UTC (rev 3590)
@@ -1,6 +1,6 @@
 <?php
 // version.php for AstLinux Alternate Web Interface
 
-$GUI_VERSION = '1.6.07';
+$GUI_VERSION = '1.6.08';
 
 ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.