From e7ee356f90c7def1d8b6b1c81746ff242fb36a6a Mon Sep 17 00:00:00 2001 From: Jonathan Labreuille Date: Thu, 7 Jul 2016 15:49:03 +0200 Subject: [PATCH] cleanup permissions related classes --- assets/css/src/parsley.styl | 2 +- lib/Config/Initializer.php | 6 --- lib/Config/Menu.php | 2 - lib/Config/Permissions.php | 43 ---------------- lib/Router/Permissions.php | 13 ----- lib/Util/Permissions.php | 97 ------------------------------------- 6 files changed, 1 insertion(+), 162 deletions(-) delete mode 100644 lib/Config/Permissions.php delete mode 100644 lib/Router/Permissions.php delete mode 100644 lib/Util/Permissions.php diff --git a/assets/css/src/parsley.styl b/assets/css/src/parsley.styl index 748921df00..93039f4347 100644 --- a/assets/css/src/parsley.styl +++ b/assets/css/src/parsley.styl @@ -18,7 +18,7 @@ textarea.parsley-error list-style-type none font-size 0.9em line-height 0.9em - color: #B94A48 + color #B94A48 opacity 0 transition all .3s ease-in -o-transition all .3s ease-in diff --git a/lib/Config/Initializer.php b/lib/Config/Initializer.php index c21c8c3a6b..13eebb9635 100644 --- a/lib/Config/Initializer.php +++ b/lib/Config/Initializer.php @@ -33,7 +33,6 @@ class Initializer { $this->setupRenderer(); $this->setupLocalizer(); $this->setupMenu(); - $this->setupPermissions(); $this->setupAnalytics(); $this->setupChangelog(); $this->setupShortcodes(); @@ -146,11 +145,6 @@ class Initializer { $widget->init(); } - function setupPermissions() { - $permissions = new Permissions(); - $permissions->init(); - } - function setupChangelog() { $changelog = new Changelog(); $changelog->init(); diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php index 3824014dc8..142c86b929 100644 --- a/lib/Config/Menu.php +++ b/lib/Config/Menu.php @@ -11,7 +11,6 @@ use MailPoet\Newsletter\Shortcodes\ShortcodesHelper; use MailPoet\Settings\Hosts; use MailPoet\Settings\Pages; use MailPoet\Subscribers\ImportExport\ImportExportFactory; -use MailPoet\Util\Permissions; use MailPoet\Listing; use MailPoet\WP\DateTime; @@ -259,7 +258,6 @@ class Menu { 'pages' => Pages::getAll(), 'flags' => $flags, 'current_user' => wp_get_current_user(), - 'permissions' => Permissions::getAll(), 'hosts' => array( 'web' => Hosts::getWebHosts(), 'smtp' => Hosts::getSMTPHosts() diff --git a/lib/Config/Permissions.php b/lib/Config/Permissions.php deleted file mode 100644 index d224a82dfe..0000000000 --- a/lib/Config/Permissions.php +++ /dev/null @@ -1,43 +0,0 @@ -has_cap($capability)) { - $role->add_cap($capability); - } - } - } - } - } -} diff --git a/lib/Router/Permissions.php b/lib/Router/Permissions.php deleted file mode 100644 index 0bd9273d75..0000000000 --- a/lib/Router/Permissions.php +++ /dev/null @@ -1,13 +0,0 @@ - - __('Who can create newsletters?'), - 'mailpoet_newsletter_styles' => - __('Who can see the Styles tab in the visual editor?'), - 'mailpoet_subscribers' => - __('Who can manage subscribers?'), - 'mailpoet_settings' => - __("Who can change MailPoet's settings?") - ); - $capabilities = apply_filters('mailpoet_capabilities', $capabilities); - - return $capabilities; - } - - static function getRoles() { - $roles = array(); - - global $wp_roles; - $editable_roles = apply_filters('editable_roles', $wp_roles->roles); - foreach($editable_roles as $role => $role_data) { - $roles[$role] = translate_user_role($role_data['name']); - } - - return $roles; - } - - static function getAll() { - $roles = static::getRoles(); - $capabilities = static::getCapabilities(); - - // go over each capability - foreach($capabilities as $capability => $label) { - $capability_roles = array(); - // go over each role and check permission - foreach($roles as $role_key => $role_data) { - // get role object based on role key - $role = get_role($role_key); - - // assign role capability - $capability_roles[$role_key] = array( - 'capability' => $capability, - 'is_capable' => ( - in_array($role_key, array('administrator', 'super_admin')) - || ($role->has_cap($capability)) - ), - 'is_disabled' =>( - in_array($role_key, array('administrator', 'super_admin')) - ) - ); - } - $capabilities[$capability] = array( - 'label' => $label, - 'roles' => $capability_roles - ); - } - - return array( - 'roles' => $roles, - 'capabilities' => $capabilities - ); - } - - static function set($permissions = array()) { - if(empty($permissions)) { - return false; - } - - foreach($permissions as $permission) { - // ignore administrator & superadmin roles - if(in_array( - $permission['role'], - array('administrator', 'superadmin')) - ) { - continue; - } - - // get role - $role = get_role($permission['role']); - if((bool)$permission['is_capable'] === true) { - // add capability to role - $role->add_cap($permission['capability']); - } else { - // remove capability to role - if($role->has_cap($permission['capability'])) { - $role->remove_cap($permission['capability']); - } - } - } - return true; - } -} \ No newline at end of file