summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/etc/inc/priv/user.priv.inc8
-rw-r--r--src/usr/local/www/head.inc24
2 files changed, 4 insertions, 28 deletions
diff --git a/src/etc/inc/priv/user.priv.inc b/src/etc/inc/priv/user.priv.inc
index cb84349..fc8ac68 100644
--- a/src/etc/inc/priv/user.priv.inc
+++ b/src/etc/inc/priv/user.priv.inc
@@ -34,14 +34,6 @@ $priv_list['user-config-readonly'] = array();
$priv_list['user-config-readonly']['name'] = gettext("User - Config: Deny Config Write");
$priv_list['user-config-readonly']['descr'] = gettext("If present, ignores requests from this user to write config.xml.");
-$priv_list['user-view-notices'] = array();
-$priv_list['user-view-notices']['name'] = gettext("User - Notices: View");
-$priv_list['user-view-notices']['descr'] = gettext("This user can view system notices.");
-
-$priv_list['user-view-clear-notices'] = array();
-$priv_list['user-view-clear-notices']['name'] = gettext("User - Notices: View and Clear");
-$priv_list['user-view-clear-notices']['descr'] = gettext("This user can view and clear system notices.");
-
$priv_list['user-shell-access'] = array();
$priv_list['user-shell-access']['name'] = gettext("User - System: Shell account access");
$priv_list['user-shell-access']['descr'] = gettext("Indicates whether the user is able to login for example via SSH.");
diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc
index 456eaac..99561be 100644
--- a/src/usr/local/www/head.inc
+++ b/src/usr/local/www/head.inc
@@ -437,20 +437,6 @@ $numColumns = $user_settings['webgui']['dashboardcolumns'];
if (($pagename === "index.php") && ($numColumns > 2)) {
$columnsContainer = 'style="max-width: ' . 585*$numColumns . 'px;width: 100%"';
}
-
-$display_notices = false;
-$allow_clear_notices = false;
-
-if (are_notices_pending()) {
- // Evaluate user privs to determine if notices should be displayed, and if the user can clear them.
- $user_entry = getUserEntry($_SESSION['Username']);
- if (userHasPrivilege($user_entry, "user-view-clear-notices") || userHasPrivilege($user_entry, "page-all")) {
- $display_notices = true;
- $allow_clear_notices = true;
- } elseif (userHasPrivilege($user_entry, "user-view-notices")) {
- $display_notices = true;
- }
-}
?>
<body id="<?=$numColumns?>">
<nav id="topmenu" class="navbar navbar-<?=$menuclass?>-top navbar-inverse">
@@ -500,7 +486,7 @@ if (are_notices_pending()) {
<?php endforeach?>
</ul>
<ul class="nav navbar-nav navbar-right">
- <?php if ($display_notices):?>
+ <?php if (are_notices_pending()):?>
<?php $notices = get_notices()?>
<li class="dropdown">
<a href="#" data-toggle="modal" data-target="#notices" role="button" aria-expanded="false">
@@ -661,8 +647,7 @@ if ($config['remote_managed_pages']['item']) {
// Modal notices window
// The notices modal needs to be outside of the page display div or things get messy
-if ($display_notices):
-?>
+if (are_notices_pending()):?>
<div id="notices" class="modal fade" role="dialog">
<div class="modal-dialog">
@@ -712,7 +697,7 @@ if ($display_notices):
<div class="modal-footer">
<button type="button" class="btn btn-info" data-dismiss="modal"><i class="fa fa-times icon-embed-btn"></i><?=gettext("Close")?></button>
-<?php if ($allow_clear_notices && isAllowedPage("/index.php")):?>
+<?php if (isAllowedPage("/index.php")):?>
<button type="button" id="clearallnotices" class="btn btn-primary"><i class="fa fa-trash-o icon-embed-btn"></i><?=gettext("Mark All as Read")?></button>
<?php endif;?>
</div>
@@ -740,8 +725,7 @@ if ($display_notices):
//]]>
</script>
-<?php
-endif; // ($display_notices)
+<?php endif;
// Get the flash Messages
get_flash_message();
OpenPOWER on IntegriCloud