From 75a5addbc2c966402889220e51b2f648817da352 Mon Sep 17 00:00:00 2001 From: Alex Tselegidis Date: Mon, 16 Nov 2020 10:29:36 +0200 Subject: [PATCH] Grouped the property tag into parent core classes so that it does not need to be repeated. --- application/config/config.php | 2 +- application/controllers/Appointments.php | 27 +---------- application/controllers/Backend.php | 22 +-------- application/controllers/Backend_api.php | 26 +--------- application/controllers/Captcha.php | 24 +--------- application/controllers/Consents.php | 25 +--------- application/controllers/Console.php | 5 +- application/controllers/Errors.php | 24 +--------- application/controllers/Google.php | 24 +--------- application/controllers/Installation.php | 25 +--------- application/controllers/Privacy.php | 24 +--------- application/controllers/User.php | 24 +--------- .../controllers/api/v1/API_V1_Controller.php | 2 +- application/controllers/api/v1/Admins.php | 22 --------- .../controllers/api/v1/Appointments.php | 24 ---------- .../controllers/api/v1/Availabilities.php | 22 --------- application/controllers/api/v1/Categories.php | 22 --------- application/controllers/api/v1/Customers.php | 22 --------- application/controllers/api/v1/Providers.php | 22 --------- .../controllers/api/v1/Secretaries.php | 22 --------- application/controllers/api/v1/Services.php | 22 --------- application/controllers/api/v1/Settings.php | 22 --------- .../controllers/api/v1/Unavailabilities.php | 22 --------- application/core/EA_Controller.php | 48 +++++++++++++++++++ application/core/EA_Migration.php | 48 +++++++++++++++++++ application/core/EA_Model.php | 48 +++++++++++++++++++ application/libraries/Availability.php | 2 +- application/libraries/Google_sync.php | 26 +++++----- application/libraries/Notifications.php | 2 +- application/libraries/Synchronization.php | 2 +- application/libraries/Timezones.php | 19 ++++---- .../migrations/001_specific_calendar_sync.php | 5 +- .../002_add_google_analytics_setting.php | 5 +- ...003_add_customer_notifications_setting.php | 5 +- .../004_add_date_format_setting.php | 5 +- .../005_add_require_captcha_setting.php | 5 +- .../006_add_calendar_view_setting.php | 5 +- .../007_add_service_availabilities_type.php | 5 +- .../008_add_service_attendants_number.php | 5 +- .../migrations/009_change_column_types.php | 5 +- .../010_add_time_format_setting.php | 5 +- ...11_remove_prefix_from_fkey_constraints.php | 5 +- application/migrations/012_legal_contents.php | 5 +- .../013_add_weekday_start_setting.php | 5 +- ...014_create_appointment_location_column.php | 5 +- ...rking_plan_exceptions_to_user_settings.php | 5 +- .../016_add_require_phone_number_setting.php | 5 +- .../migrations/017_add_api_token_setting.php | 5 +- .../migrations/018_add_timezone_to_users.php | 5 +- .../019_add_display_any_provider_setting.php | 5 +- .../migrations/020_add_language_to_users.php | 5 +- application/models/Admins_model.php | 5 +- application/models/Appointments_model.php | 5 +- application/models/Consents_model.php | 5 +- application/models/Customers_model.php | 5 +- application/models/Providers_model.php | 5 +- application/models/Roles_model.php | 5 +- application/models/Secretaries_model.php | 5 +- application/models/Services_model.php | 5 +- application/models/Settings_model.php | 5 +- application/models/User_model.php | 5 +- 61 files changed, 214 insertions(+), 607 deletions(-) create mode 100644 application/core/EA_Controller.php create mode 100644 application/core/EA_Migration.php create mode 100644 application/core/EA_Model.php diff --git a/application/config/config.php b/application/config/config.php index 96df7658..6bc96557 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -183,7 +183,7 @@ $config['enable_hooks'] = TRUE; | http://codeigniter.com/user_guide/general/creating_libraries.html | */ -$config['subclass_prefix'] = 'MY_'; +$config['subclass_prefix'] = 'EA_'; /* diff --git a/application/controllers/Appointments.php b/application/controllers/Appointments.php index 4d28a289..b53c9eac 100755 --- a/application/controllers/Appointments.php +++ b/application/controllers/Appointments.php @@ -14,34 +14,9 @@ /** * Appointments Controller * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * @property Timezones $timezones - * @property Synchronization $synchronization - * @property Notifications $notifications - * @property Availability $availability - * * @package Controllers */ -class Appointments extends CI_Controller { +class Appointments extends EA_Controller { /** * Class Constructor */ diff --git a/application/controllers/Backend.php b/application/controllers/Backend.php index 03ef3e32..3b81b1f8 100755 --- a/application/controllers/Backend.php +++ b/application/controllers/Backend.php @@ -15,30 +15,10 @@ * Backend Controller * * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model * * @package Controllers */ -class Backend extends CI_Controller { +class Backend extends EA_Controller { /** * Class Constructor */ diff --git a/application/controllers/Backend_api.php b/application/controllers/Backend_api.php index e461a445..491c297a 100755 --- a/application/controllers/Backend_api.php +++ b/application/controllers/Backend_api.php @@ -21,33 +21,9 @@ use EA\Engine\Types\Url; * * Contains all the backend AJAX callbacks. * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Synchronization $synchronization - * @property Notifications $notifications - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ -class Backend_api extends CI_Controller { +class Backend_api extends EA_Controller { /** * @var array */ diff --git a/application/controllers/Captcha.php b/application/controllers/Captcha.php index 29a92ced..a1b1d79f 100644 --- a/application/controllers/Captcha.php +++ b/application/controllers/Captcha.php @@ -14,31 +14,9 @@ /** * Captcha Controller * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ -class Captcha extends CI_Controller { +class Captcha extends EA_Controller { /** * Class Constructor */ diff --git a/application/controllers/Consents.php b/application/controllers/Consents.php index 5eef33c9..7a13215b 100644 --- a/application/controllers/Consents.php +++ b/application/controllers/Consents.php @@ -16,32 +16,9 @@ * * Handles user consent related operations. * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Consents_Model consents_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ -class Consents extends CI_Controller { +class Consents extends EA_Controller { /** * Save the user's consent. */ diff --git a/application/controllers/Console.php b/application/controllers/Console.php index fc371009..3fc51917 100644 --- a/application/controllers/Console.php +++ b/application/controllers/Console.php @@ -17,11 +17,8 @@ require_once __DIR__ .'/Google.php'; * Class Console * * CLI commands of Easy!Appointments, can only be executed from a terminal and not with a direct request. - * - * @property CI_Migration $migration - * @property Providers_model $providers_model */ -class Console extends CI_Controller { +class Console extends EA_Controller { /** * Console constructor. */ diff --git a/application/controllers/Errors.php b/application/controllers/Errors.php index 50a79393..2ac03765 100644 --- a/application/controllers/Errors.php +++ b/application/controllers/Errors.php @@ -14,31 +14,9 @@ /** * Errors Controller * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ -class Errors extends CI_Controller { +class Errors extends EA_Controller { /** * Class Constructor */ diff --git a/application/controllers/Google.php b/application/controllers/Google.php index cd804574..6b217157 100644 --- a/application/controllers/Google.php +++ b/application/controllers/Google.php @@ -16,31 +16,9 @@ * * This controller handles the Google Calendar synchronization operations. * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ -class Google extends CI_Controller { +class Google extends EA_Controller { /** * Class Constructor */ diff --git a/application/controllers/Installation.php b/application/controllers/Installation.php index c1c6bf9b..bbe032c1 100644 --- a/application/controllers/Installation.php +++ b/application/controllers/Installation.php @@ -16,32 +16,9 @@ * * This controller will handle the installation procedure of Easy!Appointments. * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property CI_Migration migration - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ -class Installation extends CI_Controller { +class Installation extends EA_Controller { /** * Class Constructor */ diff --git a/application/controllers/Privacy.php b/application/controllers/Privacy.php index 0facdbae..08073a0d 100644 --- a/application/controllers/Privacy.php +++ b/application/controllers/Privacy.php @@ -14,31 +14,9 @@ /** * Class Privacy * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ -class Privacy extends CI_Controller { +class Privacy extends EA_Controller { /** * Remove all customer data (including appointments from the system). */ diff --git a/application/controllers/User.php b/application/controllers/User.php index 1e5e51b8..54d1c24d 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -18,31 +18,9 @@ use EA\Engine\Types\NonEmptyText; /** * User Controller * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ -class User extends CI_Controller { +class User extends EA_Controller { /** * Class Constructor */ diff --git a/application/controllers/api/v1/API_V1_Controller.php b/application/controllers/api/v1/API_V1_Controller.php index 0baac17e..a46d3b13 100644 --- a/application/controllers/api/v1/API_V1_Controller.php +++ b/application/controllers/api/v1/API_V1_Controller.php @@ -22,7 +22,7 @@ use EA\Engine\Types\NonEmptyText; * * @package Controllers */ -class API_V1_Controller extends CI_Controller { +class API_V1_Controller extends EA_Controller { /** * Class Constructor * diff --git a/application/controllers/api/v1/Admins.php b/application/controllers/api/v1/Admins.php index eea8404d..48eb71c9 100644 --- a/application/controllers/api/v1/Admins.php +++ b/application/controllers/api/v1/Admins.php @@ -20,28 +20,6 @@ use EA\Engine\Types\NonEmptyText; /** * Admins Controller * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ class Admins extends API_V1_Controller { diff --git a/application/controllers/api/v1/Appointments.php b/application/controllers/api/v1/Appointments.php index e8a7540e..4593228a 100644 --- a/application/controllers/api/v1/Appointments.php +++ b/application/controllers/api/v1/Appointments.php @@ -20,30 +20,6 @@ use EA\Engine\Types\NonEmptyText; /** * Appointments Controller * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Notifications $notifications - * @property Synchronization $synchronization - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ class Appointments extends API_V1_Controller { diff --git a/application/controllers/api/v1/Availabilities.php b/application/controllers/api/v1/Availabilities.php index 2fd346e7..9bf00d1a 100644 --- a/application/controllers/api/v1/Availabilities.php +++ b/application/controllers/api/v1/Availabilities.php @@ -19,28 +19,6 @@ use EA\Engine\Types\UnsignedInteger; /** * Availabilities Controller * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ class Availabilities extends API_V1_Controller { diff --git a/application/controllers/api/v1/Categories.php b/application/controllers/api/v1/Categories.php index c1bc0430..5635117e 100644 --- a/application/controllers/api/v1/Categories.php +++ b/application/controllers/api/v1/Categories.php @@ -20,28 +20,6 @@ use EA\Engine\Types\NonEmptyText; /** * Categories Controller * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ class Categories extends API_V1_Controller { diff --git a/application/controllers/api/v1/Customers.php b/application/controllers/api/v1/Customers.php index b812a6d3..4fdf62db 100644 --- a/application/controllers/api/v1/Customers.php +++ b/application/controllers/api/v1/Customers.php @@ -20,28 +20,6 @@ use EA\Engine\Types\NonEmptyText; /** * Customers Controller * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ class Customers extends API_V1_Controller { diff --git a/application/controllers/api/v1/Providers.php b/application/controllers/api/v1/Providers.php index 966901e0..3ada9578 100644 --- a/application/controllers/api/v1/Providers.php +++ b/application/controllers/api/v1/Providers.php @@ -20,28 +20,6 @@ use EA\Engine\Types\NonEmptyText; /** * Providers Controller * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ class Providers extends API_V1_Controller { diff --git a/application/controllers/api/v1/Secretaries.php b/application/controllers/api/v1/Secretaries.php index 24b7b98e..135f0651 100644 --- a/application/controllers/api/v1/Secretaries.php +++ b/application/controllers/api/v1/Secretaries.php @@ -20,28 +20,6 @@ use EA\Engine\Types\NonEmptyText; /** * Secretaries Controller * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ class Secretaries extends API_V1_Controller { diff --git a/application/controllers/api/v1/Services.php b/application/controllers/api/v1/Services.php index 470b98bd..c3011994 100644 --- a/application/controllers/api/v1/Services.php +++ b/application/controllers/api/v1/Services.php @@ -20,28 +20,6 @@ use EA\Engine\Types\NonEmptyText; /** * Services Controller * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ class Services extends API_V1_Controller { diff --git a/application/controllers/api/v1/Settings.php b/application/controllers/api/v1/Settings.php index 08edb00a..00106408 100644 --- a/application/controllers/api/v1/Settings.php +++ b/application/controllers/api/v1/Settings.php @@ -19,28 +19,6 @@ use EA\Engine\Api\V1\Response; /** * Settings Controller * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ class Settings extends API_V1_Controller { diff --git a/application/controllers/api/v1/Unavailabilities.php b/application/controllers/api/v1/Unavailabilities.php index 47277ef0..e1ea1820 100644 --- a/application/controllers/api/v1/Unavailabilities.php +++ b/application/controllers/api/v1/Unavailabilities.php @@ -20,28 +20,6 @@ use EA\Engine\Types\NonEmptyText; /** * Unavailabilities Controller * - * @property CI_Session $session - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Security $security - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Appointments_model $appointments_model - * @property Providers_model $providers_model - * @property Services_model $services_model - * @property Customers_model $customers_model - * @property Settings_model $settings_model - * @property Timezones $timezones - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Admins_model $admins_model - * @property User_model $user_model - * * @package Controllers */ class Unavailabilities extends API_V1_Controller { diff --git a/application/core/EA_Controller.php b/application/core/EA_Controller.php new file mode 100644 index 00000000..36bad2d6 --- /dev/null +++ b/application/core/EA_Controller.php @@ -0,0 +1,48 @@ + + * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org + * @since v1.4.0 + * ---------------------------------------------------------------------------- */ + +/** + * Class MY_Controller + * + * @property CI_Loader $load + * @property CI_Input $input + * @property CI_Output $output + * @property CI_Config $config + * @property CI_Lang $lang + * @property CI_Cache $cache + * @property CI_DB_query_builder $db + * @property CI_Session $session + * @property CI_Security $security + * @property CI_Migration $migration + + * @property Admins_model $admins_model + * @property Appointments_model $appointments_model + * @property Consents_model $consents_model + * @property Customers_model $customers_model + * @property Providers_model $providers_model + * @property Roles_model $roles_model + * @property Secretaries_model $secretaries_model + * @property Services_model $services_model + * @property Settings_model $settings_model + * @property User_model $user_model + * + * @property Availability $availability + * @property Google_Sync $google_sync + * @property Ics_file $ics_file + * @property Notifications $notifications + * @property Synchronization $synchronization + * @property Timezones $timezones + */ +class EA_Controller extends CI_Controller { + // +} diff --git a/application/core/EA_Migration.php b/application/core/EA_Migration.php new file mode 100644 index 00000000..99a555bd --- /dev/null +++ b/application/core/EA_Migration.php @@ -0,0 +1,48 @@ + + * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org + * @since v1.4.0 + * ---------------------------------------------------------------------------- */ + +/** + * Class MY_Migration + * + * @property CI_Loader $load + * @property CI_Input $input + * @property CI_Output $output + * @property CI_Config $config + * @property CI_Lang $lang + * @property CI_Cache $cache + * @property CI_DB_query_builder $db + * @property CI_Session $session + * @property CI_Security $security + * @property CI_Migration $migration + * + * @property Admins_model $admins_model + * @property Appointments_model $appointments_model + * @property Consents_model $consents_model + * @property Customers_model $customers_model + * @property Providers_model $providers_model + * @property Roles_model $roles_model + * @property Secretaries_model $secretaries_model + * @property Services_model $services_model + * @property Settings_model $settings_model + * @property User_model $user_model + * + * @property Availability $availability + * @property Google_Sync $google_sync + * @property Ics_file $ics_file + * @property Notifications $notifications + * @property Synchronization $synchronization + * @property Timezones $timezones + */ +class EA_Migration extends CI_Model { + // +} diff --git a/application/core/EA_Model.php b/application/core/EA_Model.php new file mode 100644 index 00000000..b8c0fddd --- /dev/null +++ b/application/core/EA_Model.php @@ -0,0 +1,48 @@ + + * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis + * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link https://easyappointments.org + * @since v1.4.0 + * ---------------------------------------------------------------------------- */ + +/** + * Class MY_Model + * + * @property CI_Loader $load + * @property CI_Input $input + * @property CI_Output $output + * @property CI_Config $config + * @property CI_Lang $lang + * @property CI_Cache $cache + * @property CI_DB_query_builder $db + * @property CI_Session $session + * @property CI_Security $security + * @property CI_Migration $migration + * + * @property Admins_model $admins_model + * @property Appointments_model $appointments_model + * @property Consents_model $consents_model + * @property Customers_model $customers_model + * @property Providers_model $providers_model + * @property Roles_model $roles_model + * @property Secretaries_model $secretaries_model + * @property Services_model $services_model + * @property Settings_model $settings_model + * @property User_model $user_model + * + * @property Availability $availability + * @property Google_Sync $google_sync + * @property Ics_file $ics_file + * @property Notifications $notifications + * @property Synchronization $synchronization + * @property Timezones $timezones + */ +class EA_Model extends CI_Model { + // +} diff --git a/application/libraries/Availability.php b/application/libraries/Availability.php index a06539ef..4a4e2b96 100644 --- a/application/libraries/Availability.php +++ b/application/libraries/Availability.php @@ -19,7 +19,7 @@ */ class Availability { /** - * @var CI_Controller + * @var EA_Controller */ protected $CI; diff --git a/application/libraries/Google_sync.php b/application/libraries/Google_sync.php index 00cfaa13..f32e25fc 100644 --- a/application/libraries/Google_sync.php +++ b/application/libraries/Google_sync.php @@ -24,9 +24,9 @@ class Google_Sync { /** * CodeIgniter Instance * - * @var CI_Controller + * @var EA_Controller */ - protected $framework; + protected $CI; /** * Google API Client @@ -50,17 +50,17 @@ class Google_Sync { */ public function __construct() { - $this->framework =& get_instance(); + $this->CI =& get_instance(); - $this->framework->load->library('session'); + $this->CI->load->library('session'); // Initialize google client and calendar service. $this->client = new Google_Client(); - $this->client->setApplicationName($this->framework->config->item('google_application_name')); - $this->client->setClientId($this->framework->config->item('google_client_id')); - $this->client->setClientSecret($this->framework->config->item('google_client_secret')); - $this->client->setDeveloperKey($this->framework->config->item('google_api_key')); + $this->client->setApplicationName($this->CI->config->item('google_application_name')); + $this->client->setClientId($this->CI->config->item('google_client_id')); + $this->client->setClientSecret($this->CI->config->item('google_client_secret')); + $this->client->setDeveloperKey($this->CI->config->item('google_api_key')); $this->client->setRedirectUri(site_url('google/oauth_callback')); $this->client->setAccessType('offline'); $this->client->addScope([ @@ -145,7 +145,7 @@ class Google_Sync { */ public function add_appointment($appointment, $provider, $service, $customer, $settings) { - $this->framework->load->helper('general'); + $this->CI->load->helper('general'); $event = new Google_Service_Calendar_Event(); $event->setSummary(($service != NULL) ? $service['name'] : 'Unavailable'); @@ -199,7 +199,7 @@ class Google_Sync { */ public function update_appointment($appointment, $provider, $service, $customer, $settings) { - $this->framework->load->helper('general'); + $this->CI->load->helper('general'); $event = $this->service->events->get($provider['settings']['google_calendar'], $appointment['id_google_calendar']); @@ -268,7 +268,7 @@ class Google_Sync { */ public function add_unavailable($provider, $unavailable) { - $this->framework->load->helper('general'); + $this->CI->load->helper('general'); $event = new Google_Service_Calendar_Event(); $event->setSummary('Unavailable'); @@ -299,7 +299,7 @@ class Google_Sync { */ public function update_unavailable($provider, $unavailable) { - $this->framework->load->helper('general'); + $this->CI->load->helper('general'); $event = $this->service->events->get($provider['settings']['google_calendar'], $unavailable['id_google_calendar']); @@ -362,7 +362,7 @@ class Google_Sync { */ public function get_sync_events($google_calendar, $start, $end) { - $this->framework->load->helper('general'); + $this->CI->load->helper('general'); $params = [ 'timeMin' => date3339($start), diff --git a/application/libraries/Notifications.php b/application/libraries/Notifications.php index 1b675669..4723b48f 100644 --- a/application/libraries/Notifications.php +++ b/application/libraries/Notifications.php @@ -23,7 +23,7 @@ use EA\Engine\Types\Url; */ class Notifications { /** - * @var CI_Controller + * @var EA_Controller */ protected $CI; diff --git a/application/libraries/Synchronization.php b/application/libraries/Synchronization.php index a8a0100d..b9cf0f62 100644 --- a/application/libraries/Synchronization.php +++ b/application/libraries/Synchronization.php @@ -18,7 +18,7 @@ */ class Synchronization { /** - * @var CI_Controller + * @var EA_Controller */ protected $CI; diff --git a/application/libraries/Timezones.php b/application/libraries/Timezones.php index 0a28c6ac..b4b24166 100644 --- a/application/libraries/Timezones.php +++ b/application/libraries/Timezones.php @@ -20,9 +20,9 @@ */ class Timezones { /** - * @var CI_Controller + * @var EA_Controller */ - protected $framework; + protected $CI; /** * @var string @@ -464,13 +464,16 @@ class Timezones { ], ]; + /** + * Timezones constructor. + */ public function __construct() { - $this->framework = & get_instance(); + $this->CI = & get_instance(); - $this->framework->load->model('user_model'); + $this->CI->load->model('user_model'); - $this->framework->load->library('session'); + $this->CI->load->library('session'); } /** @@ -499,7 +502,7 @@ class Timezones { throw new Exception('The provided event does not have the required properties: ' . print_r($event)); } - $user_timezone = $this->framework->user_model->get_user_timezone($event['id_users_provider']); + $user_timezone = $this->CI->user_model->get_user_timezone($event['id_users_provider']); $session_timezone = $this->get_session_timezone(); @@ -522,8 +525,8 @@ class Timezones { { $default_timezone = $this->get_default_timezone(); - return $this->framework->session->has_userdata('timezone') - ? $this->framework->session->userdata('timezone') + return $this->CI->session->has_userdata('timezone') + ? $this->CI->session->userdata('timezone') : $default_timezone; } diff --git a/application/migrations/001_specific_calendar_sync.php b/application/migrations/001_specific_calendar_sync.php index d7a190ae..fa86d3d0 100644 --- a/application/migrations/001_specific_calendar_sync.php +++ b/application/migrations/001_specific_calendar_sync.php @@ -16,11 +16,8 @@ * * Notice: This first migration got altered to include the creation of the initial database structure so that external * SQL are not required. - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Specific_calendar_sync extends CI_Migration { +class Migration_Specific_calendar_sync extends EA_Migration { /** * Upgrade method. */ diff --git a/application/migrations/002_add_google_analytics_setting.php b/application/migrations/002_add_google_analytics_setting.php index e39402c8..87e06d2d 100644 --- a/application/migrations/002_add_google_analytics_setting.php +++ b/application/migrations/002_add_google_analytics_setting.php @@ -13,11 +13,8 @@ /** * Class Migration_Add_google_analytics_setting - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Add_google_analytics_setting extends CI_Migration { +class Migration_Add_google_analytics_setting extends EA_Migration { /** * Upgrade method. * diff --git a/application/migrations/003_add_customer_notifications_setting.php b/application/migrations/003_add_customer_notifications_setting.php index a90d33b5..33cff6ea 100644 --- a/application/migrations/003_add_customer_notifications_setting.php +++ b/application/migrations/003_add_customer_notifications_setting.php @@ -13,11 +13,8 @@ /** * Class Migration_Add_customer_notifications_setting - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Add_customer_notifications_setting extends CI_Migration { +class Migration_Add_customer_notifications_setting extends EA_Migration { /** * Upgrade method. * diff --git a/application/migrations/004_add_date_format_setting.php b/application/migrations/004_add_date_format_setting.php index 5dd22026..757585bc 100644 --- a/application/migrations/004_add_date_format_setting.php +++ b/application/migrations/004_add_date_format_setting.php @@ -13,11 +13,8 @@ /** * Class Migration_Add_date_format_setting - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Add_date_format_setting extends CI_Migration { +class Migration_Add_date_format_setting extends EA_Migration { /** * Upgrade method. * diff --git a/application/migrations/005_add_require_captcha_setting.php b/application/migrations/005_add_require_captcha_setting.php index 84867be8..c47a199d 100644 --- a/application/migrations/005_add_require_captcha_setting.php +++ b/application/migrations/005_add_require_captcha_setting.php @@ -13,11 +13,8 @@ /** * Class Migration_Add_require_captcha_setting - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Add_require_captcha_setting extends CI_Migration { +class Migration_Add_require_captcha_setting extends EA_Migration { /** * Upgrade method. * diff --git a/application/migrations/006_add_calendar_view_setting.php b/application/migrations/006_add_calendar_view_setting.php index e7ad51f5..9d68a018 100644 --- a/application/migrations/006_add_calendar_view_setting.php +++ b/application/migrations/006_add_calendar_view_setting.php @@ -13,11 +13,8 @@ /** * Class Migration_Add_calendar_view_setting - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Add_calendar_view_setting extends CI_Migration { +class Migration_Add_calendar_view_setting extends EA_Migration { /** * Upgrade method. */ diff --git a/application/migrations/007_add_service_availabilities_type.php b/application/migrations/007_add_service_availabilities_type.php index 14d824ec..a78f8592 100644 --- a/application/migrations/007_add_service_availabilities_type.php +++ b/application/migrations/007_add_service_availabilities_type.php @@ -13,11 +13,8 @@ /** * Class Migration_Add_service_availabilities_type - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Add_service_availabilities_type extends CI_Migration { +class Migration_Add_service_availabilities_type extends EA_Migration { /** * Upgrade method. */ diff --git a/application/migrations/008_add_service_attendants_number.php b/application/migrations/008_add_service_attendants_number.php index 728abcb9..e44ff518 100644 --- a/application/migrations/008_add_service_attendants_number.php +++ b/application/migrations/008_add_service_attendants_number.php @@ -13,11 +13,8 @@ /** * Class Migration_Add_service_attendants_number - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Add_service_attendants_number extends CI_Migration { +class Migration_Add_service_attendants_number extends EA_Migration { /** * Upgrade method. */ diff --git a/application/migrations/009_change_column_types.php b/application/migrations/009_change_column_types.php index 05b8bbca..2e802a9d 100644 --- a/application/migrations/009_change_column_types.php +++ b/application/migrations/009_change_column_types.php @@ -13,11 +13,8 @@ /** * Class Migration_Change_column_types - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Change_column_types extends CI_Migration { +class Migration_Change_column_types extends EA_Migration { /** * Upgrade method. */ diff --git a/application/migrations/010_add_time_format_setting.php b/application/migrations/010_add_time_format_setting.php index e7f09463..cf243af7 100644 --- a/application/migrations/010_add_time_format_setting.php +++ b/application/migrations/010_add_time_format_setting.php @@ -13,11 +13,8 @@ /** * Class Migration_Add_time_format_setting - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Add_time_format_setting extends CI_Migration { +class Migration_Add_time_format_setting extends EA_Migration { /** * Upgrade method. */ diff --git a/application/migrations/011_remove_prefix_from_fkey_constraints.php b/application/migrations/011_remove_prefix_from_fkey_constraints.php index 92a8f499..8d3dfefc 100644 --- a/application/migrations/011_remove_prefix_from_fkey_constraints.php +++ b/application/migrations/011_remove_prefix_from_fkey_constraints.php @@ -13,11 +13,8 @@ /** * Class Migration_Remove_prefix_from_foreign_keys - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Remove_prefix_from_fkey_constraints extends CI_Migration { +class Migration_Remove_prefix_from_fkey_constraints extends EA_Migration { /** * Upgrade method. */ diff --git a/application/migrations/012_legal_contents.php b/application/migrations/012_legal_contents.php index 7235e786..020a1d67 100644 --- a/application/migrations/012_legal_contents.php +++ b/application/migrations/012_legal_contents.php @@ -13,11 +13,8 @@ /** * Class Migration_Create_consents_table - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Legal_contents extends CI_Migration { +class Migration_Legal_contents extends EA_Migration { /** * Upgrade method. */ diff --git a/application/migrations/013_add_weekday_start_setting.php b/application/migrations/013_add_weekday_start_setting.php index df568e76..342ebdea 100644 --- a/application/migrations/013_add_weekday_start_setting.php +++ b/application/migrations/013_add_weekday_start_setting.php @@ -13,11 +13,8 @@ /** * Class Migration_Add_weekday_start_setting - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Add_weekday_start_setting extends CI_Migration { +class Migration_Add_weekday_start_setting extends EA_Migration { /** * Upgrade method. */ diff --git a/application/migrations/014_create_appointment_location_column.php b/application/migrations/014_create_appointment_location_column.php index d41119c7..a994b697 100644 --- a/application/migrations/014_create_appointment_location_column.php +++ b/application/migrations/014_create_appointment_location_column.php @@ -13,11 +13,8 @@ /** * Class Migration_Create_appointment_location_column - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Create_appointment_location_column extends CI_Migration { +class Migration_Create_appointment_location_column extends EA_Migration { /** * Upgrade method. */ diff --git a/application/migrations/015_add_working_plan_exceptions_to_user_settings.php b/application/migrations/015_add_working_plan_exceptions_to_user_settings.php index 0039ee43..bd5c62c8 100644 --- a/application/migrations/015_add_working_plan_exceptions_to_user_settings.php +++ b/application/migrations/015_add_working_plan_exceptions_to_user_settings.php @@ -13,11 +13,8 @@ /** * Class Migration_Add_working_plan_exceptions_to_user_settings - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Add_working_plan_exceptions_to_user_settings extends CI_Migration { +class Migration_Add_working_plan_exceptions_to_user_settings extends EA_Migration { /** * Upgrade method. */ diff --git a/application/migrations/016_add_require_phone_number_setting.php b/application/migrations/016_add_require_phone_number_setting.php index 92d3676d..d51a919e 100644 --- a/application/migrations/016_add_require_phone_number_setting.php +++ b/application/migrations/016_add_require_phone_number_setting.php @@ -13,11 +13,8 @@ /** * Class Migration_Add_require_phone_number_setting - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Add_require_phone_number_setting extends CI_Migration { +class Migration_Add_require_phone_number_setting extends EA_Migration { /** * Upgrade method. */ diff --git a/application/migrations/017_add_api_token_setting.php b/application/migrations/017_add_api_token_setting.php index 71a4dcf6..bd1351f2 100644 --- a/application/migrations/017_add_api_token_setting.php +++ b/application/migrations/017_add_api_token_setting.php @@ -13,11 +13,8 @@ /** * Class Migration_Add_api_token_setting - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Add_api_token_setting extends CI_Migration { +class Migration_Add_api_token_setting extends EA_Migration { /** * Upgrade method. * diff --git a/application/migrations/018_add_timezone_to_users.php b/application/migrations/018_add_timezone_to_users.php index add3aac0..79744039 100644 --- a/application/migrations/018_add_timezone_to_users.php +++ b/application/migrations/018_add_timezone_to_users.php @@ -13,11 +13,8 @@ /** * Class Migration_Add_timezone_to_users - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Add_timezone_to_users extends CI_Migration { +class Migration_Add_timezone_to_users extends EA_Migration { /** * Upgrade method. */ diff --git a/application/migrations/019_add_display_any_provider_setting.php b/application/migrations/019_add_display_any_provider_setting.php index 5827ce52..3d46e44e 100644 --- a/application/migrations/019_add_display_any_provider_setting.php +++ b/application/migrations/019_add_display_any_provider_setting.php @@ -13,11 +13,8 @@ /** * Class Migration_Add_display_any_provider_setting - * - * @property CI_DB_query_builder $db - * @property CI_DB_forge dbforge */ -class Migration_Add_display_any_provider_setting extends CI_Migration { +class Migration_Add_display_any_provider_setting extends EA_Migration { /** * Upgrade method. */ diff --git a/application/migrations/020_add_language_to_users.php b/application/migrations/020_add_language_to_users.php index 329b74df..68f4440d 100644 --- a/application/migrations/020_add_language_to_users.php +++ b/application/migrations/020_add_language_to_users.php @@ -13,11 +13,8 @@ /** * Class Migration_Add_language_to_users - * - * @property CI_DB_query_builder db - * @property CI_DB_forge dbforge */ -class Migration_Add_language_to_users extends CI_Migration { +class Migration_Add_language_to_users extends EA_Migration { /** * Upgrade method. */ diff --git a/application/models/Admins_model.php b/application/models/Admins_model.php index 9e6b1efd..8d3e2739 100644 --- a/application/models/Admins_model.php +++ b/application/models/Admins_model.php @@ -16,12 +16,9 @@ * * Handles the database actions for admin users management. * - * @property CI_DB_query_builder $db - * @property CI_Loader $load - * * @package Models */ -class Admins_model extends CI_Model { +class Admins_model extends EA_Model { public function __construct() { parent::__construct(); diff --git a/application/models/Appointments_model.php b/application/models/Appointments_model.php index 4c4af32f..7d6a2e13 100644 --- a/application/models/Appointments_model.php +++ b/application/models/Appointments_model.php @@ -14,12 +14,9 @@ /** * Appointments Model * - * @property CI_DB_query_builder $db - * @property CI_Loader $load - * * @package Models */ -class Appointments_model extends CI_Model { +class Appointments_model extends EA_Model { /** * Appointments_Model constructor. */ diff --git a/application/models/Consents_model.php b/application/models/Consents_model.php index 49d0e524..b28432f7 100644 --- a/application/models/Consents_model.php +++ b/application/models/Consents_model.php @@ -14,12 +14,9 @@ /** * Class Consents_model * - * @property CI_DB_query_builder $db - * @property CI_Loader $load - * * @package Models */ -class Consents_model extends CI_Model { +class Consents_model extends EA_Model { /** * Add a consent record to the database. * diff --git a/application/models/Customers_model.php b/application/models/Customers_model.php index cb44ad13..7a5a03bb 100644 --- a/application/models/Customers_model.php +++ b/application/models/Customers_model.php @@ -14,12 +14,9 @@ /** * Customers Model * - * @property CI_DB_query_builder $db - * @property CI_Loader $load - * * @package Models */ -class Customers_model extends CI_Model { +class Customers_model extends EA_Model { /** * Customers_Model constructor. */ diff --git a/application/models/Providers_model.php b/application/models/Providers_model.php index fa2c4043..6d703363 100755 --- a/application/models/Providers_model.php +++ b/application/models/Providers_model.php @@ -16,12 +16,9 @@ * * Contains the database operations for the service provider users of Easy!Appointments. * - * @property CI_DB_query_builder $db - * @property CI_Loader $load - * * @package Models */ -class Providers_model extends CI_Model { +class Providers_model extends EA_Model { /** * Providers_Model constructor. */ diff --git a/application/models/Roles_model.php b/application/models/Roles_model.php index 9851998e..766552c5 100644 --- a/application/models/Roles_model.php +++ b/application/models/Roles_model.php @@ -14,12 +14,9 @@ /** * Roles Model * - * @property CI_DB_query_builder $db - * @property CI_Loader $load - * * @package Models */ -class Roles_model extends CI_Model { +class Roles_model extends EA_Model { /** * Get the record id of a particular role. * diff --git a/application/models/Secretaries_model.php b/application/models/Secretaries_model.php index 9e89abe7..6446b9ec 100644 --- a/application/models/Secretaries_model.php +++ b/application/models/Secretaries_model.php @@ -16,12 +16,9 @@ * * Handles the db actions that have to do with secretaries. * - * @property CI_DB_query_builder $db - * @property CI_Loader $load - * * @package Models */ -class Secretaries_model extends CI_Model { +class Secretaries_model extends EA_Model { /** * Secretaries_Model constructor. */ diff --git a/application/models/Services_model.php b/application/models/Services_model.php index 4d0ec770..dcbb1c4a 100644 --- a/application/models/Services_model.php +++ b/application/models/Services_model.php @@ -14,12 +14,9 @@ /** * Services Model * - * @property CI_DB_query_builder $db - * @property CI_Loader $load - * * @package Models */ -class Services_model extends CI_Model { +class Services_model extends EA_Model { /** * Services_Model constructor. */ diff --git a/application/models/Settings_model.php b/application/models/Settings_model.php index c197a028..530c1f66 100644 --- a/application/models/Settings_model.php +++ b/application/models/Settings_model.php @@ -14,12 +14,9 @@ /** * Settings Model * - * @property CI_DB_query_builder $db - * @property CI_Loader $load - * * @package Models */ -class Settings_model extends CI_Model { +class Settings_model extends EA_Model { /** * Get setting value from database. * diff --git a/application/models/User_model.php b/application/models/User_model.php index 88c54533..00e31655 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -16,12 +16,9 @@ * * Contains current user's methods. * - * @property CI_DB_query_builder $db - * @property CI_Loader $load - * * @package Models */ -class User_model extends CI_Model { +class User_model extends EA_Model { /** * User_Model constructor. */