diff --git a/lib/API/JSON/API.php b/lib/API/JSON/API.php index 0a77672a7f..4e9976b324 100644 --- a/lib/API/JSON/API.php +++ b/lib/API/JSON/API.php @@ -149,7 +149,7 @@ class API { function validatePermissions($request_method, $permissions) { // if method permission is defined, validate it if (!empty($permissions['methods'][$request_method])) { - return ($permissions['methods'][$request_method] === AccessControl::ACCESS_ALL) ? + return ($permissions['methods'][$request_method] === AccessControl::NO_ACCESS_RESTRICTION) ? true : $this->access_control->validatePermission($permissions['methods'][$request_method]); } diff --git a/lib/API/JSON/v1/Subscribers.php b/lib/API/JSON/v1/Subscribers.php index 0631806343..323d8f9d81 100644 --- a/lib/API/JSON/v1/Subscribers.php +++ b/lib/API/JSON/v1/Subscribers.php @@ -16,7 +16,7 @@ if(!defined('ABSPATH')) exit; class Subscribers extends APIEndpoint { public $permissions = array( 'global' => AccessControl::PERMISSION_MANAGE_SUBSCRIBERS, - 'methods' => array('subscribe' => AccessControl::ACCESS_ALL) + 'methods' => array('subscribe' => AccessControl::NO_ACCESS_RESTRICTION) ); function get($data = array()) { diff --git a/lib/Config/AccessControl.php b/lib/Config/AccessControl.php index c56e43778c..9604f6058a 100644 --- a/lib/Config/AccessControl.php +++ b/lib/Config/AccessControl.php @@ -8,14 +8,14 @@ if(!defined('ABSPATH')) exit; require_once(ABSPATH . 'wp-includes/pluggable.php'); 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_EMAILS = 'manage_emails'; const PERMISSION_MANAGE_SUBSCRIBERS = 'manage_subscribers'; const PERMISSION_MANAGE_FORMS = 'manage_forms'; const PERMISSION_MANAGE_SEGMENTS = 'manage_segments'; const PERMISSION_UPDATE_PLUGIN = 'update_plugin'; - const ACCESS_ALL = 'All'; + const NO_ACCESS_RESTRICTION = 'no_access_restriction'; public $permissions; public $current_user_roles; @@ -29,8 +29,8 @@ class AccessControl { private function getDefaultPermissions() { return array( - self::PERMISSION_ACCESS_PLUGIN => WPHooks::applyFilters( - 'mailpoet_permission_access_plugin', + self::PERMISSION_ACCESS_PLUGIN_ADMIN => WPHooks::applyFilters( + 'mailpoet_permission_access_plugin_admin', array( 'administrator', 'editor' diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php index 4de7dbb867..2960b1522d 100644 --- a/lib/Config/Menu.php +++ b/lib/Config/Menu.php @@ -55,7 +55,7 @@ class Menu { } 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()) { do_action('mailpoet_conflict_resolver_styles'); do_action('mailpoet_conflict_resolver_scripts');