Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

haproxy, haproxy-devel, pkg0.47, fix show tabs for non admin users that have permissions #127

Merged
merged 1 commit into from
May 20, 2016
Merged

haproxy, haproxy-devel, pkg0.47, fix show tabs for non admin users that have permissions #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion net/pfSense-pkg-haproxy-devel/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= pfSense-pkg-haproxy-devel
PORTVERSION= 0.46
PORTVERSION= 0.47
CATEGORIES= net
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
18 changes: 8 additions & 10 deletions net/pfSense-pkg-haproxy-devel/files/usr/local/pkg/haproxy/pkg_haproxy_tabs.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,18 @@
global $haproxy_tab_array;

$haproxy_tab_array['haproxy'] = array();
$haproxy_tab_array['haproxy']['settings'] = Array(name => "Settings", url => "haproxy_global.php");
$haproxy_tab_array['haproxy']['frontend'] = Array(name => "Frontend", url => "haproxy_listeners.php");
$haproxy_tab_array['haproxy']['backend'] = Array(name => "Backend", url => "haproxy_pools.php");
$haproxy_tab_array['haproxy']['files'] = Array(name => "Files", url => "haproxy_files.php");
$haproxy_tab_array['haproxy']['stats'] = Array(name => "Stats", url => "haproxy_stats.php");
$haproxy_tab_array['haproxy']['statsfs'] = Array(name => "Stats FS", url => "haproxy_stats.php?haproxystats=1");
$haproxy_tab_array['haproxy']['templates'] = Array(name => "Templates", url => "haproxy_templates.php");
$haproxy_tab_array['haproxy']['settings'] = Array(name => "Settings", url => "/haproxy/haproxy_global.php");
$haproxy_tab_array['haproxy']['frontend'] = Array(name => "Frontend", url => "/haproxy/haproxy_listeners.php");
$haproxy_tab_array['haproxy']['backend'] = Array(name => "Backend", url => "/haproxy/haproxy_pools.php");
$haproxy_tab_array['haproxy']['files'] = Array(name => "Files", url => "/haproxy/haproxy_files.php");
$haproxy_tab_array['haproxy']['stats'] = Array(name => "Stats", url => "/haproxy/haproxy_stats.php");
$haproxy_tab_array['haproxy']['statsfs'] = Array(name => "Stats FS", url => "/haproxy/haproxy_stats.php?haproxystats=1");
$haproxy_tab_array['haproxy']['templates'] = Array(name => "Templates", url => "/haproxy/haproxy_templates.php");

function haproxy_display_top_tabs_active($top_tabs, $activetab) {
$tab_array = array();
foreach($top_tabs as $key => $tab_item){
$tab_array[] = array($tab_item['name'], $key == $activetab, $tab_item['url']);
}
display_top_tabs($tab_array);
}

?>
}
2 changes: 1 addition & 1 deletion net/pfSense-pkg-haproxy/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= pfSense-pkg-haproxy
PORTVERSION= 0.46
PORTVERSION= 0.47
CATEGORIES= net
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
18 changes: 8 additions & 10 deletions net/pfSense-pkg-haproxy/files/usr/local/pkg/haproxy/pkg_haproxy_tabs.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,18 @@
global $haproxy_tab_array;

$haproxy_tab_array['haproxy'] = array();
$haproxy_tab_array['haproxy']['settings'] = Array(name => "Settings", url => "haproxy_global.php");
$haproxy_tab_array['haproxy']['frontend'] = Array(name => "Frontend", url => "haproxy_listeners.php");
$haproxy_tab_array['haproxy']['backend'] = Array(name => "Backend", url => "haproxy_pools.php");
$haproxy_tab_array['haproxy']['files'] = Array(name => "Files", url => "haproxy_files.php");
$haproxy_tab_array['haproxy']['stats'] = Array(name => "Stats", url => "haproxy_stats.php");
$haproxy_tab_array['haproxy']['statsfs'] = Array(name => "Stats FS", url => "haproxy_stats.php?haproxystats=1");
$haproxy_tab_array['haproxy']['templates'] = Array(name => "Templates", url => "haproxy_templates.php");
$haproxy_tab_array['haproxy']['settings'] = Array(name => "Settings", url => "/haproxy/haproxy_global.php");
$haproxy_tab_array['haproxy']['frontend'] = Array(name => "Frontend", url => "/haproxy/haproxy_listeners.php");
$haproxy_tab_array['haproxy']['backend'] = Array(name => "Backend", url => "/haproxy/haproxy_pools.php");
$haproxy_tab_array['haproxy']['files'] = Array(name => "Files", url => "/haproxy/haproxy_files.php");
$haproxy_tab_array['haproxy']['stats'] = Array(name => "Stats", url => "/haproxy/haproxy_stats.php");
$haproxy_tab_array['haproxy']['statsfs'] = Array(name => "Stats FS", url => "/haproxy/haproxy_stats.php?haproxystats=1");
$haproxy_tab_array['haproxy']['templates'] = Array(name => "Templates", url => "/haproxy/haproxy_templates.php");

function haproxy_display_top_tabs_active($top_tabs, $activetab) {
$tab_array = array();
foreach($top_tabs as $key => $tab_item){
$tab_array[] = array($tab_item['name'], $key == $activetab, $tab_item['url']);
}
display_top_tabs($tab_array);
}

?>
}