From 8f74643437cb674ec6a271ee6824595beb60379f Mon Sep 17 00:00:00 2001
From: alextselegidis <alextselegidis@gmail.com>
Date: Mon, 15 Nov 2021 09:49:19 +0100
Subject: [PATCH] Updated the controller classes to use the slots instead

---
 application/controllers/Appointments.php | 10 +++++-----
 application/controllers/Backend.php      | 10 +++++-----
 application/controllers/User.php         |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/application/controllers/Appointments.php b/application/controllers/Appointments.php
index 5704a858..20d9bd83 100755
--- a/application/controllers/Appointments.php
+++ b/application/controllers/Appointments.php
@@ -106,7 +106,7 @@ class Appointments extends EA_Controller {
             if (empty($results))
             {
                 // The requested appointment was not found in the database. 
-                $this->load->layout('layouts/message/message_layout', 'pages/booking/booking_message_page', [
+                $this->load->view('pages/booking/booking_message_page', [
                     'message_title' => lang('appointment_not_found'),
                     'message_text' => lang('appointment_does_not_exist_in_db'),
                     'message_icon' => base_url('assets/img/error.png')
@@ -126,7 +126,7 @@ class Appointments extends EA_Controller {
                 $hours = floor($book_advance_timeout / 60);
                 $minutes = ($book_advance_timeout % 60);
 
-                $this->load->layout('layouts/message/message_layout', 'pages/booking/booking_message_page', [
+                $this->load->view('pages/booking/booking_message_page', [
                     'message_title' => lang('appointment_locked'),
                     'message_text' => strtr(lang('appointment_locked_message'), [
                         '{$limit}' => sprintf('%02d:%02d', $hours, $minutes)
@@ -159,7 +159,7 @@ class Appointments extends EA_Controller {
             $customer = [];
         }
 
-        $this->load->layout('layouts/booking/booking_layout', 'pages/booking/booking_page', [
+        $this->load->view('pages/booking/booking_page', [
             'available_services' => $available_services,
             'available_providers' => $available_providers,
             'company_name' => $company_name,
@@ -233,7 +233,7 @@ class Appointments extends EA_Controller {
             $exceptions[] = $e;
         }
 
-        $this->load->layout('layouts/message/message_layout', 'pages/booking/booking_message_page', [
+        $this->load->view('pages/booking/booking_message_page', [
             'message_title' => lang('appointment_cancelled_title'),
             'message_text' => lang('appointment_cancelled'),
             'message_icon' => base_url('assets/img/success.png'),
@@ -273,7 +273,7 @@ class Appointments extends EA_Controller {
 
         $exceptions = $this->session->flashdata('book_success') ?? [];
 
-        $this->load->layout('layouts/message/message_layout', 'pages/booking/booking_success_page', [
+        $this->load->view('pages/booking/booking_success_page', [
             'page_title' => lang('success'),
             'appointment_data' => $appointment,
             'provider_data' => [
diff --git a/application/controllers/Backend.php b/application/controllers/Backend.php
index e6b893c1..acbfb43c 100755
--- a/application/controllers/Backend.php
+++ b/application/controllers/Backend.php
@@ -105,7 +105,7 @@ class Backend extends EA_Controller {
             $view['edit_appointment'] = NULL;
         }
 
-        $this->load->layout('layouts/backend/backend_layout', 'pages/calendar/calendar_page', $view);
+        $this->load->view('pages/calendar/calendar_page', $view);
     }
 
     /**
@@ -208,7 +208,7 @@ class Backend extends EA_Controller {
 
         $this->set_user_data($view);
 
-        $this->load->layout('layouts/backend/backend_layout', 'pages/customers/customers_page', $view);
+        $this->load->view('pages/customers/customers_page', $view);
     }
 
     /**
@@ -241,7 +241,7 @@ class Backend extends EA_Controller {
         $view['timezones'] = $this->timezones->to_array();
         $this->set_user_data($view);
 
-        $this->load->layout('layouts/backend/backend_layout', 'pages/services/services_page', $view);
+        $this->load->view('pages/services/services_page', $view);
     }
 
     /**
@@ -276,7 +276,7 @@ class Backend extends EA_Controller {
         $view['working_plan_exceptions'] = '{}';
         $this->set_user_data($view);
 
-        $this->load->layout('layouts/backend/backend_layout', 'pages/users/users_page', $view);
+        $this->load->view('pages/users/users_page', $view);
     }
 
     /**
@@ -320,7 +320,7 @@ class Backend extends EA_Controller {
 
         $this->set_user_data($view);
 
-        $this->load->layout('layouts/backend/backend_layout', 'pages/settings/settings_page', $view);
+        $this->load->view('pages/settings/settings_page', $view);
     }
 
     /**
diff --git a/application/controllers/User.php b/application/controllers/User.php
index 7d38fd57..9eb6a8dc 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -43,7 +43,7 @@ class User extends EA_Controller {
      */
     public function login()
     {
-        $this->load->layout('layouts/account/account_layout', 'pages/account/account_login_page', [
+        $this->load->view('pages/account/account_login_page', [
             'base_url' => config('base_url'),
             'company_name' => setting('company_name'),
             'dest_url' => session('dest_url', site_url('backend'))
@@ -57,7 +57,7 @@ class User extends EA_Controller {
     {
         $this->session->sess_destroy();
 
-        $this->load->layout('layouts/account/account_layout', 'pages/account/account_logout_page', [
+        $this->load->view('pages/account/account_logout_page', [
             'base_url' => config('base_url'),
             'company_name' => setting('company_name')
         ]);
@@ -68,7 +68,7 @@ class User extends EA_Controller {
      */
     public function forgot_password()
     {
-        $this->load->layout('layouts/account/account_layout', 'pages/account/account_recovery_page', [
+        $this->load->view('pages/account/account_recovery_page', [
             'base_url' => config('base_url'),
             'company_name' => setting('company_name')
         ]);