Develop

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Install dependencies
         uses: php-actions/composer@v6
         with:
-          php_version: 8.1
+          php_version: 8.2
           php_extensions: gd
           version: 2
       - name: PHPUnit Tests

CHANGELOG.md

@@ -45,6 +45,7 @@ developers to maintain and readjust their custom modifications on the main proje
 - Add a SECURITY.md file to the repository (#1122)
 - Add support for custom fields on customers (#1133)
 - Add from email/name and reply-to settings in the email.php configuration file (#1465)
+- Create a new setting that will define the default timezone of the application (#1390)
 
 ### Changed
 

application/config/config.php

@@ -353,7 +353,7 @@
 $config['sess_save_path'] = __DIR__ . '/../../storage/sessions';
 $config['sess_match_ip'] = false;
 $config['sess_time_to_update'] = 300;
-$config['sess_regenerate_destroy'] = false;
+$config['sess_regenerate_destroy'] = true;
 
 /*
 |--------------------------------------------------------------------------

application/controllers/Account.php

@@ -20,6 +20,24 @@
  */
 class Account extends EA_Controller
 {
+    public array $allowed_user_fields = [
+        'id',
+        'first_name',
+        'last_name',
+        'email',
+        'mobile_number',
+        'phone_number',
+        'address',
+        'city',
+        'state',
+        'zip_code',
+        'notes',
+        'timezone',
+        'language',
+        'settings',
+    ];
+    public array $allowed_user_setting_fields = ['username', 'password', 'notifications', 'calendar_view'];
+
     /**
      * Account constructor.
      */
@@ -90,24 +108,9 @@ public function save(): void
 
             $account['id'] = session('user_id');
 
-            $this->users_model->only($account, [
-                'id',
-                'first_name',
-                'last_name',
-                'email',
-                'mobile_number',
-                'phone_number',
-                'address',
-                'city',
-                'state',
-                'zip_code',
-                'notes',
-                'timezone',
-                'language',
-                'settings',
-            ]);
+            $this->users_model->only($account, $this->allowed_user_fields);
 
-            $this->users_model->only($account['settings'], ['username', 'password', 'notifications', 'calendar_view']);
+            $this->users_model->only($account['settings'], $this->allowed_user_setting_fields);
 
             if (empty($account['password'])) {
                 unset($account['password']);

application/controllers/Admins.php

@@ -20,6 +20,25 @@
  */
 class Admins extends EA_Controller
 {
+    public array $allowed_admin_fields = [
+        'id',
+        'first_name',
+        'last_name',
+        'email',
+        'mobile_number',
+        'phone_number',
+        'address',
+        'city',
+        'state',
+        'zip_code',
+        'notes',
+        'timezone',
+        'language',
+        'settings',
+    ];
+
+    public array $allowed_admin_setting_fields = ['username', 'password', 'notifications', 'calendar_view'];
+
     /**
      * Admins constructor.
      */
@@ -64,6 +83,8 @@ public function index(): void
             'role_slug' => $role_slug,
             'timezones' => $this->timezones->to_array(),
             'min_password_length' => MIN_PASSWORD_LENGTH,
+            'default_language' => setting('default_language'),
+            'default_timezone' => setting('default_timezone'),
         ]);
 
         html_vars([
@@ -89,11 +110,11 @@ public function search(): void
 
             $keyword = request('keyword', '');
 
-            $order_by = 'update_datetime DESC';
+            $order_by = request('order_by', 'update_datetime DESC');
 
             $limit = request('limit', 1000);
 
-            $offset = 0;
+            $offset = (int) request('offset', '0');
 
             $admins = $this->admins_model->search($keyword, $limit, $offset, $order_by);
 
@@ -115,23 +136,9 @@ public function store(): void
 
             $admin = request('admin');
 
-            $this->admins_model->only($admin, [
-                'first_name',
-                'last_name',
-                'email',
-                'mobile_number',
-                'phone_number',
-                'address',
-                'city',
-                'state',
-                'zip_code',
-                'notes',
-                'timezone',
-                'language',
-                'settings',
-            ]);
+            $this->admins_model->only($admin, $this->allowed_admin_fields);
 
-            $this->admins_model->only($admin['settings'], ['username', 'password', 'notifications', 'calendar_view']);
+            $this->admins_model->only($admin['settings'], $this->allowed_admin_setting_fields);
 
             $admin_id = $this->admins_model->save($admin);
 
@@ -180,24 +187,9 @@ public function update(): void
 
             $admin = request('admin');
 
-            $this->admins_model->only($admin, [
-                'id',
-                'first_name',
-                'last_name',
-                'email',
-                'mobile_number',
-                'phone_number',
-                'address',
-                'city',
-                'state',
-                'zip_code',
-                'notes',
-                'timezone',
-                'language',
-                'settings',
-            ]);
+            $this->admins_model->only($admin, $this->allowed_admin_fields);
 
-            $this->admins_model->only($admin['settings'], ['username', 'password', 'notifications', 'calendar_view']);
+            $this->admins_model->only($admin['settings'], $this->allowed_admin_setting_fields);
 
             $admin_id = $this->admins_model->save($admin);
 

application/controllers/Appointments.php

@@ -23,6 +23,19 @@
  */
 class Appointments extends EA_Controller
 {
+    public array $allowed_appointment_fields = [
+        'id',
+        'start_datetime',
+        'end_datetime',
+        'location',
+        'notes',
+        'color',
+        'is_unavailability',
+        'id_users_provider',
+        'id_users_customer',
+        'id_services',
+    ];
+
     /**
      * Appointments constructor.
      */
@@ -62,11 +75,11 @@ public function search(): void
 
             $keyword = request('keyword', '');
 
-            $order_by = 'update_datetime DESC';
+            $order_by = request('order_by', 'update_datetime DESC');
 
             $limit = request('limit', 1000);
 
-            $offset = 0;
+            $offset = (int) request('offset', '0');
 
             $appointments = $this->appointments_model->search($keyword, $limit, $offset, $order_by);
 
@@ -88,17 +101,7 @@ public function store(): void
 
             $appointment = json_decode(request('appointment'), true);
 
-            $this->appointments_model->only($appointment, [
-                'start_datetime',
-                'end_datetime',
-                'location',
-                'notes',
-                'color',
-                'is_unavailability',
-                'id_users_provider',
-                'id_users_customer',
-                'id_services',
-            ]);
+            $this->appointments_model->only($appointment, $this->allowed_appointment_fields);
 
             $appointment_id = $this->appointments_model->save($appointment);
 
@@ -147,18 +150,7 @@ public function update(): void
 
             $appointment = json_decode(request('appointment'), true);
 
-            $this->appointments_model->only($appointment, [
-                'id',
-                'start_datetime',
-                'end_datetime',
-                'location',
-                'notes',
-                'color',
-                'is_unavailability',
-                'id_users_provider',
-                'id_users_customer',
-                'id_services',
-            ]);
+            $this->appointments_model->only($appointment, $this->allowed_appointment_fields);
 
             $appointment_id = $this->appointments_model->save($appointment);
 

application/controllers/Blocked_periods.php

@@ -20,6 +20,8 @@
  */
 class Blocked_periods extends EA_Controller
 {
+    public array $allowed_blocked_period_fields = ['id', 'name', 'start_datetime', 'end_datetime', 'notes'];
+
     /**
      * Blocked_periods constructor.
      */
@@ -90,11 +92,11 @@ public function search(): void
 
             $keyword = request('keyword', '');
 
-            $order_by = 'update_datetime DESC';
+            $order_by = request('order_by', 'update_datetime DESC');
 
             $limit = request('limit', 1000);
 
-            $offset = 0;
+            $offset = (int) request('offset', '0');
 
             $blocked_periods = $this->blocked_periods_model->search($keyword, $limit, $offset, $order_by);
 
@@ -116,7 +118,7 @@ public function store(): void
 
             $blocked_period = request('blocked_period');
 
-            $this->blocked_periods_model->only($blocked_period, ['name', 'start_datetime', 'end_datetime', 'notes']);
+            $this->blocked_periods_model->only($blocked_period, $this->allowed_blocked_period_fields);
 
             $blocked_period_id = $this->blocked_periods_model->save($blocked_period);
 
@@ -165,13 +167,7 @@ public function update(): void
 
             $blocked_period = request('blocked_period');
 
-            $this->blocked_periods_model->only($blocked_period, [
-                'id',
-                'name',
-                'start_datetime',
-                'end_datetime',
-                'notes',
-            ]);
+            $this->blocked_periods_model->only($blocked_period, $this->allowed_blocked_period_fields);
 
             $blocked_period_id = $this->blocked_periods_model->save($blocked_period);