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

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

Revision: 6277
          http://sourceforge.net/p/astlinux/code/6277
Author:   abelbeck
Date:     2013-11-15 00:31:13 +0000 (Fri, 15 Nov 2013)
Log Message:
-----------
web interface, add NetStat tab support

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/edit.php
    branches/1.0/package/webinterface/altweb/admin/network.php
    branches/1.0/package/webinterface/altweb/admin/prefs.php
    branches/1.0/package/webinterface/altweb/common/header.php
    branches/1.0/package/webinterface/altweb/common/license-packages.txt

Added Paths:
-----------
    branches/1.0/package/webinterface/altweb/admin/netstat.php

Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php	2013-11-14 19:59:24 UTC (rev 6276)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php	2013-11-15 00:31:13 UTC (rev 6277)
@@ -31,6 +31,7 @@
   'pptpd' => 'Restart PPTP VPN Server',
   'ldap' => 'Reload LDAP Client',
   'slapd' => 'Restart LDAP Server',
+  'darkstat' => 'Restart NetStat Server',
   'snmpd' => 'Restart SNMP Server',
   'stunnel' => 'Restart Stunnel Proxy',
   'miniupnpd' => 'Restart Univ. Plug\'n\'Play',
@@ -238,6 +239,8 @@
         $result = restartPROCESS('fop2', 42, $result, 'reload');
       } elseif ($process === 'slapd') {
         $result = restartPROCESS($process, 43, $result, 'init');
+      } elseif ($process === 'darkstat') {
+        $result = restartPROCESS($process, 44, $result, 'init');
       } elseif ($process === 'cron') {
         $result = updateCRON('root', 30, $result);
       }
@@ -364,6 +367,8 @@
       putHtml('<p style="color: green;">Asterisk Flash Operating Panel2 has been Reloaded.</p>');
     } elseif ($result == 43) {
       putHtml('<p style="color: green;">LDAP Server has Restarted.</p>');
+    } elseif ($result == 44) {
+      putHtml('<p style="color: green;">NetStat Server (darkstat) has Restarted.</p>');
     } elseif ($result == 99) {
       putHtml('<p style="color: red;">Action Failed.</p>');
     } elseif ($result == 999) {

Added: branches/1.0/package/webinterface/altweb/admin/netstat.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/netstat.php	                        (rev 0)
+++ branches/1.0/package/webinterface/altweb/admin/netstat.php	2013-11-15 00:31:13 UTC (rev 6277)
@@ -0,0 +1,71 @@
+<?php
+
+// Copyright (C) 2013 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
+// General Public License; and comes with ABSOLUTELY NO WARRANTY.
+
+// netstat.php for AstLinux
+// 11-14-2013
+//
+
+$myself = $_SERVER['PHP_SELF'];
+
+require_once '../common/functions.php';
+
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+  $result = 1;
+  if (! $global_admin) {
+    $result = 999;                                 
+  }
+  header('Location: '.$myself.'?result='.$result);
+  exit;
+} else { // Start of HTTP GET
+$ACCESS_RIGHTS = 'admin';
+require_once '../common/header.php';
+
+  putHtml("<center>");
+  putHtml('<p>&nbsp;</p>');
+  putHtml("</center>");
+?>
+  <script language="JavaScript" type="text/javascript">
+  //<![CDATA[
+
+  function setIFheight() {
+    var iframe = document.getElementById("netstat");
+    var winH = 460;
+    if (document.documentElement && document.documentElement.offsetHeight) {
+      winH = document.documentElement.offsetHeight;
+    }
+    if (window.innerHeight) {
+      winH = window.innerHeight;
+    }
+    var offset = 160;
+    if (iframe.getBoundingClientRect) {
+      offset = iframe.getBoundingClientRect().top + 22;
+    }
+
+    iframe.height = winH - offset;
+    window.onresize = setIFheight;
+  }
+  //]]>
+  </script>
+  <center>
+  <table class="layoutNOpad" width="100%"><tr><td><center>
+<?php
+
+  putHtml('<table class="stdtable" width="100%"><tr><td style="text-align: center;">');
+  if (is_file('/var/run/darkstat.pid')) {
+    echo '<iframe id="netstat" src="/admin/netstat/" frameborder="1" width="100%" onload="setIFheight();">';
+    putHtml('</iframe>');
+  } else {
+    putHtml('<p style="color: red;">The NetStat Server is not running, enable via the Network Tab.</p>');
+  }
+  putHtml('</td></tr></table>');
+  putHtml("</center></td></tr></table>");
+  putHtml("</center>");
+} // End of HTTP GET
+require_once '../common/footer.php';
+
+?>


