-
' . $exc->getTraceAsString() . '
+
' . $exception->getTraceAsString() . '
';
}
-
-/**
- * Get a javascript object of a given exception.
- *
- * This method is pretty useful whenever we need to pass an exception object
- * to javascript during ajax calls.
- *
- * @param Exception $exception The given exception object.
- * @return string Returns the json encoded object of the exception.
- */
-function exceptionToJavaScript($exception)
-{
- return json_encode([
- 'code' => $exception->getCode(),
- 'file' => $exception->getFile(),
- 'line' => $exception->getLine(),
- 'message' => $exception->getMessage(),
- 'previous' => $exception->getPrevious(),
- 'trace' => $exception->getTraceAsString()
- ]);
-}
diff --git a/application/helpers/data_validation_helper.php b/application/helpers/data_validation_helper.php
index ac71b416..1d73e3e6 100644
--- a/application/helpers/data_validation_helper.php
+++ b/application/helpers/data_validation_helper.php
@@ -1,4 +1,4 @@
-load->model('settings_model');
+ $framework->load->model('settings_model');
- $google_analytics_code = $ci->settings_model->get_setting('google_analytics_code');
+ $google_analytics_code = $framework->settings_model->get_setting('google_analytics_code');
if ($google_analytics_code !== '')
{
diff --git a/application/helpers/installation_helper.php b/application/helpers/installation_helper.php
index 27b58955..3ed27bca 100644
--- a/application/helpers/installation_helper.php
+++ b/application/helpers/installation_helper.php
@@ -1,4 +1,4 @@
-db->table_exists('ea_users');
+ $framework =& get_instance();
+
+ return $framework->db->table_exists('ea_users');
}
/**
diff --git a/application/helpers/render_helper.php b/application/helpers/render_helper.php
index bddbd394..c59f6d54 100644
--- a/application/helpers/render_helper.php
+++ b/application/helpers/render_helper.php
@@ -1,4 +1,4 @@
-CI =& get_instance();
+ $this->framework =& get_instance();
- $this->CI->load->library('session');
+ $this->framework->load->library('session');
// Initialize google client and calendar service.
$this->client = new Google_Client();
$this->client->setUseObjects(TRUE);
- $this->client->setApplicationName(Config::GOOGLE_PRODUCT_NAME);
- $this->client->setClientId(Config::GOOGLE_CLIENT_ID);
- $this->client->setClientSecret(Config::GOOGLE_CLIENT_SECRET);
- $this->client->setDeveloperKey(Config::GOOGLE_API_KEY);
+ $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->setRedirectUri(site_url('google/oauth_callback'));
$this->service = new Google_CalendarService($this->client);
@@ -121,29 +121,26 @@ class Google_Sync {
/**
* Add an appointment record to its providers Google Calendar account.
*
- * This method checks whether the appointment's provider has enabled the Google
- * Sync utility of Easy!Appointments and the stored access token is still valid.
- * If yes, the selected appointment record is going to be added to the Google
- * Calendar account.
+ * This method checks whether the appointment's provider has enabled the Google Sync utility of Easy!Appointments
+ * and the stored access token is still valid. If yes, the selected appointment record is going to be added to the
+ * Google Calendar account.
*
* @param array $appointment Contains the appointment record data.
* @param array $provider Contains the provider record data.
* @param array $service Contains the service record data.
* @param array $customer Contains the customer recod data.
- * @parma array $company_settings Contains some company settings that are used
- * by this method. By the time the following values must be in the array:
- * 'company_name'.
+ * @param array $settings Contains some company settings that are used by this method.
*
* @return Google_Event Returns the Google_Event class object.
*/
- public function add_appointment($appointment, $provider, $service, $customer, $company_settings)
+ public function add_appointment($appointment, $provider, $service, $customer, $settings)
{
- $this->CI->load->helper('general');
+ $this->framework->load->helper('general');
$event = new Google_Event();
$event->setSummary(($service != NULL) ? $service['name'] : 'Unavailable');
$event->setDescription($appointment['notes']);
- $event->setLocation(isset($appointment['location']) ? $appointment['location'] : $company_settings['company_name']);
+ $event->setLocation(isset($appointment['location']) ? $appointment['location'] : $settings['company_name']);
$start = new Google_EventDateTime();
$start->setDateTime(date3339(strtotime($appointment['start_datetime'])));
@@ -186,22 +183,20 @@ class Google_Sync {
* @param array $provider Contains the provider record data.
* @param array $service Contains the service record data.
* @param array $customer Contains the customer recod data.
- * @parma array $company_settings Contains some company settings that are used
- * by this method. By the time the following values must be in the array:
- * 'company_name'.
+ * @parma array $company_settings Contains some company settings that are used by this method.
*
* @return Google_Event Returns the Google_Event class object.
*/
- public function update_appointment($appointment, $provider, $service, $customer, $company_settings)
+ public function update_appointment($appointment, $provider, $service, $customer, $settings)
{
- $this->CI->load->helper('general');
+ $this->framework->load->helper('general');
$event = $this->service->events->get($provider['settings']['google_calendar'],
$appointment['id_google_calendar']);
$event->setSummary($service['name']);
$event->setDescription($appointment['notes']);
- $event->setLocation(isset($appointment['location']) ? $appointment['location'] : $company_settings['company_name']);
+ $event->setLocation(isset($appointment['location']) ? $appointment['location'] : $settings['company_name']);
$start = new Google_EventDateTime();
$start->setDateTime(date3339(strtotime($appointment['start_datetime'])));
@@ -263,7 +258,7 @@ class Google_Sync {
*/
public function add_unavailable($provider, $unavailable)
{
- $this->CI->load->helper('general');
+ $this->framework->load->helper('general');
$event = new Google_Event();
$event->setSummary('Unavailable');
@@ -294,7 +289,7 @@ class Google_Sync {
*/
public function update_unavailable($provider, $unavailable)
{
- $this->CI->load->helper('general');
+ $this->framework->load->helper('general');
$event = $this->service->events->get($provider['settings']['google_calendar'],
$unavailable['id_google_calendar']);
@@ -349,20 +344,20 @@ class Google_Sync {
* Get all the events between the sync period.
*
* @param string $google_calendar The name of the google calendar to be used.
- * @param date $start The start date of sync period.
- * @param date $end The end date of sync period.
+ * @param string $start The start date of sync period.
+ * @param string $end The end date of sync period.
*
* @return object Returns an array with Google_Event objects that belong on the given
* sync period (start, end).
*/
public function get_sync_events($google_calendar, $start, $end)
{
- $this->CI->load->helper('general');
+ $this->framework->load->helper('general');
$params = [
'timeMin' => date3339($start),
'timeMax' => date3339($end),
- 'singleEvents' => true,
+ 'singleEvents' => TRUE,
];
return $this->service->events->listEvents($google_calendar, $params);
diff --git a/application/libraries/Ics_file.php b/application/libraries/Ics_file.php
index 56ff6dff..f5d4094d 100644
--- a/application/libraries/Ics_file.php
+++ b/application/libraries/Ics_file.php
@@ -1,4 +1,4 @@
-db->field_exists('google_calendar', 'ea_user_settings'))
@@ -28,6 +36,9 @@ class Migration_Specific_calendar_sync extends CI_Migration {
}
}
+ /**
+ * Downgrade method.
+ */
public function down()
{
if ($this->db->field_exists('google_calendar', 'ea_user_settings'))
diff --git a/application/migrations/002_add_google_analytics_setting.php b/application/migrations/002_add_google_analytics_setting.php
index 442763ad..191c2be4 100644
--- a/application/migrations/002_add_google_analytics_setting.php
+++ b/application/migrations/002_add_google_analytics_setting.php
@@ -1,4 +1,4 @@
-load->model('settings_model');
+ }
+
+ /**
+ * Upgrade method.
+ *
+ * @throws Exception
+ */
public function up()
{
- $this->load->model('settings_model');
-
try
{
$this->settings_model->get_setting('google_analytics_code');
@@ -26,10 +49,13 @@ class Migration_Add_google_analytics_setting extends CI_Migration {
}
}
+ /**
+ * Downgrade method.
+ *
+ * @throws Exception
+ */
public function down()
{
- $this->load->model('settings_model');
-
$this->settings_model->remove_setting('google_analytics_code');
}
}
diff --git a/application/migrations/003_add_customer_notifications_setting.php b/application/migrations/003_add_customer_notifications_setting.php
index 6c860c1f..0056d566 100644
--- a/application/migrations/003_add_customer_notifications_setting.php
+++ b/application/migrations/003_add_customer_notifications_setting.php
@@ -1,4 +1,4 @@
-load->model('settings_model');
+ }
+
+ /**
+ * Upgrade method.
+ *
+ * @throws Exception
+ */
public function up()
{
- $this->load->model('settings_model');
-
try
{
$this->settings_model->get_setting('customer_notifications');
@@ -26,10 +48,13 @@ class Migration_Add_customer_notifications_setting extends CI_Migration {
}
}
+ /**
+ * Downgrade method.
+ *
+ * @throws Exception
+ */
public function down()
{
- $this->load->model('settings_model');
-
$this->settings_model->remove_setting('customer_notifications');
}
}
diff --git a/application/migrations/004_add_date_format_setting.php b/application/migrations/004_add_date_format_setting.php
index 85a38d90..5e382047 100644
--- a/application/migrations/004_add_date_format_setting.php
+++ b/application/migrations/004_add_date_format_setting.php
@@ -1,4 +1,4 @@
-load->model('settings_model');
+ }
+
+
+ /**
+ * Upgrade method.
+ *
+ * @throws Exception
+ */
public function up()
{
- $this->load->model('settings_model');
-
try
{
$this->settings_model->get_setting('date_format');
@@ -26,10 +50,13 @@ class Migration_Add_date_format_setting extends CI_Migration {
}
}
+ /**
+ * Downgrade method.
+ *
+ * @throws Exception
+ */
public function down()
{
- $this->load->model('settings_model');
-
$this->settings_model->remove_setting('date_format');
}
}
diff --git a/application/migrations/005_add_require_captcha_setting.php b/application/migrations/005_add_require_captcha_setting.php
index 438d60c2..e544d2d6 100644
--- a/application/migrations/005_add_require_captcha_setting.php
+++ b/application/migrations/005_add_require_captcha_setting.php
@@ -1,4 +1,4 @@
-load->model('settings_model');
+ }
+
+ /**
+ * Upgrade method.
+ *
+ * @throws Exception
+ */
public function up()
{
- $this->load->model('settings_model');
-
try
{
$this->settings_model->get_setting('require_captcha');
@@ -26,10 +49,13 @@ class Migration_Add_require_captcha_setting extends CI_Migration {
}
}
+ /**
+ * Downgrade method.
+ *
+ * @throws Exception
+ */
public function down()
{
- $this->load->model('settings_model');
-
$this->settings_model->remove_setting('require_captcha');
}
}
diff --git a/application/migrations/006_add_calendar_view_setting.php b/application/migrations/006_add_calendar_view_setting.php
index fedbce06..32fd181a 100644
--- a/application/migrations/006_add_calendar_view_setting.php
+++ b/application/migrations/006_add_calendar_view_setting.php
@@ -1,4 +1,4 @@
-db->field_exists('calendar_view', 'ea_user_settings'))
@@ -30,6 +41,9 @@ class Migration_Add_calendar_view_setting extends CI_Migration {
}
}
+ /**
+ * Downgrade method.
+ */
public function down()
{
if ($this->db->field_exists('calendar_view', 'ea_user_settings'))
diff --git a/application/migrations/007_add_service_availabilities_type.php b/application/migrations/007_add_service_availabilities_type.php
index 34230c34..13acd9ba 100644
--- a/application/migrations/007_add_service_availabilities_type.php
+++ b/application/migrations/007_add_service_availabilities_type.php
@@ -1,4 +1,4 @@
-db->field_exists('availabilities_type', 'ea_services'))
@@ -31,6 +42,9 @@ class Migration_Add_service_availabilities_type extends CI_Migration {
}
}
+ /**
+ * Downgrade method.
+ */
public function down()
{
if ($this->db->field_exists('availabilities_type', 'ea_services'))
diff --git a/application/migrations/008_add_service_attendants_number.php b/application/migrations/008_add_service_attendants_number.php
index c4740ebe..bd8460df 100644
--- a/application/migrations/008_add_service_attendants_number.php
+++ b/application/migrations/008_add_service_attendants_number.php
@@ -1,4 +1,4 @@
-db->field_exists('attendants_number', 'ea_services'))
@@ -31,6 +42,9 @@ class Migration_Add_service_attendants_number extends CI_Migration {
}
}
+ /**
+ * Downgrade method.
+ */
public function down()
{
if ($this->db->field_exists('attendants_number', 'ea_services'))
diff --git a/application/migrations/009_change_column_types.php b/application/migrations/009_change_column_types.php
index 86910380..12140534 100644
--- a/application/migrations/009_change_column_types.php
+++ b/application/migrations/009_change_column_types.php
@@ -1,4 +1,4 @@
-db->query('ALTER TABLE ea_secretaries_providers CONVERT TO CHARACTER SET utf8');
}
+ /**
+ * Downgrade method.
+ */
public function down()
{
// Drop table constraints.
diff --git a/application/migrations/010_add_time_format_setting.php b/application/migrations/010_add_time_format_setting.php
index 884c8737..89dbc057 100644
--- a/application/migrations/010_add_time_format_setting.php
+++ b/application/migrations/010_add_time_format_setting.php
@@ -1,4 +1,4 @@
-load->model('settings_model');
+ }
+
+ /**
+ * Upgrade method.
+ */
public function up()
{
- $this->load->model('settings_model');
-
try
{
$this->settings_model->get_setting('time_format');
@@ -26,10 +47,11 @@ class Migration_Add_time_format_setting extends CI_Migration {
}
}
+ /**
+ * Downgrade method.
+ */
public function down()
{
- $this->load->model('settings_model');
-
$this->settings_model->remove_setting('time_format');
}
}
diff --git a/application/migrations/011_remove_prefix_from_fkey_constraints.php b/application/migrations/011_remove_prefix_from_fkey_constraints.php
index f88d927c..98f533a1 100644
--- a/application/migrations/011_remove_prefix_from_fkey_constraints.php
+++ b/application/migrations/011_remove_prefix_from_fkey_constraints.php
@@ -1,4 +1,4 @@
-db->insert('ea_settings', ['name' => 'display_cookie_notice', 'value' => '0']);
@@ -40,6 +51,9 @@ class Migration_Legal_contents extends CI_Migration {
');
}
+ /**
+ * Downgrade method.
+ */
public function down()
{
$this->db->delete('ea_settings', ['name' => 'display_cookie_notice']);
diff --git a/application/migrations/013_add_weekday_start_setting.php b/application/migrations/013_add_weekday_start_setting.php
index 4aa45220..0e3889cd 100644
--- a/application/migrations/013_add_weekday_start_setting.php
+++ b/application/migrations/013_add_weekday_start_setting.php
@@ -1,4 +1,4 @@
-load->model('settings_model');
+ }
+
+ /**
+ * Upgrade method.
+ */
public function up()
{
- $this->load->model('settings_model');
-
try
{
$this->settings_model->get_setting('first_weekday');
@@ -26,10 +47,11 @@ class Migration_Add_weekday_start_setting extends CI_Migration {
}
}
+ /**
+ * Downgrade method.
+ */
public function down()
{
- $this->load->model('settings_model');
-
$this->settings_model->remove_setting('first_weekday');
}
}
diff --git a/application/migrations/014_add_appointment_location_column.php b/application/migrations/014_add_appointment_location_column.php
index 3bc11f4c..12a8f206 100644
--- a/application/migrations/014_add_appointment_location_column.php
+++ b/application/migrations/014_add_appointment_location_column.php
@@ -1,4 +1,4 @@
-db->query('
@@ -25,6 +36,9 @@ class Migration_add_appointment_location_column extends CI_Migration {
');
}
+ /**
+ * Downgrade method.
+ */
public function down()
{
$this->db->query('
diff --git a/application/migrations/015_add_user_extra_working_plan.php b/application/migrations/015_add_user_extra_working_plan.php
index 6094e502..e83ec271 100644
--- a/application/migrations/015_add_user_extra_working_plan.php
+++ b/application/migrations/015_add_user_extra_working_plan.php
@@ -1,4 +1,4 @@
-db->field_exists('extra_working_plan', 'ea_user_settings')) {
+ if ( ! $this->db->field_exists('extra_working_plan', 'ea_user_settings'))
+ {
$fields = [
'extra_working_plan' => [
'type' => 'TEXT',
@@ -28,9 +40,13 @@ class Migration_Add_user_extra_working_plan extends CI_Migration {
}
}
+ /**
+ * Downgrade method.
+ */
public function down()
{
- if (!$this->db->field_exists('extra_working_plan', 'ea_user_settings')) {
+ if ( ! $this->db->field_exists('extra_working_plan', 'ea_user_settings'))
+ {
$this->dbforge->drop_column('ea_user_settings', 'extra_working_plan');
}
}
diff --git a/application/migrations/016_add_require_phone_number_setting.php b/application/migrations/016_add_require_phone_number_setting.php
index cc369a91..43a85eab 100644
--- a/application/migrations/016_add_require_phone_number_setting.php
+++ b/application/migrations/016_add_require_phone_number_setting.php
@@ -1,4 +1,4 @@
-load->model('settings_model');
+ }
+
+ /**
+ * Upgrade method.
+ */
public function up()
{
- $this->load->model('settings_model');
-
try
{
$this->settings_model->get_setting('require_phone_number');
@@ -26,10 +47,11 @@ class Migration_Add_require_phone_number_setting extends CI_Migration {
}
}
+ /**
+ * Downgrade method.
+ */
public function down()
{
- $this->load->model('settings_model');
-
$this->settings_model->remove_setting('require_phone_number');
}
}
diff --git a/application/migrations/017_add_api_token_setting.php b/application/migrations/017_add_api_token_setting.php
index e0feda47..a31b65da 100644
--- a/application/migrations/017_add_api_token_setting.php
+++ b/application/migrations/017_add_api_token_setting.php
@@ -1,4 +1,4 @@
-load->model('settings_model');
+ }
+
+ /**
+ * Upgrade method.
+ *
+ * @throws Exception
+ */
public function up()
{
- $this->load->model('settings_model');
-
try
{
$this->settings_model->get_setting('api_token');
@@ -26,10 +49,13 @@ class Migration_Add_api_token_setting extends CI_Migration {
}
}
+ /**
+ * Downgrade method.
+ *
+ * @throws Exception
+ */
public function down()
{
- $this->load->model('settings_model');
-
$this->settings_model->remove_setting('api_token');
}
}
diff --git a/application/migrations/018_add_timezone_columns.php b/application/migrations/018_add_timezone_columns.php
index 184aeb12..5a78e6ec 100644
--- a/application/migrations/018_add_timezone_columns.php
+++ b/application/migrations/018_add_timezone_columns.php
@@ -1,4 +1,4 @@
-db->query('
@@ -20,6 +31,9 @@ class Migration_Add_timezone_columns extends CI_Migration {
');
}
+ /**
+ * Downgrade method.
+ */
public function down()
{
$this->db->query('
diff --git a/application/migrations/019_add_display_any_provider_setting.php b/application/migrations/019_add_display_any_provider_setting.php
index 114a8407..dc2743a6 100644
--- a/application/migrations/019_add_display_any_provider_setting.php
+++ b/application/migrations/019_add_display_any_provider_setting.php
@@ -1,4 +1,4 @@
-db->insert('ea_settings', [
@@ -20,6 +31,9 @@ class Migration_Add_display_any_provider_setting extends CI_Migration {
]);
}
+ /**
+ * Downgrade method.
+ */
public function down()
{
$this->db->delete('ea_settings', [
diff --git a/application/models/Admins_model.php b/application/models/Admins_model.php
index 412bfba6..f84365f7 100644
--- a/application/models/Admins_model.php
+++ b/application/models/Admins_model.php
@@ -1,4 +1,4 @@
->> array that contains user settings (username, password etc)
*
+ * @property CI_DB_query_builder db
+ * @property CI_Loader load
+ *
* @package Models
*/
class Admins_Model extends CI_Model {
@@ -63,145 +66,6 @@ class Admins_Model extends CI_Model {
return (int)$admin['id'];
}
- /**
- * Check whether a particular admin record exists in the database.
- *
- * @param array $admin Contains the admin data. The 'email' value is required to be present at the moment.
- *
- * @return bool Returns whether the record exists or not.
- *
- * @throws Exception When the 'email' value is not present on the $admin argument.
- */
- public function exists($admin)
- {
- if ( ! isset($admin['email']))
- {
- throw new Exception('Admin email is not provided: ' . print_r($admin, TRUE));
- }
-
- // This method shouldn't depend on another method of this class.
- $num_rows = $this->db
- ->select('*')
- ->from('ea_users')
- ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
- ->where('ea_users.email', $admin['email'])
- ->where('ea_roles.slug', DB_SLUG_ADMIN)
- ->get()->num_rows();
-
- return ($num_rows > 0) ? TRUE : FALSE;
- }
-
- /**
- * Insert a new admin record into the database.
- *
- * @param array $admin Contains the admin data.
- *
- * @return int Returns the new record id.
- *
- * @throws Exception When the insert operation fails.
- */
- protected function _insert($admin)
- {
- $this->load->helper('general');
-
- $admin['id_roles'] = $this->get_admin_role_id();
- $settings = $admin['settings'];
- unset($admin['settings']);
-
- $this->db->trans_begin();
-
- if ( ! $this->db->insert('ea_users', $admin))
- {
- throw new Exception('Could not insert admin into the database.');
- }
-
- $admin['id'] = (int)$this->db->insert_id();
- $settings['id_users'] = $admin['id'];
- $settings['salt'] = generate_salt();
- $settings['password'] = hash_password($settings['salt'], $settings['password']);
-
- // Insert admin settings.
- if ( ! $this->db->insert('ea_user_settings', $settings))
- {
- $this->db->trans_rollback();
- throw new Exception('Could not insert admin settings into the database.');
- }
-
- $this->db->trans_complete();
-
- return $admin['id'];
- }
-
- /**
- * Update an existing admin record in the database.
- *
- * @param array $admin Contains the admin record data.
- *
- * @return int Returns the record id.
- *
- * @throws Exception When the update operation fails.
- */
- protected function _update($admin)
- {
- $this->load->helper('general');
-
- $settings = $admin['settings'];
- unset($admin['settings']);
- $settings['id_users'] = $admin['id'];
-
- if (isset($settings['password']))
- {
- $salt = $this->db->get_where('ea_user_settings', ['id_users' => $admin['id']])->row()->salt;
- $settings['password'] = hash_password($salt, $settings['password']);
- }
-
- $this->db->where('id', $admin['id']);
- if ( ! $this->db->update('ea_users', $admin))
- {
- throw new Exception('Could not update admin record.');
- }
-
- $this->db->where('id_users', $settings['id_users']);
- if ( ! $this->db->update('ea_user_settings', $settings))
- {
- throw new Exception('Could not update admin settings.');
- }
-
- return (int)$admin['id'];
- }
-
- /**
- * Find the database record id of an admin user.
- *
- * @param array $admin Contains the admin data. The 'email' value is required in order to find the record id.
- *
- * @return int Returns the record id
- *
- * @throws Exception When the 'email' value is not present on the $admin array.
- */
- public function find_record_id($admin)
- {
- if ( ! isset($admin['email']))
- {
- throw new Exception('Admin email was not provided: ' . print_r($admin, TRUE));
- }
-
- $result = $this->db
- ->select('ea_users.id')
- ->from('ea_users')
- ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
- ->where('ea_users.email', $admin['email'])
- ->where('ea_roles.slug', DB_SLUG_ADMIN)
- ->get();
-
- if ($result->num_rows() == 0)
- {
- throw new Exception('Could not find admin record id.');
- }
-
- return (int)$result->row()->id;
- }
-
/**
* Validate admin user data before add() operation is executed.
*
@@ -291,6 +155,170 @@ class Admins_Model extends CI_Model {
return TRUE; // Operation completed successfully.
}
+ /**
+ * Validate Records Username
+ *
+ * @param string $username The provider records username.
+ * @param int $user_id The user record id.
+ *
+ * @return bool Returns the validation result.
+ */
+ public function validate_username($username, $user_id)
+ {
+ $num_rows = $this->db->get_where('ea_user_settings',
+ ['username' => $username, 'id_users <> ' => $user_id])->num_rows();
+ return ($num_rows > 0) ? FALSE : TRUE;
+ }
+
+ /**
+ * Check whether a particular admin record exists in the database.
+ *
+ * @param array $admin Contains the admin data. The 'email' value is required to be present at the moment.
+ *
+ * @return bool Returns whether the record exists or not.
+ *
+ * @throws Exception When the 'email' value is not present on the $admin argument.
+ */
+ public function exists($admin)
+ {
+ if ( ! isset($admin['email']))
+ {
+ throw new Exception('Admin email is not provided: ' . print_r($admin, TRUE));
+ }
+
+ // This method shouldn't depend on another method of this class.
+ $num_rows = $this->db
+ ->select('*')
+ ->from('ea_users')
+ ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
+ ->where('ea_users.email', $admin['email'])
+ ->where('ea_roles.slug', DB_SLUG_ADMIN)
+ ->get()->num_rows();
+
+ return $num_rows > 0;
+ }
+
+ /**
+ * Find the database record id of an admin user.
+ *
+ * @param array $admin Contains the admin data. The 'email' value is required in order to find the record id.
+ *
+ * @return int Returns the record id
+ *
+ * @throws Exception When the 'email' value is not present on the $admin array.
+ */
+ public function find_record_id($admin)
+ {
+ if ( ! isset($admin['email']))
+ {
+ throw new Exception('Admin email was not provided: ' . print_r($admin, TRUE));
+ }
+
+ $result = $this->db
+ ->select('ea_users.id')
+ ->from('ea_users')
+ ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
+ ->where('ea_users.email', $admin['email'])
+ ->where('ea_roles.slug', DB_SLUG_ADMIN)
+ ->get();
+
+ if ($result->num_rows() == 0)
+ {
+ throw new Exception('Could not find admin record id.');
+ }
+
+ return (int)$result->row()->id;
+ }
+
+ /**
+ * Insert a new admin record into the database.
+ *
+ * @param array $admin Contains the admin data.
+ *
+ * @return int Returns the new record id.
+ *
+ * @throws Exception When the insert operation fails.
+ */
+ protected function _insert($admin)
+ {
+ $this->load->helper('general');
+
+ $admin['id_roles'] = $this->get_admin_role_id();
+ $settings = $admin['settings'];
+ unset($admin['settings']);
+
+ $this->db->trans_begin();
+
+ if ( ! $this->db->insert('ea_users', $admin))
+ {
+ throw new Exception('Could not insert admin into the database.');
+ }
+
+ $admin['id'] = (int)$this->db->insert_id();
+ $settings['id_users'] = $admin['id'];
+ $settings['salt'] = generate_salt();
+ $settings['password'] = hash_password($settings['salt'], $settings['password']);
+
+ // Insert admin settings.
+ if ( ! $this->db->insert('ea_user_settings', $settings))
+ {
+ $this->db->trans_rollback();
+ throw new Exception('Could not insert admin settings into the database.');
+ }
+
+ $this->db->trans_complete();
+
+ return $admin['id'];
+ }
+
+ /**
+ * Get the admin users role id.
+ *
+ * @return int Returns the role record id.
+ */
+ public function get_admin_role_id()
+ {
+ return (int)$this->db->get_where('ea_roles', ['slug' => DB_SLUG_ADMIN])->row()->id;
+ }
+
+ /**
+ * Update an existing admin record in the database.
+ *
+ * @param array $admin Contains the admin record data.
+ *
+ * @return int Returns the record id.
+ *
+ * @throws Exception When the update operation fails.
+ */
+ protected function _update($admin)
+ {
+ $this->load->helper('general');
+
+ $settings = $admin['settings'];
+ unset($admin['settings']);
+ $settings['id_users'] = $admin['id'];
+
+ if (isset($settings['password']))
+ {
+ $salt = $this->db->get_where('ea_user_settings', ['id_users' => $admin['id']])->row()->salt;
+ $settings['password'] = hash_password($salt, $settings['password']);
+ }
+
+ $this->db->where('id', $admin['id']);
+ if ( ! $this->db->update('ea_users', $admin))
+ {
+ throw new Exception('Could not update admin record.');
+ }
+
+ $this->db->where('id_users', $settings['id_users']);
+ if ( ! $this->db->update('ea_user_settings', $settings))
+ {
+ throw new Exception('Could not update admin settings.');
+ }
+
+ return (int)$admin['id'];
+ }
+
/**
* Delete an existing admin record from the database.
*
@@ -439,29 +467,4 @@ class Admins_Model extends CI_Model {
return $batch;
}
-
- /**
- * Get the admin users role id.
- *
- * @return int Returns the role record id.
- */
- public function get_admin_role_id()
- {
- return (int)$this->db->get_where('ea_roles', ['slug' => DB_SLUG_ADMIN])->row()->id;
- }
-
- /**
- * Validate Records Username
- *
- * @param string $username The provider records username.
- * @param int $user_id The user record id.
- *
- * @return bool Returns the validation result.
- */
- public function validate_username($username, $user_id)
- {
- $num_rows = $this->db->get_where('ea_user_settings',
- ['username' => $username, 'id_users <> ' => $user_id])->num_rows();
- return ($num_rows > 0) ? FALSE : TRUE;
- }
}
diff --git a/application/models/Appointments_model.php b/application/models/Appointments_model.php
index 9e883f9d..75758a49 100644
--- a/application/models/Appointments_model.php
+++ b/application/models/Appointments_model.php
@@ -1,4 +1,4 @@
-db->get_where('ea_appointments', [
- 'start_datetime' => $appointment['start_datetime'],
- 'end_datetime' => $appointment['end_datetime'],
- 'id_users_provider' => $appointment['id_users_provider'],
- 'id_users_customer' => $appointment['id_users_customer'],
- 'id_services' => $appointment['id_services'],
- ])
- ->num_rows();
-
- return ($num_rows > 0) ? TRUE : FALSE;
- }
-
- /**
- * Insert a new appointment record to the database.
- *
- * @param array $appointment Associative array with the appointment's data. Each key has the same name with the
- * database fields.
- *
- * @return int Returns the id of the new record.
- *
- * @throws Exception If appointment record could not be inserted.
- */
- protected function _insert($appointment)
- {
- $appointment['book_datetime'] = date('Y-m-d H:i:s');
- $appointment['hash'] = $this->generate_hash();
-
- if ( ! $this->db->insert('ea_appointments', $appointment))
- {
- throw new Exception('Could not insert appointment record.');
- }
-
- return (int)$this->db->insert_id();
- }
-
- /**
- * Update an existing appointment record in the database.
- *
- * The appointment data argument should already include the record ID in order to process the update operation.
- *
- * @param array $appointment Associative array with the appointment's data. Each key has the same name with the
- * database fields.
- *
- * @throws Exception If appointment record could not be updated.
- */
- protected function _update($appointment)
- {
- $this->db->where('id', $appointment['id']);
- if ( ! $this->db->update('ea_appointments', $appointment))
- {
- throw new Exception('Could not update appointment record.');
- }
- }
-
- /**
- * Find the database id of an appointment record.
- *
- * The appointment data should include the following fields in order to get the unique id from the database:
- * "start_datetime", "end_datetime", "id_users_provider", "id_users_customer", "id_services".
- *
- * IMPORTANT: The record must already exists in the database, otherwise an exception is raised.
- *
- * @param array $appointment Array with the appointment data. The keys of the array should have the same names as
- * the db fields.
- *
- * @return int Returns the db id of the record that matches the appointment data.
- *
- * @throws Exception If appointment could not be found.
- */
- public function find_record_id($appointment)
- {
- $this->db->where([
- 'start_datetime' => $appointment['start_datetime'],
- 'end_datetime' => $appointment['end_datetime'],
- 'id_users_provider' => $appointment['id_users_provider'],
- 'id_users_customer' => $appointment['id_users_customer'],
- 'id_services' => $appointment['id_services']
- ]);
-
- $result = $this->db->get('ea_appointments');
-
- if ($result->num_rows() == 0)
- {
- throw new Exception('Could not find appointment record id.');
- }
-
- return $result->row()->id;
- }
-
/**
* Validate appointment data before the insert or update operations are executed.
*
@@ -237,6 +126,135 @@ class Appointments_Model extends CI_Model {
return TRUE;
}
+ /**
+ * Insert a new appointment record to the database.
+ *
+ * @param array $appointment Associative array with the appointment's data. Each key has the same name with the
+ * database fields.
+ *
+ * @return int Returns the id of the new record.
+ *
+ * @throws Exception If appointment record could not be inserted.
+ */
+ protected function _insert($appointment)
+ {
+ $appointment['book_datetime'] = date('Y-m-d H:i:s');
+ $appointment['hash'] = $this->generate_hash();
+
+ if ( ! $this->db->insert('ea_appointments', $appointment))
+ {
+ throw new Exception('Could not insert appointment record.');
+ }
+
+ return (int)$this->db->insert_id();
+ }
+
+ /**
+ * Generate a unique hash for the given appointment data.
+ *
+ * This method uses the current date-time to generate a unique hash string that is later used to identify this
+ * appointment. Hash is needed when the email is send to the user with an edit link.
+ *
+ * @return string Returns the unique appointment hash.
+ */
+ public function generate_hash()
+ {
+ $current_date = new DateTime();
+ return md5($current_date->getTimestamp());
+ }
+
+ /**
+ * Update an existing appointment record in the database.
+ *
+ * The appointment data argument should already include the record ID in order to process the update operation.
+ *
+ * @param array $appointment Associative array with the appointment's data. Each key has the same name with the
+ * database fields.
+ *
+ * @throws Exception If appointment record could not be updated.
+ */
+ protected function _update($appointment)
+ {
+ $this->db->where('id', $appointment['id']);
+ if ( ! $this->db->update('ea_appointments', $appointment))
+ {
+ throw new Exception('Could not update appointment record.');
+ }
+ }
+
+ /**
+ * Check if a particular appointment record already exists.
+ *
+ * This method checks whether the given appointment already exists in the database. It doesn't search with the id,
+ * but by using the following fields: "start_datetime", "end_datetime", "id_users_provider", "id_users_customer",
+ * "id_services".
+ *
+ * @param array $appointment Associative array with the appointment's data. Each key has the same name with the
+ * database fields.
+ *
+ * @return bool Returns whether the record exists or not.
+ *
+ * @throws Exception If appointment fields are missing.
+ */
+ public function exists($appointment)
+ {
+ if ( ! isset($appointment['start_datetime'])
+ || ! isset($appointment['end_datetime'])
+ || ! isset($appointment['id_users_provider'])
+ || ! isset($appointment['id_users_customer'])
+ || ! isset($appointment['id_services']))
+ {
+ throw new Exception('Not all appointment field values are provided: '
+ . print_r($appointment, TRUE));
+ }
+
+ $num_rows = $this->db->get_where('ea_appointments', [
+ 'start_datetime' => $appointment['start_datetime'],
+ 'end_datetime' => $appointment['end_datetime'],
+ 'id_users_provider' => $appointment['id_users_provider'],
+ 'id_users_customer' => $appointment['id_users_customer'],
+ 'id_services' => $appointment['id_services'],
+ ])
+ ->num_rows();
+
+ return ($num_rows > 0) ? TRUE : FALSE;
+ }
+
+ /**
+ * Find the database id of an appointment record.
+ *
+ * The appointment data should include the following fields in order to get the unique id from the database:
+ * "start_datetime", "end_datetime", "id_users_provider", "id_users_customer", "id_services".
+ *
+ * IMPORTANT: The record must already exists in the database, otherwise an exception is raised.
+ *
+ * @param array $appointment Array with the appointment data. The keys of the array should have the same names as
+ * the db fields.
+ *
+ * @return int Returns the db id of the record that matches the appointment data.
+ *
+ * @throws Exception If appointment could not be found.
+ */
+ public function find_record_id($appointment)
+ {
+ $this->db->where([
+ 'start_datetime' => $appointment['start_datetime'],
+ 'end_datetime' => $appointment['end_datetime'],
+ 'id_users_provider' => $appointment['id_users_provider'],
+ 'id_users_customer' => $appointment['id_users_customer'],
+ 'id_services' => $appointment['id_services']
+ ]);
+
+ $result = $this->db->get('ea_appointments');
+
+ if ($result->num_rows() == 0)
+ {
+ throw new Exception('Could not find appointment record id.');
+ }
+
+ return $result->row()->id;
+ }
+
/**
* Delete an existing appointment record from the database.
*
@@ -383,17 +401,21 @@ class Appointments_Model extends CI_Model {
}
/**
- * Generate a unique hash for the given appointment data.
+ * Get the aggregates of an appointment.
*
- * This method uses the current date-time to generate a unique hash string that is later used to identify this
- * appointment. Hash is needed when the email is send to the user with an edit link.
+ * @param array $appointment Appointment data.
*
- * @return string Returns the unique appointment hash.
+ * @return array Returns the appointment with the aggregates.
*/
- public function generate_hash()
+ private function get_aggregates(array $appointment)
{
- $current_date = new DateTime();
- return md5($current_date->getTimestamp());
+ $appointment['service'] = $this->db->get_where('ea_services',
+ ['id' => $appointment['id_services']])->row_array();
+ $appointment['provider'] = $this->db->get_where('ea_users',
+ ['id' => $appointment['id_users_provider']])->row_array();
+ $appointment['customer'] = $this->db->get_where('ea_users',
+ ['id' => $appointment['id_users_customer']])->row_array();
+ return $appointment;
}
/**
@@ -535,22 +557,4 @@ class Appointments_Model extends CI_Model {
->row()
->attendants_number;
}
-
- /**
- * Get the aggregates of an appointment.
- *
- * @param array $appointment Appointment data.
- *
- * @return array Returns the appointment with the aggregates.
- */
- private function get_aggregates(array $appointment)
- {
- $appointment['service'] = $this->db->get_where('ea_services',
- ['id' => $appointment['id_services']])->row_array();
- $appointment['provider'] = $this->db->get_where('ea_users',
- ['id' => $appointment['id_users_provider']])->row_array();
- $appointment['customer'] = $this->db->get_where('ea_users',
- ['id' => $appointment['id_users_customer']])->row_array();
- return $appointment;
- }
}
diff --git a/application/models/Consents_model.php b/application/models/Consents_model.php
index 87511d45..7ac5ae1c 100644
--- a/application/models/Consents_model.php
+++ b/application/models/Consents_model.php
@@ -1,4 +1,4 @@
-load->helper('data_validation');
+
+ // If a customer id is provided, check whether the record
+ // exist in the database.
+ if (isset($customer['id']))
+ {
+ $num_rows = $this->db->get_where('ea_users',
+ ['id' => $customer['id']])->num_rows();
+ if ($num_rows == 0)
+ {
+ throw new Exception('Provided customer id does not '
+ . 'exist in the database.');
+ }
+ }
+
+ $query = $this->db->get_where('ea_settings', ['name' => 'require_phone_number']);
+ $phone_number_required = $query->num_rows() > 0 ? $query->row() === '1' : FALSE;
+
+ // Validate required fields
+ if (empty($customer['first_name'])
+ || empty($customer['last_name'])
+ || empty($customer['email'])
+ || (empty($customer['phone_number']) && $phone_number_required))
+ {
+ throw new Exception('Not all required fields are provided: '
+ . print_r($customer, TRUE));
+ }
+
+ // Validate email address
+ if ( ! filter_var($customer['email'], FILTER_VALIDATE_EMAIL))
+ {
+ throw new Exception('Invalid email address provided: '
+ . $customer['email']);
+ }
+
+ // When inserting a record the email address must be unique.
+ $customer_id = (isset($customer['id'])) ? $customer['id'] : '';
+
+ $num_rows = $this->db
+ ->select('*')
+ ->from('ea_users')
+ ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
+ ->where('ea_roles.slug', DB_SLUG_CUSTOMER)
+ ->where('ea_users.email', $customer['email'])
+ ->where('ea_users.id <>', $customer_id)
+ ->get()
+ ->num_rows();
+
+ if ($num_rows > 0)
+ {
+ throw new Exception('Given email address belongs to another customer record. '
+ . 'Please use a different email.');
+ }
+
+ return TRUE;
+ }
+
/**
* Check if a particular customer record already exists.
*
@@ -85,6 +156,45 @@ class Customers_Model extends CI_Model {
return ($num_rows > 0) ? TRUE : FALSE;
}
+ /**
+ * Find the database id of a customer record.
+ *
+ * The customer data should include the following fields in order to get the unique id from the database: "email"
+ *
+ * IMPORTANT: The record must already exists in the database, otherwise an exception is raised.
+ *
+ * @param array $customer Array with the customer data. The keys of the array should have the same names as the
+ * database fields.
+ *
+ * @return int Returns the ID.
+ *
+ * @throws Exception If customer record does not exist.
+ */
+ public function find_record_id($customer)
+ {
+ if (empty($customer['email']))
+ {
+ throw new Exception('Customer\'s email was not provided: '
+ . print_r($customer, TRUE));
+ }
+
+ // Get customer's role id
+ $result = $this->db
+ ->select('ea_users.id')
+ ->from('ea_users')
+ ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
+ ->where('ea_users.email', $customer['email'])
+ ->where('ea_roles.slug', DB_SLUG_CUSTOMER)
+ ->get();
+
+ if ($result->num_rows() == 0)
+ {
+ throw new Exception('Could not find customer record id.');
+ }
+
+ return $result->row()->id;
+ }
+
/**
* Insert a new customer record to the database.
*
@@ -139,113 +249,6 @@ class Customers_Model extends CI_Model {
return (int)$customer['id'];
}
- /**
- * Find the database id of a customer record.
- *
- * The customer data should include the following fields in order to get the unique id from the database: "email"
- *
- * IMPORTANT: The record must already exists in the database, otherwise an exception is raised.
- *
- * @param array $customer Array with the customer data. The keys of the array should have the same names as the
- * database fields.
- *
- * @return int Returns the ID.
- *
- * @throws Exception If customer record does not exist.
- */
- public function find_record_id($customer)
- {
- if (empty($customer['email']))
- {
- throw new Exception('Customer\'s email was not provided: '
- . print_r($customer, TRUE));
- }
-
- // Get customer's role id
- $result = $this->db
- ->select('ea_users.id')
- ->from('ea_users')
- ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
- ->where('ea_users.email', $customer['email'])
- ->where('ea_roles.slug', DB_SLUG_CUSTOMER)
- ->get();
-
- if ($result->num_rows() == 0)
- {
- throw new Exception('Could not find customer record id.');
- }
-
- return $result->row()->id;
- }
-
- /**
- * Validate customer data before the insert or update operation is executed.
- *
- * @param array $customer Contains the customer data.
- *
- * @return bool Returns the validation result.
- *
- * @throws Exception If customer validation fails.
- */
- public function validate($customer)
- {
- $this->load->helper('data_validation');
-
- // If a customer id is provided, check whether the record
- // exist in the database.
- if (isset($customer['id']))
- {
- $num_rows = $this->db->get_where('ea_users',
- ['id' => $customer['id']])->num_rows();
- if ($num_rows == 0)
- {
- throw new Exception('Provided customer id does not '
- . 'exist in the database.');
- }
- }
-
- $query = $this->db->get_where('ea_settings', ['name' => 'require_phone_number']);
- $phone_number_required = $query->num_rows() > 0 ? $query->row() === '1' : false;
-
- // Validate required fields
- if ( empty($customer['first_name'])
- || empty($customer['last_name'])
- || empty($customer['email'])
- || (empty($customer['phone_number']) && $phone_number_required))
- {
- throw new Exception('Not all required fields are provided: '
- . print_r($customer, TRUE));
- }
-
- // Validate email address
- if ( ! filter_var($customer['email'], FILTER_VALIDATE_EMAIL))
- {
- throw new Exception('Invalid email address provided: '
- . $customer['email']);
- }
-
- // When inserting a record the email address must be unique.
- $customer_id = (isset($customer['id'])) ? $customer['id'] : '';
-
- $num_rows = $this->db
- ->select('*')
- ->from('ea_users')
- ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
- ->where('ea_roles.slug', DB_SLUG_CUSTOMER)
- ->where('ea_users.email', $customer['email'])
- ->where('ea_users.id <>', $customer_id)
- ->get()
- ->num_rows();
-
- if ($num_rows > 0)
- {
- throw new Exception('Given email address belongs to another customer record. '
- . 'Please use a different email.');
- }
-
- return TRUE;
- }
-
/**
* Delete an existing customer record from the database.
*
diff --git a/application/models/Providers_model.php b/application/models/Providers_model.php
index bfac563e..a4e0219d 100755
--- a/application/models/Providers_model.php
+++ b/application/models/Providers_model.php
@@ -1,4 +1,4 @@
-db
- ->select('*')
- ->from('ea_users')
- ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
- ->where('ea_users.email', $provider['email'])
- ->where('ea_roles.slug', DB_SLUG_PROVIDER)
- ->get()->num_rows();
-
- return ($num_rows > 0) ? TRUE : FALSE;
- }
-
- /**
- * Insert a new provider record into the database.
- *
- * @param array $provider Contains the provider data (must be already validated).
- *
- * @return int Returns the new record id.
- *
- * @throws Exception When the insert operation fails.
- */
- protected function _insert($provider)
- {
- $this->load->helper('general');
-
- // Get provider role id.
- $provider['id_roles'] = $this->get_providers_role_id();
-
- // Store provider settings and services (must not be present on the $provider array).
- $services = $provider['services'];
- unset($provider['services']);
- $settings = $provider['settings'];
- unset($provider['settings']);
-
- // Insert provider record and save settings.
- if ( ! $this->db->insert('ea_users', $provider))
- {
- throw new Exception('Could not insert provider into the database');
- }
-
- $settings['salt'] = generate_salt();
- $settings['password'] = hash_password($settings['salt'], $settings['password']);
-
- $provider['id'] = $this->db->insert_id();
- $this->save_settings($settings, $provider['id']);
- $this->save_services($services, $provider['id']);
-
- // Return the new record id.
- return (int)$provider['id'];
- }
-
- /**
- * Update an existing provider record in the database.
- *
- * @param array $provider Contains the provider data.
- *
- * @return int Returns the record id.
- *
- * @throws Exception When the update operation fails.
- */
- protected function _update($provider)
- {
- $this->load->helper('general');
-
- // Store service and settings (must not be present on the $provider array).
- $services = $provider['services'];
- unset($provider['services']);
- $settings = $provider['settings'];
- unset($provider['settings']);
-
- if (isset($settings['password']))
- {
- $salt = $this->db->get_where('ea_user_settings', ['id_users' => $provider['id']])->row()->salt;
- $settings['password'] = hash_password($salt, $settings['password']);
- }
-
- // Update provider record.
- $this->db->where('id', $provider['id']);
- if ( ! $this->db->update('ea_users', $provider))
- {
- throw new Exception('Could not update provider record.');
- }
-
- $this->save_services($services, $provider['id']);
- $this->save_settings($settings, $provider['id']);
-
- // Return record id.
- return (int)$provider['id'];
- }
-
- /**
- * Find the database record id of a provider.
- *
- * @param array $provider Contains the provider data. The 'email' value is required in order to find the record id.
- *
- * @return int Returns the record id.
- *
- * @throws Exception When the provider's email value is not provided.
- */
- public function find_record_id($provider)
- {
- if ( ! isset($provider['email']))
- {
- throw new Exception('Provider email was not provided:' . print_r($provider, TRUE));
- }
-
- $result = $this->db
- ->select('ea_users.id')
- ->from('ea_users')
- ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
- ->where('ea_users.email', $provider['email'])
- ->where('ea_roles.slug', DB_SLUG_PROVIDER)
- ->get();
-
- if ($result->num_rows() == 0)
- {
- throw new Exception('Could not find provider record id.');
- }
-
- return (int)$result->row()->id;
- }
-
/**
* Validate provider data before the insert or update operation is executed.
*
@@ -328,6 +193,260 @@ class Providers_Model extends CI_Model {
return TRUE;
}
+ /**
+ * Validate Records Username
+ *
+ * @param string $username The provider records username.
+ * @param int $user_id The user record id.
+ *
+ * @return bool Returns the validation result.
+ */
+ public function validate_username($username, $user_id)
+ {
+ $num_rows = $this->db->get_where('ea_user_settings',
+ ['username' => $username, 'id_users <> ' => $user_id])->num_rows();
+ return ($num_rows > 0) ? FALSE : TRUE;
+ }
+
+ /**
+ * Check whether a particular provider record already exists in the database.
+ *
+ * @param array $provider Contains the provider data. The 'email' value is required in order to check for a provider.
+ *
+ * @return bool Returns whether the provider record exists or not.
+ *
+ * @throws Exception When the 'email' value is not provided.
+ */
+ public function exists($provider)
+ {
+ if ( ! isset($provider['email']))
+ {
+ throw new Exception('Provider email is not provided:' . print_r($provider, TRUE));
+ }
+
+ // This method shouldn't depend on another method of this class.
+ $num_rows = $this->db
+ ->select('*')
+ ->from('ea_users')
+ ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
+ ->where('ea_users.email', $provider['email'])
+ ->where('ea_roles.slug', DB_SLUG_PROVIDER)
+ ->get()->num_rows();
+
+ return ($num_rows > 0) ? TRUE : FALSE;
+ }
+
+ /**
+ * Find the database record id of a provider.
+ *
+ * @param array $provider Contains the provider data. The 'email' value is required in order to find the record id.
+ *
+ * @return int Returns the record id.
+ *
+ * @throws Exception When the provider's email value is not provided.
+ */
+ public function find_record_id($provider)
+ {
+ if ( ! isset($provider['email']))
+ {
+ throw new Exception('Provider email was not provided:' . print_r($provider, TRUE));
+ }
+
+ $result = $this->db
+ ->select('ea_users.id')
+ ->from('ea_users')
+ ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
+ ->where('ea_users.email', $provider['email'])
+ ->where('ea_roles.slug', DB_SLUG_PROVIDER)
+ ->get();
+
+ if ($result->num_rows() == 0)
+ {
+ throw new Exception('Could not find provider record id.');
+ }
+
+ return (int)$result->row()->id;
+ }
+
+ /**
+ * Insert a new provider record into the database.
+ *
+ * @param array $provider Contains the provider data (must be already validated).
+ *
+ * @return int Returns the new record id.
+ *
+ * @throws Exception When the insert operation fails.
+ */
+ protected function _insert($provider)
+ {
+ $this->load->helper('general');
+
+ // Get provider role id.
+ $provider['id_roles'] = $this->get_providers_role_id();
+
+ // Store provider settings and services (must not be present on the $provider array).
+ $services = $provider['services'];
+ unset($provider['services']);
+ $settings = $provider['settings'];
+ unset($provider['settings']);
+
+ // Insert provider record and save settings.
+ if ( ! $this->db->insert('ea_users', $provider))
+ {
+ throw new Exception('Could not insert provider into the database');
+ }
+
+ $settings['salt'] = generate_salt();
+ $settings['password'] = hash_password($settings['salt'], $settings['password']);
+
+ $provider['id'] = $this->db->insert_id();
+ $this->save_settings($settings, $provider['id']);
+ $this->save_services($services, $provider['id']);
+
+ // Return the new record id.
+ return (int)$provider['id'];
+ }
+
+ /**
+ * Get the providers role id from the database.
+ *
+ * @return int Returns the role id for the provider records.
+ */
+ public function get_providers_role_id()
+ {
+ return $this->db->get_where('ea_roles', ['slug' => DB_SLUG_PROVIDER])->row()->id;
+ }
+
+ /**
+ * Save the provider settings (used from insert or update operation).
+ *
+ * @param array $settings Contains the setting values.
+ * @param int $provider_id Record id of the provider.
+ *
+ * @throws Exception If $provider_id argument is invalid.
+ * @throws Exception If $settings argument is invalid.
+ */
+ protected function save_settings($settings, $provider_id)
+ {
+ if ( ! is_numeric($provider_id))
+ {
+ throw new Exception('Invalid $provider_id argument given:' . $provider_id);
+ }
+
+ if (count($settings) == 0 || ! is_array($settings))
+ {
+ throw new Exception('Invalid $settings argument given:' . print_r($settings, TRUE));
+ }
+
+ // Check if the setting record exists in db.
+ if ($this->db->get_where('ea_user_settings', ['id_users' => $provider_id])
+ ->num_rows() == 0)
+ {
+ $this->db->insert('ea_user_settings', ['id_users' => $provider_id]);
+ }
+
+ foreach ($settings as $name => $value)
+ {
+ // Sort in descending order the extra working plan days
+ if ($name == 'extra_working_plan')
+ {
+ $value = json_decode($value, TRUE);
+ // Sort the array and put in reverse order
+ krsort($value);
+ $value = json_encode($value);
+ }
+ $this->set_setting($name, $value, $provider_id);
+ }
+ }
+
+ /**
+ * Set a provider's setting value in the database.
+ *
+ * The provider and settings record must already exist.
+ *
+ * @param string $setting_name The setting's name.
+ * @param string $value The setting's value.
+ * @param int $provider_id The selected provider id.
+ */
+ public function set_setting($setting_name, $value, $provider_id)
+ {
+ $this->db->where(['id_users' => $provider_id]);
+ return $this->db->update('ea_user_settings', [$setting_name => $value]);
+ }
+
+ /**
+ * Save the provider services in the database (use on both insert and update operation).
+ *
+ * @param array $services Contains the service ids that the selected provider can provide.
+ * @param int $provider_id The selected provider record id.
+ *
+ * @throws Exception When the $services argument type is not array.
+ * @throws Exception When the $provider_id argument type is not int.
+ */
+ protected function save_services($services, $provider_id)
+ {
+ // Validate method arguments.
+ if ( ! is_array($services))
+ {
+ throw new Exception('Invalid argument type $services: ' . $services);
+ }
+
+ if ( ! is_numeric($provider_id))
+ {
+ throw new Exception('Invalid argument type $provider_id: ' . $provider_id);
+ }
+
+ // Save provider services in the database (delete old records and add new).
+ $this->db->delete('ea_services_providers', ['id_users' => $provider_id]);
+ foreach ($services as $service_id)
+ {
+ $service_provider = [
+ 'id_users' => $provider_id,
+ 'id_services' => $service_id
+ ];
+ $this->db->insert('ea_services_providers', $service_provider);
+ }
+ }
+
+ /**
+ * Update an existing provider record in the database.
+ *
+ * @param array $provider Contains the provider data.
+ *
+ * @return int Returns the record id.
+ *
+ * @throws Exception When the update operation fails.
+ */
+ protected function _update($provider)
+ {
+ $this->load->helper('general');
+
+ // Store service and settings (must not be present on the $provider array).
+ $services = $provider['services'];
+ unset($provider['services']);
+ $settings = $provider['settings'];
+ unset($provider['settings']);
+
+ if (isset($settings['password']))
+ {
+ $salt = $this->db->get_where('ea_user_settings', ['id_users' => $provider['id']])->row()->salt;
+ $settings['password'] = hash_password($salt, $settings['password']);
+ }
+
+ // Update provider record.
+ $this->db->where('id', $provider['id']);
+ if ( ! $this->db->update('ea_users', $provider))
+ {
+ throw new Exception('Could not update provider record.');
+ }
+
+ $this->save_services($services, $provider['id']);
+ $this->save_settings($settings, $provider['id']);
+
+ // Return record id.
+ return (int)$provider['id'];
+ }
+
/**
* Delete an existing provider record from the database.
*
@@ -539,120 +658,6 @@ class Providers_Model extends CI_Model {
return $providers;
}
- /**
- * Get the providers role id from the database.
- *
- * @return int Returns the role id for the provider records.
- */
- public function get_providers_role_id()
- {
- return $this->db->get_where('ea_roles', ['slug' => DB_SLUG_PROVIDER])->row()->id;
- }
-
- /**
- * Get a providers setting from the database.
- *
- * @param string $setting_name The setting name that is going to be returned.
- * @param int $provider_id The selected provider id.
- *
- * @return string Returns the value of the selected user setting.
- */
- public function get_setting($setting_name, $provider_id)
- {
- $provider_settings = $this->db->get_where('ea_user_settings', ['id_users' => $provider_id])->row_array();
- return $provider_settings[$setting_name];
- }
-
- /**
- * Set a provider's setting value in the database.
- *
- * The provider and settings record must already exist.
- *
- * @param string $setting_name The setting's name.
- * @param string $value The setting's value.
- * @param int $provider_id The selected provider id.
- */
- public function set_setting($setting_name, $value, $provider_id)
- {
- $this->db->where(['id_users' => $provider_id]);
- return $this->db->update('ea_user_settings', [$setting_name => $value]);
- }
-
- /**
- * Save the provider settings (used from insert or update operation).
- *
- * @param array $settings Contains the setting values.
- * @param int $provider_id Record id of the provider.
- *
- * @throws Exception If $provider_id argument is invalid.
- * @throws Exception If $settings argument is invalid.
- */
- protected function save_settings($settings, $provider_id)
- {
- if ( ! is_numeric($provider_id))
- {
- throw new Exception('Invalid $provider_id argument given:' . $provider_id);
- }
-
- if (count($settings) == 0 || ! is_array($settings))
- {
- throw new Exception('Invalid $settings argument given:' . print_r($settings, TRUE));
- }
-
- // Check if the setting record exists in db.
- if ($this->db->get_where('ea_user_settings', ['id_users' => $provider_id])
- ->num_rows() == 0)
- {
- $this->db->insert('ea_user_settings', ['id_users' => $provider_id]);
- }
-
- foreach ($settings as $name => $value)
- {
- // Sort in descending order the extra working plan days
- if ($name == 'extra_working_plan') {
- $value = json_decode($value, true);
- // Sort the array and put in reverse order
- krsort($value);
- $value = json_encode($value);
- }
- $this->set_setting($name, $value, $provider_id);
- }
- }
-
- /**
- * Save the provider services in the database (use on both insert and update operation).
- *
- * @param array $services Contains the service ids that the selected provider can provide.
- * @param int $provider_id The selected provider record id.
- *
- * @throws Exception When the $services argument type is not array.
- * @throws Exception When the $provider_id argument type is not int.
- */
- protected function save_services($services, $provider_id)
- {
- // Validate method arguments.
- if ( ! is_array($services))
- {
- throw new Exception('Invalid argument type $services: ' . $services);
- }
-
- if ( ! is_numeric($provider_id))
- {
- throw new Exception('Invalid argument type $provider_id: ' . $provider_id);
- }
-
- // Save provider services in the database (delete old records and add new).
- $this->db->delete('ea_services_providers', ['id_users' => $provider_id]);
- foreach ($services as $service_id)
- {
- $service_provider = [
- 'id_users' => $provider_id,
- 'id_services' => $service_id
- ];
- $this->db->insert('ea_services_providers', $service_provider);
- }
- }
-
/**
* Save the provider extra working plan days.
*
@@ -668,8 +673,8 @@ class Providers_Model extends CI_Model {
{
// Validate period
$dateStart = date('Y-m-d', strtotime($extra_period['start_datetime']));
- $start = date('H:i',strtotime($extra_period['start_datetime']));
- $end = date('H:i',strtotime($extra_period['end_datetime']));
+ $start = date('H:i', strtotime($extra_period['start_datetime']));
+ $end = date('H:i', strtotime($extra_period['end_datetime']));
if ($start > $end)
{
throw new Exception('Unavailable period start must be prior to end.');
@@ -687,7 +692,7 @@ class Providers_Model extends CI_Model {
}
// Add record to database.
- $extra_working_plan = json_decode($this->get_setting('extra_working_plan', $provider_id), true);
+ $extra_working_plan = json_decode($this->get_setting('extra_working_plan', $provider_id), TRUE);
$extra_working_plan[$dateStart] = [
'start' => $start,
@@ -700,6 +705,20 @@ class Providers_Model extends CI_Model {
return $success;
}
+ /**
+ * Get a providers setting from the database.
+ *
+ * @param string $setting_name The setting name that is going to be returned.
+ * @param int $provider_id The selected provider id.
+ *
+ * @return string Returns the value of the selected user setting.
+ */
+ public function get_setting($setting_name, $provider_id)
+ {
+ $provider_settings = $this->db->get_where('ea_user_settings', ['id_users' => $provider_id])->row_array();
+ return $provider_settings[$setting_name];
+ }
+
/**
* Delete a provider extra working plan day.
*
@@ -724,7 +743,7 @@ class Providers_Model extends CI_Model {
}
// Add record to database.
- $extra_working_plan = json_decode($this->get_setting('extra_working_plan', $provider_id), true);
+ $extra_working_plan = json_decode($this->get_setting('extra_working_plan', $provider_id), TRUE);
unset($extra_working_plan[$extra_period]);
@@ -732,19 +751,4 @@ class Providers_Model extends CI_Model {
return $success;
}
-
- /**
- * Validate Records Username
- *
- * @param string $username The provider records username.
- * @param int $user_id The user record id.
- *
- * @return bool Returns the validation result.
- */
- public function validate_username($username, $user_id)
- {
- $num_rows = $this->db->get_where('ea_user_settings',
- ['username' => $username, 'id_users <> ' => $user_id])->num_rows();
- return ($num_rows > 0) ? FALSE : TRUE;
- }
}
diff --git a/application/models/Roles_model.php b/application/models/Roles_model.php
index 4198df2e..57533b65 100644
--- a/application/models/Roles_model.php
+++ b/application/models/Roles_model.php
@@ -1,4 +1,4 @@
-> array with provider ids that the secretary handles
* 'settings' >> array with the secretary settings
*
+ * @property CI_DB_query_builder db
+ * @property CI_Loader load
+ *
* @package Models
*/
class Secretaries_Model extends CI_Model {
@@ -56,7 +59,8 @@ class Secretaries_Model extends CI_Model {
if ( ! isset($secretary['id']))
{
$secretary['id'] = $this->_insert($secretary);
- } else
+ }
+ else
{
$secretary['id'] = $this->_update($secretary);
}
@@ -64,137 +68,6 @@ class Secretaries_Model extends CI_Model {
return (int)$secretary['id'];
}
- /**
- * Check whether a particular secretary record exists in the database.
- *
- * @param array $secretary Contains the secretary data. The 'email' value is required to be present at the moment.
- *
- * @return bool Returns whether the record exists or not.
- *
- * @throws Exception When the 'email' value is not present on the $secretary argument.
- */
- public function exists($secretary)
- {
- if ( ! isset($secretary['email']))
- {
- throw new Exception('Secretary email is not provided: ' . print_r($secretary, TRUE));
- }
-
- // This method shouldn't depend on another method of this class.
- $num_rows = $this->db
- ->select('*')
- ->from('ea_users')
- ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
- ->where('ea_users.email', $secretary['email'])
- ->where('ea_roles.slug', DB_SLUG_SECRETARY)
- ->get()->num_rows();
-
- return ($num_rows > 0) ? TRUE : FALSE;
- }
-
- /**
- * Insert a new secretary record into the database.
- *
- * @param array $secretary Contains the secretary data.
- *
- * @return int Returns the new record id.
- *
- * @throws Exception When the insert operation fails.
- */
- protected function _insert($secretary)
- {
- $this->load->helper('general');
-
- $providers = $secretary['providers'];
- unset($secretary['providers']);
- $settings = $secretary['settings'];
- unset($secretary['settings']);
-
- $secretary['id_roles'] = $this->get_secretary_role_id();
-
- if ( ! $this->db->insert('ea_users', $secretary))
- {
- throw new Exception('Could not insert secretary into the database.');
- }
-
- $secretary['id'] = (int)$this->db->insert_id();
- $settings['salt'] = generate_salt();
- $settings['password'] = hash_password($settings['salt'], $settings['password']);
-
- $this->save_providers($providers, $secretary['id']);
- $this->save_settings($settings, $secretary['id']);
-
- return $secretary['id'];
- }
-
- /**
- * Update an existing secretary record in the database.
- *
- * @param array $secretary Contains the secretary record data.
- *
- * @return int Returns the record id.
- *
- * @throws Exception When the update operation fails.
- */
- protected function _update($secretary)
- {
- $this->load->helper('general');
-
- $providers = $secretary['providers'];
- unset($secretary['providers']);
- $settings = $secretary['settings'];
- unset($secretary['settings']);
-
- if (isset($settings['password']))
- {
- $salt = $this->db->get_where('ea_user_settings', ['id_users' => $secretary['id']])->row()->salt;
- $settings['password'] = hash_password($salt, $settings['password']);
- }
-
- $this->db->where('id', $secretary['id']);
- if ( ! $this->db->update('ea_users', $secretary))
- {
- throw new Exception('Could not update secretary record.');
- }
-
- $this->save_providers($providers, $secretary['id']);
- $this->save_settings($settings, $secretary['id']);
-
- return (int)$secretary['id'];
- }
-
- /**
- * Find the database record id of a secretary.
- *
- * @param array $secretary Contains the secretary data. The 'email' value is required in order to find the record id.
- *
- * @return int Returns the record id
- *
- * @throws Exception When the 'email' value is not present on the $secretary array.
- */
- public function find_record_id($secretary)
- {
- if ( ! isset($secretary['email']))
- {
- throw new Exception('Secretary email was not provided: ' . print_r($secretary, TRUE));
- }
-
- $result = $this->db
- ->select('ea_users.id')
- ->from('ea_users')
- ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
- ->where('ea_users.email', $secretary['email'])
- ->where('ea_roles.slug', DB_SLUG_SECRETARY)
- ->get();
-
- if ($result->num_rows() == 0)
- {
- throw new Exception('Could not find secretary record id.');
- }
-
- return (int)$result->row()->id;
- }
-
/**
* Validate secretary user data before add() operation is executed.
*
@@ -290,6 +163,242 @@ class Secretaries_Model extends CI_Model {
return TRUE;
}
+ /**
+ * Validate Records Username
+ *
+ * @param string $username The provider records username.
+ * @param int $user_id The user record id.
+ *
+ * @return bool Returns the validation result.
+ */
+ public function validate_username($username, $user_id)
+ {
+ $num_rows = $this->db->get_where('ea_user_settings',
+ ['username' => $username, 'id_users <> ' => $user_id])->num_rows();
+ return ($num_rows > 0) ? FALSE : TRUE;
+ }
+
+ /**
+ * Check whether a particular secretary record exists in the database.
+ *
+ * @param array $secretary Contains the secretary data. The 'email' value is required to be present at the moment.
+ *
+ * @return bool Returns whether the record exists or not.
+ *
+ * @throws Exception When the 'email' value is not present on the $secretary argument.
+ */
+ public function exists($secretary)
+ {
+ if ( ! isset($secretary['email']))
+ {
+ throw new Exception('Secretary email is not provided: ' . print_r($secretary, TRUE));
+ }
+
+ // This method shouldn't depend on another method of this class.
+ $num_rows = $this->db
+ ->select('*')
+ ->from('ea_users')
+ ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
+ ->where('ea_users.email', $secretary['email'])
+ ->where('ea_roles.slug', DB_SLUG_SECRETARY)
+ ->get()->num_rows();
+
+ return ($num_rows > 0) ? TRUE : FALSE;
+ }
+
+ /**
+ * Find the database record id of a secretary.
+ *
+ * @param array $secretary Contains the secretary data. The 'email' value is required in order to find the record id.
+ *
+ * @return int Returns the record id
+ *
+ * @throws Exception When the 'email' value is not present on the $secretary array.
+ */
+ public function find_record_id($secretary)
+ {
+ if ( ! isset($secretary['email']))
+ {
+ throw new Exception('Secretary email was not provided: ' . print_r($secretary, TRUE));
+ }
+
+ $result = $this->db
+ ->select('ea_users.id')
+ ->from('ea_users')
+ ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
+ ->where('ea_users.email', $secretary['email'])
+ ->where('ea_roles.slug', DB_SLUG_SECRETARY)
+ ->get();
+
+ if ($result->num_rows() == 0)
+ {
+ throw new Exception('Could not find secretary record id.');
+ }
+
+ return (int)$result->row()->id;
+ }
+
+ /**
+ * Insert a new secretary record into the database.
+ *
+ * @param array $secretary Contains the secretary data.
+ *
+ * @return int Returns the new record id.
+ *
+ * @throws Exception When the insert operation fails.
+ */
+ protected function _insert($secretary)
+ {
+ $this->load->helper('general');
+
+ $providers = $secretary['providers'];
+ unset($secretary['providers']);
+ $settings = $secretary['settings'];
+ unset($secretary['settings']);
+
+ $secretary['id_roles'] = $this->get_secretary_role_id();
+
+ if ( ! $this->db->insert('ea_users', $secretary))
+ {
+ throw new Exception('Could not insert secretary into the database.');
+ }
+
+ $secretary['id'] = (int)$this->db->insert_id();
+ $settings['salt'] = generate_salt();
+ $settings['password'] = hash_password($settings['salt'], $settings['password']);
+
+ $this->save_providers($providers, $secretary['id']);
+ $this->save_settings($settings, $secretary['id']);
+
+ return $secretary['id'];
+ }
+
+ /**
+ * Get the secretary users role id.
+ *
+ * @return int Returns the role record id.
+ */
+ public function get_secretary_role_id()
+ {
+ return (int)$this->db->get_where('ea_roles', ['slug' => DB_SLUG_SECRETARY])->row()->id;
+ }
+
+ /**
+ * Save a secretary handling users.
+ *
+ * @param array $providers Contains the provider ids that are handled by the secretary.
+ * @param int $secretary_id The selected secretary record.
+ *
+ * @throws Exception If $providers argument is invalid.
+ */
+ protected function save_providers($providers, $secretary_id)
+ {
+ if ( ! is_array($providers))
+ {
+ throw new Exception('Invalid argument given $providers: ' . print_r($providers, TRUE));
+ }
+
+ // Delete old connections
+ $this->db->delete('ea_secretaries_providers', ['id_users_secretary' => $secretary_id]);
+
+ if (count($providers) > 0)
+ {
+ foreach ($providers as $provider_id)
+ {
+ $this->db->insert('ea_secretaries_providers', [
+ 'id_users_secretary' => $secretary_id,
+ 'id_users_provider' => $provider_id
+ ]);
+ }
+ }
+ }
+
+ /**
+ * Save the secretary settings (used from insert or update operation).
+ *
+ * @param array $settings Contains the setting values.
+ * @param int $secretary_id Record id of the secretary.
+ *
+ * @throws Exception If $secretary_id argument is invalid.
+ * @throws Exception If $settings argument is invalid.
+ */
+ protected function save_settings($settings, $secretary_id)
+ {
+ if ( ! is_numeric($secretary_id))
+ {
+ throw new Exception('Invalid $secretary_id argument given:' . $secretary_id);
+ }
+
+ if (count($settings) == 0 || ! is_array($settings))
+ {
+ throw new Exception('Invalid $settings argument given:' . print_r($settings, TRUE));
+ }
+
+ // Check if the setting record exists in db.
+ $num_rows = $this->db->get_where('ea_user_settings',
+ ['id_users' => $secretary_id])->num_rows();
+ if ($num_rows == 0)
+ {
+ $this->db->insert('ea_user_settings', ['id_users' => $secretary_id]);
+ }
+
+ foreach ($settings as $name => $value)
+ {
+ $this->set_setting($name, $value, $secretary_id);
+ }
+ }
+
+ /**
+ * Set a provider's setting value in the database.
+ *
+ * The provider and settings record must already exist.
+ *
+ * @param string $setting_name The setting's name.
+ * @param string $value The setting's value.
+ * @param int $secretary_id The selected provider id.
+ */
+ public function set_setting($setting_name, $value, $secretary_id)
+ {
+ $this->db->where(['id_users' => $secretary_id]);
+ return $this->db->update('ea_user_settings', [$setting_name => $value]);
+ }
+
+ /**
+ * Update an existing secretary record in the database.
+ *
+ * @param array $secretary Contains the secretary record data.
+ *
+ * @return int Returns the record id.
+ *
+ * @throws Exception When the update operation fails.
+ */
+ protected function _update($secretary)
+ {
+ $this->load->helper('general');
+
+ $providers = $secretary['providers'];
+ unset($secretary['providers']);
+ $settings = $secretary['settings'];
+ unset($secretary['settings']);
+
+ if (isset($settings['password']))
+ {
+ $salt = $this->db->get_where('ea_user_settings', ['id_users' => $secretary['id']])->row()->salt;
+ $settings['password'] = hash_password($salt, $settings['password']);
+ }
+
+ $this->db->where('id', $secretary['id']);
+ if ( ! $this->db->update('ea_users', $secretary))
+ {
+ throw new Exception('Could not update secretary record.');
+ }
+
+ $this->save_providers($providers, $secretary['id']);
+ $this->save_settings($settings, $secretary['id']);
+
+ return (int)$secretary['id'];
+ }
+
/**
* Delete an existing secretary record from the database.
*
@@ -445,81 +554,6 @@ class Secretaries_Model extends CI_Model {
return $batch;
}
- /**
- * Get the secretary users role id.
- *
- * @return int Returns the role record id.
- */
- public function get_secretary_role_id()
- {
- return (int)$this->db->get_where('ea_roles', ['slug' => DB_SLUG_SECRETARY])->row()->id;
- }
-
- /**
- * Save a secretary handling users.
- *
- * @param array $providers Contains the provider ids that are handled by the secretary.
- * @param int $secretary_id The selected secretary record.
- *
- * @throws Exception If $providers argument is invalid.
- */
- protected function save_providers($providers, $secretary_id)
- {
- if ( ! is_array($providers))
- {
- throw new Exception('Invalid argument given $providers: ' . print_r($providers, TRUE));
- }
-
- // Delete old connections
- $this->db->delete('ea_secretaries_providers', ['id_users_secretary' => $secretary_id]);
-
- if (count($providers) > 0)
- {
- foreach ($providers as $provider_id)
- {
- $this->db->insert('ea_secretaries_providers', [
- 'id_users_secretary' => $secretary_id,
- 'id_users_provider' => $provider_id
- ]);
- }
- }
- }
-
- /**
- * Save the secretary settings (used from insert or update operation).
- *
- * @param array $settings Contains the setting values.
- * @param int $secretary_id Record id of the secretary.
- *
- * @throws Exception If $secretary_id argument is invalid.
- * @throws Exception If $settings argument is invalid.
- */
- protected function save_settings($settings, $secretary_id)
- {
- if ( ! is_numeric($secretary_id))
- {
- throw new Exception('Invalid $secretary_id argument given:' . $secretary_id);
- }
-
- if (count($settings) == 0 || ! is_array($settings))
- {
- throw new Exception('Invalid $settings argument given:' . print_r($settings, TRUE));
- }
-
- // Check if the setting record exists in db.
- $num_rows = $this->db->get_where('ea_user_settings',
- ['id_users' => $secretary_id])->num_rows();
- if ($num_rows == 0)
- {
- $this->db->insert('ea_user_settings', ['id_users' => $secretary_id]);
- }
-
- foreach ($settings as $name => $value)
- {
- $this->set_setting($name, $value, $secretary_id);
- }
- }
-
/**
* Get a providers setting from the database.
*
@@ -534,34 +568,4 @@ class Secretaries_Model extends CI_Model {
['id_users' => $secretary_id])->row_array();
return $provider_settings[$setting_name];
}
-
- /**
- * Set a provider's setting value in the database.
- *
- * The provider and settings record must already exist.
- *
- * @param string $setting_name The setting's name.
- * @param string $value The setting's value.
- * @param int $secretary_id The selected provider id.
- */
- public function set_setting($setting_name, $value, $secretary_id)
- {
- $this->db->where(['id_users' => $secretary_id]);
- return $this->db->update('ea_user_settings', [$setting_name => $value]);
- }
-
- /**
- * Validate Records Username
- *
- * @param string $username The provider records username.
- * @param int $user_id The user record id.
- *
- * @return bool Returns the validation result.
- */
- public function validate_username($username, $user_id)
- {
- $num_rows = $this->db->get_where('ea_user_settings',
- ['username' => $username, 'id_users <> ' => $user_id])->num_rows();
- return ($num_rows > 0) ? FALSE : TRUE;
- }
}
diff --git a/application/models/Services_model.php b/application/models/Services_model.php
index 8ee64bde..f8ec7251 100644
--- a/application/models/Services_model.php
+++ b/application/models/Services_model.php
@@ -1,4 +1,4 @@
-db->insert('ea_services', $service))
- {
- throw new Exception('Could not insert service record.');
- }
- return (int)$this->db->insert_id();
- }
-
- /**
- * Update service record.
- *
- * @param array $service Contains the service data. The record id needs to be included in the array.
- *
- * @throws Exception If service record could not be updated.
- */
- protected function _update($service)
- {
- $this->db->where('id', $service['id']);
- if ( ! $this->db->update('ea_services', $service))
- {
- throw new Exception('Could not update service record');
- }
- }
-
- /**
- * Checks whether an service record already exists in the database.
- *
- * @param array $service Contains the service data. Name, duration and price values are mandatory in order to
- * perform the checks.
- *
- * @return bool Returns whether the service record exists.
- *
- * @throws Exception If required fields are missing.
- */
- public function exists($service)
- {
- if ( ! isset($service['name'])
- || ! isset($service['duration'])
- || ! isset($service['price']))
- {
- throw new Exception('Not all service fields are provided in order to check whether '
- . 'a service record already exists: ' . print_r($service, TRUE));
- }
-
- $num_rows = $this->db->get_where('ea_services', [
- 'name' => $service['name'],
- 'duration' => $service['duration'],
- 'price' => $service['price']
- ])->num_rows();
-
- return ($num_rows > 0) ? TRUE : FALSE;
- }
-
/**
* Validate a service record data.
*
@@ -181,6 +122,69 @@ class Services_Model extends CI_Model {
return TRUE;
}
+ /**
+ * Insert service record into database.
+ *
+ * @param array $service Contains the service record data.
+ *
+ * @return int Returns the new service record id.
+ *
+ * @throws Exception If service record could not be inserted.
+ */
+ protected function _insert($service)
+ {
+ if ( ! $this->db->insert('ea_services', $service))
+ {
+ throw new Exception('Could not insert service record.');
+ }
+ return (int)$this->db->insert_id();
+ }
+
+ /**
+ * Update service record.
+ *
+ * @param array $service Contains the service data. The record id needs to be included in the array.
+ *
+ * @throws Exception If service record could not be updated.
+ */
+ protected function _update($service)
+ {
+ $this->db->where('id', $service['id']);
+ if ( ! $this->db->update('ea_services', $service))
+ {
+ throw new Exception('Could not update service record');
+ }
+ }
+
+ /**
+ * Checks whether an service record already exists in the database.
+ *
+ * @param array $service Contains the service data. Name, duration and price values are mandatory in order to
+ * perform the checks.
+ *
+ * @return bool Returns whether the service record exists.
+ *
+ * @throws Exception If required fields are missing.
+ */
+ public function exists($service)
+ {
+ if ( ! isset($service['name'])
+ || ! isset($service['duration'])
+ || ! isset($service['price']))
+ {
+ throw new Exception('Not all service fields are provided in order to check whether '
+ . 'a service record already exists: ' . print_r($service, TRUE));
+ }
+
+ $num_rows = $this->db->get_where('ea_services', [
+ 'name' => $service['name'],
+ 'duration' => $service['duration'],
+ 'price' => $service['price']
+ ])->num_rows();
+
+ return ($num_rows > 0) ? TRUE : FALSE;
+ }
+
/**
* Get the record id of an existing record.
*
@@ -304,12 +308,12 @@ class Services_Model extends CI_Model {
/**
* Get all, or specific records from service's table.
*
- * @example $this->Model->getBatch('id = ' . $recordId);
- *
* @param string $whereClause (OPTIONAL) The WHERE clause of
* the query to be executed. DO NOT INCLUDE 'WHERE' KEYWORD.
*
* @return array Returns the rows from the database.
+ * @example $this->Model->getBatch('id = ' . $recordId);
+ *
*/
public function get_batch($where = NULL, $order_by = NULL, $limit = NULL, $offset = NULL)
{
@@ -376,6 +380,40 @@ class Services_Model extends CI_Model {
return (int)$category['id'];
}
+ /**
+ * Validate a service category record data. This method must be used before adding
+ * a service category record into database in order to secure the record integrity.
+ *
+ * @param array $category Contains the service category data.
+ *
+ * @return bool Returns the validation result.
+ *
+ * @throws Exception If required fields are missing.
+ */
+ public function validate_category($category)
+ {
+ try
+ {
+ // Required Fields
+ if ( ! isset($category['name']))
+ {
+ throw new Exception('Not all required fields where provided ');
+ }
+
+ if ($category['name'] == '' || $category['name'] == NULL)
+ {
+ throw new Exception('Required fields cannot be empty or null ($category: '
+ . print_r($category, TRUE) . ')');
+ }
+
+ return TRUE;
+ }
+ catch (Exception $exception)
+ {
+ return FALSE;
+ }
+ }
+
/**
* Delete a service category record from the database.
*
@@ -449,38 +487,4 @@ class Services_Model extends CI_Model {
return $this->db->get('ea_service_categories', $limit, $offset)->result_array();
}
-
- /**
- * Validate a service category record data. This method must be used before adding
- * a service category record into database in order to secure the record integrity.
- *
- * @param array $category Contains the service category data.
- *
- * @return bool Returns the validation result.
- *
- * @throws Exception If required fields are missing.
- */
- public function validate_category($category)
- {
- try
- {
- // Required Fields
- if ( ! isset($category['name']))
- {
- throw new Exception('Not all required fields where provided ');
- }
-
- if ($category['name'] == '' || $category['name'] == NULL)
- {
- throw new Exception('Required fields cannot be empty or null ($category: '
- . print_r($category, TRUE) . ')');
- }
-
- return TRUE;
- }
- catch (Exception $exc)
- {
- return FALSE;
- }
- }
}
diff --git a/application/models/Settings_model.php b/application/models/Settings_model.php
index 9d318d10..4cd4ec1b 100644
--- a/application/models/Settings_model.php
+++ b/application/models/Settings_model.php
@@ -1,4 +1,4 @@
-timezones));
- }
-
/**
* Get all timezones to a grouped array (by continent).
*
@@ -477,33 +470,6 @@ class Timezones_Model extends CI_Model {
return $this->timezones;
}
- /**
- * Convert a date time value to a new timezone.
- *
- * @param string $value Provide a date time value as a string (format Y-m-d H:i:s).
- * @param string $from_timezone From timezone value.
- * @param string $to_timezone To timezone value.
- * @return string
- * @throws Exception
- */
- public function convert($value, $from_timezone, $to_timezone)
- {
- if ( ! $to_timezone)
- {
- return $value;
- }
-
- $from = new \DateTimeZone($from_timezone);
-
- $to = new \DateTimeZone($to_timezone);
-
- $result = new \DateTime($value, $from);
-
- $result->setTimezone($to);
-
- return $result->format('Y-m-d H:i:s');
- }
-
/**
* Convert the dates of an event to the timezone of the user.
*
@@ -558,6 +524,43 @@ class Timezones_Model extends CI_Model {
return isset($this->session->timezone) ? $this->session->timezone : $default_timezone;
}
+ /**
+ * Get the default timezone value of the current system.
+ *
+ * @return string
+ */
+ public function get_default_timezone()
+ {
+ return 'UTC';
+ }
+
+ /**
+ * Convert a date time value to a new timezone.
+ *
+ * @param string $value Provide a date time value as a string (format Y-m-d H:i:s).
+ * @param string $from_timezone From timezone value.
+ * @param string $to_timezone To timezone value.
+ * @return string
+ * @throws Exception
+ */
+ public function convert($value, $from_timezone, $to_timezone)
+ {
+ if ( ! $to_timezone)
+ {
+ return $value;
+ }
+
+ $from = new DateTimeZone($from_timezone);
+
+ $to = new DateTimeZone($to_timezone);
+
+ $result = new DateTime($value, $from);
+
+ $result->setTimezone($to);
+
+ return $result->format('Y-m-d H:i:s');
+ }
+
/**
* Get the timezone name for the provided value.
*
@@ -571,14 +574,13 @@ class Timezones_Model extends CI_Model {
return isset($timezones[$value]) ? $timezones[$value] : NULL;
}
-
/**
- * Get the default timezone value of the current system.
+ * Get all timezones to a flat array.
*
- * @return string
+ * @return array
*/
- public function get_default_timezone()
+ public function to_array()
{
- return 'UTC';
+ return array_merge(...array_values($this->timezones));
}
}
diff --git a/application/models/User_model.php b/application/models/User_model.php
index e106ffac..520ea076 100644
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -1,4 +1,4 @@
-db->get_where('ea_users', ['id' => $user_id])->row_array();
$user['settings'] = $this->db->get_where('ea_user_settings', ['id_users' => $user_id])->row_array();
@@ -42,10 +43,8 @@ class User_Model extends CI_Model {
* @param array $user Contains the current users data.
*
* @return bool Returns the operation result.
- *
- * @todo Refactor this method as it does not do as it states.
*/
- public function save_settings($user)
+ public function save_user($user)
{
$user_settings = $user['settings'];
$user_settings['id_users'] = $user['id'];
@@ -72,19 +71,6 @@ class User_Model extends CI_Model {
return TRUE;
}
- /**
- * Retrieve user's salt from database.
- *
- * @param string $username This will be used to find the user record.
- *
- * @return string Returns the salt db value.
- */
- public function get_salt($username)
- {
- $user = $this->db->get_where('ea_user_settings', ['username' => $username])->row_array();
- return ($user) ? $user['salt'] : '';
- }
-
/**
* Performs the check of the given user credentials.
*
@@ -96,7 +82,7 @@ class User_Model extends CI_Model {
public function check_login($username, $password)
{
$this->load->helper('general');
- $salt = $this->user_model->get_salt($username);
+ $salt = $this->get_salt($username);
$password = hash_password($salt, $password);
$user_settings = $this->db->get_where('ea_user_settings', [
@@ -136,6 +122,19 @@ class User_Model extends CI_Model {
];
}
+ /**
+ * Retrieve user's salt from database.
+ *
+ * @param string $username This will be used to find the user record.
+ *
+ * @return string Returns the salt db value.
+ */
+ public function get_salt($username)
+ {
+ $user = $this->db->get_where('ea_user_settings', ['username' => $username])->row_array();
+ return ($user) ? $user['salt'] : '';
+ }
+
/**
* Get the given user's display name (first + last name).
*
diff --git a/application/views/appointments/book.php b/application/views/appointments/book.php
index b777838c..3ac56825 100755
--- a/application/views/appointments/book.php
+++ b/application/views/appointments/book.php
@@ -1,5 +1,5 @@
-
+