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

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

Revision: 6287
          http://sourceforge.net/p/astlinux/code/6287
Author:   abelbeck
Date:     2013-11-18 23:28:48 +0000 (Mon, 18 Nov 2013)
Log Message:
-----------
web interface, allow the NetStat tab to be allowed by 'admin' and 'staff' users

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/netstat.php
    branches/1.0/package/webinterface/altweb/admin/prefs.php
    branches/1.0/package/webinterface/altweb/common/header.php

Modified: branches/1.0/package/webinterface/altweb/admin/netstat.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/netstat.php	2013-11-18 23:00:00 UTC (rev 6286)
+++ branches/1.0/package/webinterface/altweb/admin/netstat.php	2013-11-18 23:28:48 UTC (rev 6287)
@@ -16,13 +16,13 @@
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
   $result = 1;
-  if (! $global_admin) {
+  if (! $global_staff) {
     $result = 999;                                 
   }
   header('Location: '.$myself.'?result='.$result);
   exit;
 } else { // Start of HTTP GET
-$ACCESS_RIGHTS = 'admin';
+$ACCESS_RIGHTS = 'staff';
 require_once '../common/header.php';
 
   putHtml("<center>");

Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php	2013-11-18 23:00:00 UTC (rev 6286)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php	2013-11-18 23:28:48 UTC (rev 6287)
@@ -1122,6 +1122,10 @@
   putHtml('<input type="checkbox" value="tab_users" name="tab_users"'.$sel.' /></td><td colspan="5">Show Users 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_network_show') !== 'no') ? ' checked="checked"' : '';
   putHtml('<input type="checkbox" value="tab_network" name="tab_network"'.$sel.' /></td><td colspan="5">Show Network Tab</td></tr>');
   
@@ -1134,10 +1138,6 @@
   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-18 23:00:00 UTC (rev 6286)
+++ branches/1.0/package/webinterface/altweb/common/header.php	2013-11-18 23:28:48 UTC (rev 6287)
@@ -244,6 +244,9 @@
       if ($global_staff && (getPREFdef($global_prefs, 'tab_users_show') === 'yes')) {
         putHtml('<li><a href="/admin/users.php"><span>Users</span></a></li>');
       }
+      if ($global_staff && (getPREFdef($global_prefs, 'tab_netstat_show') === 'yes')) {
+        putHtml('<li><a href="/admin/netstat.php"><span>NetStat</span></a></li>');
+      }
       if (! is_null($custom_tabs = getCUSTOMtabs($global_prefs))) {
         foreach ($custom_tabs as $tab) {
           if ($tab['access'] === 'all' || ($global_staff && $tab['access'] === 'staff')
@@ -261,9 +264,6 @@
       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>');
       }

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