Property changes on: branches/1.0/package/webinterface/altweb/admin/netstat.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php	2013-11-14 19:59:24 UTC (rev 6276)
+++ branches/1.0/package/webinterface/altweb/admin/network.php	2013-11-15 00:31:13 UTC (rev 6277)
@@ -413,6 +413,31 @@
   $value = 'CLI_PROXY_SERVER="'.$_POST['cli_proxy'].'"';
   fwrite($fp, "### CLI Proxy Server\n".$value."\n");
   
+  $value = 'NETSTAT_SERVER="'.$_POST['netstat_server'].'"';
+  fwrite($fp, "### NetStat Server\n".$value."\n");
+  
+  $x_value = '';
+  if (isset($_POST['netstat_EXTIF'])) {
+    $x_value .= ' EXTIF';
+  }
+  if (isset($_POST['netstat_INTIF'])) {
+    $x_value .= ' INTIF';
+  }
+  if (isset($_POST['netstat_INT2IF'])) {
+    $x_value .= ' INT2IF';
+  }
+  if (isset($_POST['netstat_INT3IF'])) {
+    $x_value .= ' INT3IF';
+  }
+  if (isset($_POST['netstat_DMZIF'])) {
+    $x_value .= ' DMZIF';
+  }
+  if ($x_value === '') {  // set default
+    $x_value = 'EXTIF';
+  }
+  $value = 'NETSTAT_CAPTURE="'.trim($x_value).'"';
+  fwrite($fp, "### NetStat Capture Interfaces\n".$value."\n");
+
   $x_value = $_POST['upnp'];
   $tokens = explode(':', $x_value);
   $value = 'UPNP_ENABLE_NATPMP="'.$tokens[0].'"';
@@ -964,6 +989,8 @@
         $result = restartPROCESS('fop2', 42, $result, 'reload');
       } elseif ($process === 'slapd') {
         $result = restartPROCESS($process, 43, $result, 'init');
+      } elseif ($process === 'darkstat') {
+        $result = restartPROCESS($process, 44, $result, 'init');
       }
     } else {
       $result = 2;
@@ -1048,6 +1075,8 @@
       putHtml('<p style="color: green;">Asterisk Flash Operating Panel2 has been Reloaded.</p>');
     } elseif ($result == 43) {
       putHtml('<p style="color: green;">LDAP Server has Restarted.</p>');
+    } elseif ($result == 44) {
+      putHtml('<p style="color: green;">NetStat Server (darkstat) has Restarted.</p>');
     } elseif ($result == 99) {
       putHtml('<p style="color: red;">Action Failed.</p>');
     } elseif ($result == 100) {
@@ -1129,6 +1158,8 @@
   putHtml('<option value="ldap"'.$sel.'>Reload LDAP Client</option>');
   $sel = ($reboot_restart === 'slapd') ? ' selected="selected"' : '';
   putHtml('<option value="slapd"'.$sel.'>Restart LDAP Server</option>');
+  $sel = ($reboot_restart === 'darkstat') ? ' selected="selected"' : '';
+  putHtml('<option value="darkstat"'.$sel.'>Restart NetStat Server</option>');
   $sel = ($reboot_restart === 'snmpd') ? ' selected="selected"' : '';
   putHtml('<option value="snmpd"'.$sel.'>Restart SNMP Server</option>');
   $sel = ($reboot_restart === 'stunnel') ? ' selected="selected"' : '';
@@ -1566,6 +1597,31 @@
   putHtml('</td></tr>');
   
   putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+  putHtml('NetStat&nbsp;Server:');
+  putHtml('<select name="netstat_server">');
+  putHtml('<option value="">disabled</option>');
+  $value = getVARdef($db, 'NETSTAT_SERVER', $cur_db);
+  $sel = ($value === 'darkstat') ? ' selected="selected"' : '';
+  putHtml('<option value="darkstat"'.$sel.'>enabled</option>');
+  putHtml('</select>');
+  putHtml('&nbsp;<i>(https://'.$_SERVER['HTTP_HOST'].'/admin/netstat/ or NetStat Tab)</i>');
+  putHtml('</td></tr>');
+
+  putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+  putHtml('NetStat&nbsp;Interfaces:');
+  $sel = isVARtype('NETSTAT_CAPTURE', $db, $cur_db, 'EXTIF') ? ' checked="checked"' : '';
+  putHtml('<input type="checkbox" value="netstat_EXTIF" name="netstat_EXTIF"'.$sel.' />&nbsp;External');
+  $sel = isVARtype('NETSTAT_CAPTURE', $db, $cur_db, 'INTIF') ? ' checked="checked"' : '';
+  putHtml('<input type="checkbox" value="netstat_INTIF" name="netstat_INTIF"'.$sel.' />&nbsp;1st LAN');
+  $sel = isVARtype('NETSTAT_CAPTURE', $db, $cur_db, 'INT2IF') ? ' checked="checked"' : '';
+  putHtml('<input type="checkbox" value="netstat_INT2IF" name="netstat_INT2IF"'.$sel.' />&nbsp;2nd LAN');
+  $sel = isVARtype('NETSTAT_CAPTURE', $db, $cur_db, 'INT3IF') ? ' checked="checked"' : '';
+  putHtml('<input type="checkbox" value="netstat_INT3IF" name="netstat_INT3IF"'.$sel.' />&nbsp;3rd LAN');
+  $sel = isVARtype('NETSTAT_CAPTURE', $db, $cur_db, 'DMZIF') ? ' checked="checked"' : '';
+  putHtml('<input type="checkbox" value="netstat_DMZIF" name="netstat_DMZIF"'.$sel.' />&nbsp;DMZ');
+  putHtml('</td></tr>');
+  
+  putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
   putHtml("Universal Plug'n'Play:");
   $upnp_natpmp = getVARdef($db, 'UPNP_ENABLE_NATPMP', $cur_db) === 'yes' ? 'yes' : 'no';
   $upnp_upnp = getVARdef($db, 'UPNP_ENABLE_UPNP', $cur_db) === 'yes' ? 'yes' : 'no';

Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php	2013-11-14 19:59:24 UTC (rev 6276)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php	2013-11-15 00:31:13 UTC (rev 6277)
@@ -475,6 +475,10 @@
       $value = 'tab_cli_show = yes';
       fwrite($fp, $value."\n");
     }
