From 80c01e06f8aa24d68cb04d407923515d242a1a7d Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Mon, 13 Feb 2017 13:58:38 -0200 Subject: Revert "Add privs to control display of notices" Fix #7051 This reverts commit 04665e78537906f7375668ca665cba17f95a4864. --- src/etc/inc/priv/user.priv.inc | 8 -------- src/usr/local/www/head.inc | 24 ++++-------------------- 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; - } -} ?>