diff --git a/application/controllers/Appointments.php b/application/controllers/Appointments.php index 72bc7300..4d28a289 100755 --- a/application/controllers/Appointments.php +++ b/application/controllers/Appointments.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.0.0 * ---------------------------------------------------------------------------- */ @@ -51,6 +51,7 @@ class Appointments extends CI_Controller { $this->load->helper('installation'); $this->load->helper('google_analytics'); + $this->load->model('appointments_model'); $this->load->model('providers_model'); $this->load->model('admins_model'); @@ -58,12 +59,15 @@ class Appointments extends CI_Controller { $this->load->model('services_model'); $this->load->model('customers_model'); $this->load->model('settings_model'); + $this->load->library('session'); $this->load->library('timezones'); $this->load->library('synchronization'); $this->load->library('notifications'); $this->load->library('availability'); + $this->load->driver('cache', ['adapter' => 'file']); + if ($this->session->userdata('language')) { // Set the user's selected language. @@ -175,8 +179,6 @@ class Appointments extends CI_Controller { $customer_token = md5(uniqid(mt_rand(), TRUE)); - $this->load->driver('cache', ['adapter' => 'file']); - // Save the token for 10 minutes. $this->cache->save('customer-token-' . $customer_token, $customer['id'], 600); } @@ -451,16 +453,6 @@ class Appointments extends CI_Controller { { try { - $this->load->model('appointments_model'); - $this->load->model('providers_model'); - $this->load->model('admins_model'); - $this->load->model('secretaries_model'); - $this->load->model('services_model'); - $this->load->model('customers_model'); - $this->load->model('settings_model'); - $this->load->library('notifications'); - $this->load->library('synchronization'); - $post_data = $this->input->post('post_data'); $captcha = $this->input->post('captcha'); $manage_mode = filter_var($post_data['manage_mode'], FILTER_VALIDATE_BOOLEAN); @@ -609,9 +601,6 @@ class Appointments extends CI_Controller { { try { - $this->load->model('providers_model'); - $this->load->model('services_model'); - $provider_id = $this->input->get('provider_id'); $service_id = $this->input->get('service_id'); $appointment_id = $this->input->get_post('appointment_id'); @@ -694,7 +683,6 @@ class Appointments extends CI_Controller { */ protected function search_providers_by_service($service_id) { - $this->load->model('providers_model'); $available_providers = $this->providers_model->get_available_providers(); $provider_list = []; diff --git a/application/controllers/Backend.php b/application/controllers/Backend.php index 82c30f83..03ef3e32 100755 --- a/application/controllers/Backend.php +++ b/application/controllers/Backend.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.0.0 * ---------------------------------------------------------------------------- */ @@ -45,7 +45,20 @@ class Backend extends CI_Controller { public function __construct() { parent::__construct(); + + $this->load->model('appointments_model'); + $this->load->model('providers_model'); + $this->load->model('services_model'); + $this->load->model('customers_model'); + $this->load->model('settings_model'); + $this->load->model('roles_model'); + $this->load->model('user_model'); + $this->load->model('secretaries_model'); + $this->load->model('admins_model'); + + $this->load->library('timezones'); $this->load->library('session'); + $this->load->library('migration'); if ($this->session->userdata('language')) { @@ -80,16 +93,6 @@ class Backend extends CI_Controller { return; } - $this->load->model('appointments_model'); - $this->load->model('providers_model'); - $this->load->model('services_model'); - $this->load->model('customers_model'); - $this->load->model('settings_model'); - $this->load->model('roles_model'); - $this->load->model('user_model'); - $this->load->model('secretaries_model'); - $this->load->library('timezones'); - $calendar_view_query_param = $this->input->get('view'); $user_id = $this->session->userdata('user_id'); @@ -196,9 +199,6 @@ class Backend extends CI_Controller { */ protected function set_user_data(&$view) { - $this->load->model('roles_model'); - - // Get privileges $view['user_id'] = $this->session->userdata('user_id'); $view['user_email'] = $this->session->userdata('user_email'); $view['timezone'] = $this->session->userdata('timezone'); @@ -220,14 +220,6 @@ class Backend extends CI_Controller { return; } - $this->load->model('providers_model'); - $this->load->model('customers_model'); - $this->load->model('secretaries_model'); - $this->load->model('services_model'); - $this->load->model('settings_model'); - $this->load->model('user_model'); - $this->load->library('timezones'); - $view['base_url'] = $this->config->item('base_url'); $view['page_title'] = lang('customers'); $view['user_display_name'] = $this->user_model->get_user_display_name($this->session->userdata('user_id')); @@ -276,12 +268,6 @@ class Backend extends CI_Controller { return; } - $this->load->model('customers_model'); - $this->load->model('services_model'); - $this->load->model('settings_model'); - $this->load->model('user_model'); - $this->load->library('timezones'); - $view['base_url'] = $this->config->item('base_url'); $view['page_title'] = lang('services'); $view['user_display_name'] = $this->user_model->get_user_display_name($this->session->userdata('user_id')); @@ -315,14 +301,6 @@ class Backend extends CI_Controller { return; } - $this->load->model('providers_model'); - $this->load->model('secretaries_model'); - $this->load->model('admins_model'); - $this->load->model('services_model'); - $this->load->model('settings_model'); - $this->load->model('user_model'); - $this->load->library('timezones'); - $view['base_url'] = $this->config->item('base_url'); $view['page_title'] = lang('users'); $view['user_display_name'] = $this->user_model->get_user_display_name($this->session->userdata('user_id')); @@ -361,11 +339,6 @@ class Backend extends CI_Controller { return; } - $this->load->model('settings_model'); - $this->load->model('user_model'); - $this->load->library('timezones'); - - $this->load->library('session'); $user_id = $this->session->userdata('user_id'); $view['base_url'] = $this->config->item('base_url'); @@ -412,8 +385,6 @@ class Backend extends CI_Controller { throw new Exception('You do not have the required privileges for this task!'); } - $this->load->library('migration'); - if ( ! $this->migration->current()) { throw new Exception($this->migration->error_string()); diff --git a/application/controllers/Backend_api.php b/application/controllers/Backend_api.php index 28e85b11..e461a445 100755 --- a/application/controllers/Backend_api.php +++ b/application/controllers/Backend_api.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.0.0 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/Captcha.php b/application/controllers/Captcha.php index d62cd2af..29a92ced 100644 --- a/application/controllers/Captcha.php +++ b/application/controllers/Captcha.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.0.0 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/Consents.php b/application/controllers/Consents.php index 4b17d035..5eef33c9 100644 --- a/application/controllers/Consents.php +++ b/application/controllers/Consents.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.3.2 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/Console.php b/application/controllers/Console.php index afea3f9c..fc371009 100644 --- a/application/controllers/Console.php +++ b/application/controllers/Console.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.3.2 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/Errors.php b/application/controllers/Errors.php index eeb05831..50a79393 100644 --- a/application/controllers/Errors.php +++ b/application/controllers/Errors.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.0.0 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/Google.php b/application/controllers/Google.php index 365af13e..cd804574 100644 --- a/application/controllers/Google.php +++ b/application/controllers/Google.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.0.0 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/Installation.php b/application/controllers/Installation.php index fb0658b0..c1c6bf9b 100644 --- a/application/controllers/Installation.php +++ b/application/controllers/Installation.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.1.0 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/Privacy.php b/application/controllers/Privacy.php index 7e744afa..0facdbae 100644 --- a/application/controllers/Privacy.php +++ b/application/controllers/Privacy.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.3.2 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/User.php b/application/controllers/User.php index ef4ae4a0..1e5e51b8 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.0.0 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/api/v1/API_V1_Controller.php b/application/controllers/api/v1/API_V1_Controller.php index 4107d45f..0baac17e 100644 --- a/application/controllers/api/v1/API_V1_Controller.php +++ b/application/controllers/api/v1/API_V1_Controller.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.2.0 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/api/v1/Admins.php b/application/controllers/api/v1/Admins.php index b33ed085..eea8404d 100644 --- a/application/controllers/api/v1/Admins.php +++ b/application/controllers/api/v1/Admins.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.2.0 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/api/v1/Appointments.php b/application/controllers/api/v1/Appointments.php index 7914ffba..e8a7540e 100644 --- a/application/controllers/api/v1/Appointments.php +++ b/application/controllers/api/v1/Appointments.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.2.0 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/api/v1/Availabilities.php b/application/controllers/api/v1/Availabilities.php index de0dfc3a..2fd346e7 100644 --- a/application/controllers/api/v1/Availabilities.php +++ b/application/controllers/api/v1/Availabilities.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.2.0 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/api/v1/Categories.php b/application/controllers/api/v1/Categories.php index 8272ae7c..c1bc0430 100644 --- a/application/controllers/api/v1/Categories.php +++ b/application/controllers/api/v1/Categories.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.2.0 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/api/v1/Customers.php b/application/controllers/api/v1/Customers.php index 713429d6..b812a6d3 100644 --- a/application/controllers/api/v1/Customers.php +++ b/application/controllers/api/v1/Customers.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.2.0 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/api/v1/Providers.php b/application/controllers/api/v1/Providers.php index 6a960371..966901e0 100644 --- a/application/controllers/api/v1/Providers.php +++ b/application/controllers/api/v1/Providers.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.2.0 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/api/v1/Secretaries.php b/application/controllers/api/v1/Secretaries.php index e858b66e..24b7b98e 100644 --- a/application/controllers/api/v1/Secretaries.php +++ b/application/controllers/api/v1/Secretaries.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.2.0 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/api/v1/Services.php b/application/controllers/api/v1/Services.php index 43124067..470b98bd 100644 --- a/application/controllers/api/v1/Services.php +++ b/application/controllers/api/v1/Services.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.2.0 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/api/v1/Settings.php b/application/controllers/api/v1/Settings.php index 6ba755d4..08edb00a 100644 --- a/application/controllers/api/v1/Settings.php +++ b/application/controllers/api/v1/Settings.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.2.0 * ---------------------------------------------------------------------------- */ diff --git a/application/controllers/api/v1/Unavailabilities.php b/application/controllers/api/v1/Unavailabilities.php index 88d224d6..47277ef0 100644 --- a/application/controllers/api/v1/Unavailabilities.php +++ b/application/controllers/api/v1/Unavailabilities.php @@ -6,8 +6,8 @@ * @package EasyAppointments * @author A.Tselegidis * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link http://easyappointments.org + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org * @since v1.2.0 * ---------------------------------------------------------------------------- */