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

Refactors AccessControl and passes it as dependency to JSON API and Menu

Browse Source
This commit is contained in:
Vlad
2017-08-14 11:28:31 -04:00
parent 51fbf29031
commit 2e5554a3af
12 changed files with 286 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/API/JSON/v1/MP2Migrator.php
View File

@ -12,8 +12,9 @@ class MP2Migrator extends APIEndpoint {
'global' => AccessControl::PERMISSION_MANAGE_SETTINGS
);
public function __construct() {
$this->MP2Migrator = new \MailPoet\Config\MP2Migrator();
public function __construct(AccessControl $access_control) {
$this->access_control = $access_control;
$this->MP2Migrator = new \MailPoet\Config\MP2Migrator($this->access_control);
}
/**

7
lib/API/JSON/v1/Setup.php
View File

@ -13,10 +13,15 @@ class Setup extends APIEndpoint {
public $permissions = array(
'global' => AccessControl::PERMISSION_MANAGE_SETTINGS
);
private $access_control;
function __construct(AccessControl $access_control) {
$this->access_control = $access_control;
}
function reset() {
try {
$activator = new Activator();
$activator = new Activator($this->access_control);
$activator->deactivate();
$activator->activate();
Hooks::doAction('mailpoet_setup_reset');

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

@ -2,7 +2,6 @@
namespace MailPoet\API\JSON\v1;
use MailPoet\API\JSON\Access as APIAccess;
use MailPoet\API\JSON\Endpoint as APIEndpoint;
use MailPoet\API\JSON\Error as APIError;
use MailPoet\Config\AccessControl;
@ -17,7 +16,7 @@ if(!defined('ABSPATH')) exit;
class Subscribers extends APIEndpoint {
public $permissions = array(
'global' => AccessControl::PERMISSION_MANAGE_SUBSCRIBERS,
'methods' => array('subscribe' => APIAccess::ALL)
'methods' => array('subscribe' => AccessControl::ACCESS_ALL)
);
function get($data = array()) {