diff --git a/application/controllers/Account_settings.php b/application/controllers/Account_settings.php index ba7fa7b2..874d2548 100644 --- a/application/controllers/Account_settings.php +++ b/application/controllers/Account_settings.php @@ -19,11 +19,6 @@ * @package Controllers */ class Account_settings extends EA_Controller { - /** - * @var array - */ - protected array $permissions; - /** * Current_user constructor. */ diff --git a/application/controllers/Calendar.php b/application/controllers/Calendar.php index ad6fa6a2..ea29a3d7 100644 --- a/application/controllers/Calendar.php +++ b/application/controllers/Calendar.php @@ -19,11 +19,6 @@ * @package Controllers */ class Calendar extends EA_Controller { - /** - * @var array - */ - protected $permissions; - /** * Calendar constructor. */ diff --git a/application/controllers/Google.php b/application/controllers/Google.php index f2b4c428..d6a13095 100644 --- a/application/controllers/Google.php +++ b/application/controllers/Google.php @@ -31,13 +31,6 @@ class Google extends EA_Controller { $this->load->model('appointments_model'); $this->load->model('providers_model'); $this->load->model('roles_model'); - - $role_slug = session('role_slug'); - - if ($role_slug) - { - $this->permissions = $this->roles_model->get_permissions_by_slug($role_slug); - } } /** @@ -368,7 +361,7 @@ class Google extends EA_Controller { $user_id = session('user_id'); - if ($this->permissions[PRIV_USERS]['edit'] == FALSE && (int)$user_id !== (int)$provider_id) + if (cannot('edit', PRIV_USERS) && (int)$user_id !== (int)$provider_id) { throw new Exception('You do not have the required permissions for this task.'); } @@ -408,7 +401,7 @@ class Google extends EA_Controller { $user_id = session('user_id'); if ( - $this->permissions[PRIV_USERS]['edit'] === FALSE + cannot('edit', PRIV_USERS) && (int)$user_id !== (int)$provider_id) { throw new Exception('You do not have the required permissions for this task.'); diff --git a/application/controllers/Legal_settings.php b/application/controllers/Legal_settings.php index 214e3c5b..b7463f2a 100644 --- a/application/controllers/Legal_settings.php +++ b/application/controllers/Legal_settings.php @@ -19,11 +19,6 @@ * @package Controllers */ class Legal_settings extends EA_Controller { - /** - * @var array - */ - protected array $permissions; - /** * Legal_contents constructor. */