+    if (isset($_POST['tab_netstat'])) {
+      $value = 'tab_netstat_show = yes';
+      fwrite($fp, $value."\n");
+    }
     if (! isset($_POST['tab_staff'])) {
       $value = 'tab_staff_disable_staff = yes';
       fwrite($fp, $value."\n");
@@ -1130,6 +1134,10 @@
   putHtml('<input type="checkbox" value="tab_cli" name="tab_cli"'.$sel.' /></td><td colspan="5">Show CLI Tab</td></tr>');
   
   putHtml('<tr class="dtrow1"><td style="text-align: right;">');
+  $sel = (getPREFdef($global_prefs, 'tab_netstat_show') === 'yes') ? ' checked="checked"' : '';
+  putHtml('<input type="checkbox" value="tab_netstat" name="tab_netstat"'.$sel.' /></td><td colspan="5">Show NetStat Tab</td></tr>');
+  
+  putHtml('<tr class="dtrow1"><td style="text-align: right;">');
   $sel = (getPREFdef($global_prefs, 'tab_staff_disable_staff') !== 'yes') ? ' checked="checked"' : '';
   putHtml('<input type="checkbox" value="tab_staff" name="tab_staff"'.$sel.' /></td><td colspan="5">Show Staff Tab for &quot;staff&quot; user</td></tr>');
   

Modified: branches/1.0/package/webinterface/altweb/common/header.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/header.php	2013-11-14 19:59:24 UTC (rev 6276)
+++ branches/1.0/package/webinterface/altweb/common/header.php	2013-11-15 00:31:13 UTC (rev 6277)
@@ -261,6 +261,9 @@
       if ($global_admin && (getPREFdef($global_prefs, 'tab_cli_show') === 'yes')) {
         putHtml('<li><a href="/admin/cli.php"><span>CLI</span></a></li>');
       }
+      if ($global_admin && (getPREFdef($global_prefs, 'tab_netstat_show') === 'yes')) {
+        putHtml('<li><a href="/admin/netstat.php"><span>NetStat</span></a></li>');
+      }
       if ($global_admin && (getPREFdef($global_prefs, 'tab_prefs_show') !== 'no')) {
         putHtml('<li><a href="/admin/prefs.php"><span>Prefs</span></a></li>');
       }

Modified: branches/1.0/package/webinterface/altweb/common/license-packages.txt
===================================================================
--- branches/1.0/package/webinterface/altweb/common/license-packages.txt	2013-11-14 19:59:24 UTC (rev 6276)
+++ branches/1.0/package/webinterface/altweb/common/license-packages.txt	2013-11-15 00:31:13 UTC (rev 6277)
@@ -46,3 +46,4 @@
 ddclient~Copyright (c) 1999-2013 Paul Burry, wimpunk, et al.
 vCard converter~Copyright (c) 2006-2013 Thomas Bruederli <th...@br...>
 OpenLDAP~Copyright (c) 1998-2013 The OpenLDAP Foundation. All rights reserved.
+darkstat~Copyright (c) 2001-2013 Emil Mikulic, et al.

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