Compare commits
5 Commits
11_0_0-79_
...
11_0_0-83_
Author | SHA1 | Date | |
---|---|---|---|
2538ac9ea0 | |||
dbfeaa18a3 | |||
ced08b28d4 | |||
c74a71dee1 | |||
96b002e7a9 |
12
createlinks
12
createlinks
@@ -8,12 +8,12 @@ use esmith::Build::CreateLinks qw(:all);
|
||||
my $mngrdir = '/usr/share/smanager';
|
||||
|
||||
# templates to expand
|
||||
for ( qw( sme_core.css sme_main.css sme_menu.css styles.css ) )
|
||||
{
|
||||
templates2events("$mngrdir/themes/default/public/css/$_", qw(
|
||||
bootstrap-console-save smeserver-manager-update
|
||||
));
|
||||
}
|
||||
#for ( qw( sme_core.css sme_main.css sme_menu.css styles.css ) )
|
||||
#{
|
||||
# templates2events("$mngrdir/themes/default/public/css/$_", qw(
|
||||
# bootstrap-console-save smeserver-manager-update
|
||||
# ));
|
||||
#}
|
||||
|
||||
templates2events("$mngrdir/conf/srvmngr.conf",
|
||||
qw( smeserver-manager-update smanager-theme-change smanager-modify bootstrap-console-save ));
|
||||
|
@@ -3,7 +3,7 @@ package SrvMngr::Controller::Login;
|
||||
#----------------------------------------------------------------------
|
||||
# heading : Support
|
||||
# description : Login
|
||||
# navigation : 0000 001
|
||||
# navigation : 0 200
|
||||
# menu : N
|
||||
#
|
||||
# routes : end
|
||||
|
@@ -3,7 +3,7 @@ package SrvMngr::Controller::Manual;
|
||||
#----------------------------------------------------------------------
|
||||
# heading : Support
|
||||
# description : Online manual
|
||||
# navigation : 0000 100
|
||||
# navigation : 0 300
|
||||
# menu : N
|
||||
#
|
||||
# routes : end
|
||||
|
@@ -3,7 +3,7 @@ package SrvMngr::Controller::Printers;
|
||||
#----------------------------------------------------------------------
|
||||
# heading : System
|
||||
# description : Printers
|
||||
# navigation : 4000 800
|
||||
# navigation : 4000 900
|
||||
#
|
||||
#
|
||||
# routes : end
|
||||
|
@@ -3,7 +3,7 @@ package SrvMngr::Controller::Proxy;
|
||||
#----------------------------------------------------------------------
|
||||
# heading : System
|
||||
# description : Proxy settings
|
||||
# navigation : 4000 710
|
||||
# navigation : 4000 800
|
||||
#----------------------------------------------------------------------
|
||||
#
|
||||
# routes : end
|
||||
|
@@ -3,7 +3,7 @@ package SrvMngr::Controller::Review;
|
||||
#----------------------------------------------------------------------
|
||||
# heading : Investigation
|
||||
# description : Review configuration
|
||||
# navigation : 6000 6800
|
||||
# navigation : 7000 600
|
||||
# routes : end
|
||||
#----------------------------------------------------------------------
|
||||
use strict;
|
||||
|
@@ -1,9 +1,9 @@
|
||||
package SrvMngr::Controller::Roundcubepanel;
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# heading : System
|
||||
# heading : Network
|
||||
# description : Webmail
|
||||
# navigation : 99999 9999
|
||||
# navigation : 6000 900
|
||||
#----------------------------------------------------------------------
|
||||
#----------------------------------------------------------------------
|
||||
# name : roundcubepanel, method : get, url : /roundcubepanel, ctlact : Roundcubepanel#main
|
||||
|
@@ -3,7 +3,7 @@ package SrvMngr::Controller::Support;
|
||||
#----------------------------------------------------------------------
|
||||
# heading : Support
|
||||
# description : Support and licensing
|
||||
# navigation : 0000 200
|
||||
# navigation : 0 400
|
||||
# menu : N
|
||||
#
|
||||
# routes : end
|
||||
|
@@ -69,7 +69,8 @@ sub has_panel_access {
|
||||
|
||||
# Check if requested panel is in allowed panels
|
||||
foreach my $allowed_panel (@{$auth_info->{allowed_panels}}) {
|
||||
return 1 if $panel eq lc($allowed_panel); #Controller files are capitalised, but that is lost in panel id.
|
||||
return 1 if lc($panel) eq lc($allowed_panel)
|
||||
|| lc(substr($panel, 0, length($allowed_panel))) eq lc($allowed_panel);
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -96,4 +97,4 @@ sub check_admin_access {
|
||||
return has_panel_access($c, $requested_panel);
|
||||
}
|
||||
|
||||
1; # Return true value for module loading
|
||||
1; # Return true value for module loading
|
@@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2
|
||||
%define name smeserver-manager
|
||||
Name: %{name}
|
||||
%define version 11.0.0
|
||||
%define release 79
|
||||
%define release 83
|
||||
Version: %{version}
|
||||
Release: %{release}%{?dist}
|
||||
License: GPL
|
||||
@@ -143,6 +143,15 @@ true
|
||||
%defattr(-,root,root)
|
||||
|
||||
%changelog
|
||||
* Mon May 05 2025 Brian Read <brianr@koozali.org> 11.0.0-83.sme
|
||||
- Mod to SrvMngr-Auth to account for partials matching AdminPanels options
|
||||
|
||||
* Thu May 01 2025 Brian Read <brianr@koozali.org> 11.0.0-82.sme
|
||||
- Correct Weights for menus [SME: 12996]
|
||||
|
||||
* Wed Apr 30 2025 Brian Read <brianr@koozali.org> 11.0.0-80.sme
|
||||
- Remove expansion of css files from createlinks [SME: 12989]
|
||||
|
||||
* Wed Apr 30 2025 Brian Read <brianr@koozali.org> 11.0.0-79.sme
|
||||
- Add code in SrvMngr to take note of user panel setting
|
||||
|
||||
|
Reference in New Issue
Block a user