Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Updates access permission names to improve clarity

Browse Source
This commit is contained in:
Vlad
2017-08-17 10:22:13 -04:00
parent efa231b08f
commit 4b7fb3ae3d
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/API/JSON/API.php
View File

@@ -149,7 +149,7 @@ class API {
function validatePermissions($request_method, $permissions) { function validatePermissions($request_method, $permissions) {
// if method permission is defined, validate it // if method permission is defined, validate it
if (!empty($permissions['methods'][$request_method])) { if (!empty($permissions['methods'][$request_method])) {
return ($permissions['methods'][$request_method] === AccessControl::ACCESS_ALL) ? return ($permissions['methods'][$request_method] === AccessControl::NO_ACCESS_RESTRICTION) ?
true : true :
$this->access_control->validatePermission($permissions['methods'][$request_method]); $this->access_control->validatePermission($permissions['methods'][$request_method]);
} }

2
lib/API/JSON/v1/Subscribers.php
View File

@@ -16,7 +16,7 @@ if(!defined('ABSPATH')) exit;
class Subscribers extends APIEndpoint { class Subscribers extends APIEndpoint {
public $permissions = array( public $permissions = array(
'global' => AccessControl::PERMISSION_MANAGE_SUBSCRIBERS, 'global' => AccessControl::PERMISSION_MANAGE_SUBSCRIBERS,
'methods' => array('subscribe' => AccessControl::ACCESS_ALL) 'methods' => array('subscribe' => AccessControl::NO_ACCESS_RESTRICTION)
); );
function get($data = array()) { function get($data = array()) {

8
lib/Config/AccessControl.php
View File

@@ -8,14 +8,14 @@ if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php'); require_once(ABSPATH . 'wp-includes/pluggable.php');
class AccessControl { class AccessControl {
const PERMISSION_ACCESS_PLUGIN = 'access_plugin'; const PERMISSION_ACCESS_PLUGIN_ADMIN = 'access_plugin_admin';
const PERMISSION_MANAGE_SETTINGS = 'manage_settings'; const PERMISSION_MANAGE_SETTINGS = 'manage_settings';
const PERMISSION_MANAGE_EMAILS = 'manage_emails'; const PERMISSION_MANAGE_EMAILS = 'manage_emails';
const PERMISSION_MANAGE_SUBSCRIBERS = 'manage_subscribers'; const PERMISSION_MANAGE_SUBSCRIBERS = 'manage_subscribers';
const PERMISSION_MANAGE_FORMS = 'manage_forms'; const PERMISSION_MANAGE_FORMS = 'manage_forms';
const PERMISSION_MANAGE_SEGMENTS = 'manage_segments'; const PERMISSION_MANAGE_SEGMENTS = 'manage_segments';
const PERMISSION_UPDATE_PLUGIN = 'update_plugin'; const PERMISSION_UPDATE_PLUGIN = 'update_plugin';
const ACCESS_ALL = 'All'; const NO_ACCESS_RESTRICTION = 'no_access_restriction';
public $permissions; public $permissions;
public $current_user_roles; public $current_user_roles;
@@ -29,8 +29,8 @@ class AccessControl {
private function getDefaultPermissions() { private function getDefaultPermissions() {
return array( return array(
self::PERMISSION_ACCESS_PLUGIN => WPHooks::applyFilters( self::PERMISSION_ACCESS_PLUGIN_ADMIN => WPHooks::applyFilters(
'mailpoet_permission_access_plugin', 'mailpoet_permission_access_plugin_admin',
array( array(
'administrator', 'administrator',
'editor' 'editor'

2
lib/Config/Menu.php
View File

@@ -55,7 +55,7 @@ class Menu {
} }
function setup() { function setup() {
if(!$this->access_control->validatePermission(AccessControl::PERMISSION_ACCESS_PLUGIN)) return; if(!$this->access_control->validatePermission(AccessControl::PERMISSION_ACCESS_PLUGIN_ADMIN)) return;
if(self::isOnMailPoetAdminPage()) { if(self::isOnMailPoetAdminPage()) {
do_action('mailpoet_conflict_resolver_styles'); do_action('mailpoet_conflict_resolver_styles');
do_action('mailpoet_conflict_resolver_scripts'); do_action('mailpoet_conflict_resolver_scripts');