Develop

.editorconfig

@@ -6,5 +6,5 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[{package.json,.travis.yml}]
+[{package.json,*.yml}]
 indent_size = 2

.github/SECURITY.md

@@ -0,0 +1,4 @@
+# Security Vulnerabilities
+
+If you discover a security vulnerability within Easy!Appointments, please send an email to [email protected]. 
+All security vulnerabilities will be promptly addressed.

.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: CI
+
+on: [ push ]
+
+jobs:
+  build-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Git clone
+        uses: actions/checkout@v2
+      - name: Install dependencies
+        uses: php-actions/composer@v6
+        with:
+          php_version: 8.2
+          php_extensions: gd
+          version: 2
+      - name: PHPUnit Tests
+        uses: php-actions/phpunit@v3
+        env:
+          TEST_NAME: Test
+        with:
+          configuration: phpunit.xml

.gitignore

@@ -5,12 +5,14 @@
 /docs/apigen/html
 /docs/jsdoc/html
 /docs/plato/html
-/docker/mysql/*
-!/docker/mysql/.gitkeep
+/docker/mysql/
+/docker/baikal/
+/docker/openldap/
 /node_modules/
 /npm-debug.log
 /assets/js/**/*.min.js
-/assets/css/**/*.min.css
+/assets/css/**/*.css
+/assets/vendor
 /config.php
 /storage/backups/*
 !/storage/backups/.htaccess

.prettierignore

@@ -0,0 +1,11 @@
+.idea
+.github
+.run
+application/language/*
+build
+docker
+docs
+node_modules
+storage
+system
+vendor

.prettierrc.json

@@ -0,0 +1,12 @@
+{
+    "printWidth": 120,
+    "tabWidth": 4,
+    "singleQuote": true,
+    "bracketSpacing": false,
+    "bracketSameLine": false,
+    "quoteProps": "preserve",
+    "trailingComma": "all",
+    "trailingCommaPHP": true,
+    "phpVersion": "8.0",
+    "plugins": ["@prettier/plugin-php"]
+}

.run/Build.run.xml

@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Build" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="if [ -z &quot;$(docker compose ls | grep $(basename &quot;$PWD&quot;))&quot; ]; then docker stop $(docker ps -a -q) &amp;&amp; docker network prune -f &amp;&amp; docker compose up -d --force-recreate &amp;&amp; docker exec -it $(basename &quot;$PWD&quot;)-php-fpm-1 npm run build; else docker exec -it $(basename &quot;$PWD&quot;)-php-fpm-1 npm run build; fi " />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/zsh" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

.run/SSH.run.xml

@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="SSH" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="if [ -z &quot;$(docker compose ls | grep $(basename &quot;$PWD&quot;))&quot; ]; then docker stop $(docker ps -a -q) &amp;&amp; docker network prune -f &amp;&amp; docker compose up -d --force-recreate &amp;&amp; docker exec -it $(basename &quot;$PWD&quot;)-php-fpm-1 bash; else docker exec -it $(basename &quot;$PWD&quot;)-php-fpm-1 bash; fi" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/zsh" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

.run/Start.run.xml

@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Start" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="if [ -z &quot;$(docker compose ls | grep $(basename &quot;$PWD&quot;))&quot; ]; then docker stop $(docker ps -a -q) &amp;&amp; docker network prune -f &amp;&amp; docker compose up -d --force-recreate &amp;&amp; docker exec -it $(basename &quot;$PWD&quot;)-php-fpm-1 npm start; else echo &quot;Docker compose is already running\!&quot;; fi  " />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/zsh" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

.run/Stop.run.xml

@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Stop" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="docker stop $(docker ps -a -q)" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/zsh" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

CHANGELOG.md

@@ -3,6 +3,110 @@
 This file contains the code changes that were introduced into each release (starting from v1.1.0) so that is easy for 
 developers to maintain and readjust their custom modifications on the main project codebase.
 
+## [Unreleased]
+
+### Fixed
+
+- Fix the GTag script URL html rendering (#1666)
+
+
+
+
+## [1.5.1] - 2025-01-20
+
+### Added
+
+- Add support for PHP 8.4 (#1640)
+- Add new secret token header field to webhooks and default to X-EA-Token (#1607)
+- Add company colors to notifications (#1569)
+- Add Albanian Language Translations (#1646)
+
+### Fixed
+
+- Fix the date parsing issue on Safari web browsers during the booking process (#1584)
+- Fix working plan configuration am/pm hour parsing so that it works in all languages (#1606)
+- Improve the CalDAV syncing mechanism so that it connects to more systems without problems (#1622)
+- Fix various 1.5.0 API issues (#1562)
+- Correct email issues by replacing the internal email library with phpmailer (#1587)
+- Fix ICS file mimetype (#1630)
+- Incorrect Timezone Handling in CalDAV Synchronization Causes Time Shifts (#1626)
+- No color change in the appointment modal window (in the backend calendar) (#1641)
+- The plain user password might appear in the log messages in case of an error (#1590)
+- Fix loop when going a month back in an edge case (#1577)
+- Dedicated provider links do not pre-select the relevant provider on the booking page (#1651)
+- Correct the service / provider booking header display (#1650)
+
+
+
+## [1.5.0] - 2024-07-07
+
+### Added
+
+- Display month with the earliest available day (#1075)
+- Allow admins to define the business closed dates (blocked-periods) (#432)
+- Allow working plan exceptions to be defined as non-working days (#1383)
+- Create an official docker image of the project and host it on Docker Hub(#1116)
+- Automatically select the next available date in the booking page or display a message if this month is unavailable (#1204)
+- Add Open Graph information to the public booking page so that it renders nicely once shared on social media apps (#1382)
+- Preselect the date with a query parameter (#1376)
+- Add the location and notes fields to the appointment email notifications (if a value was provided) (#1341)
+- Add date, from and till query parameters to the filter the appointments index results by date (#1134)
+- Allow the users to define their own status and assign them to appointments (#244)
+- Add new setting for limiting new public bookings in the future (#1203)
+- Automatically enable the secure cookie config if the current installation uses HTTPS (#1126)
+- Add language and timezone properties to the customer API resource (#1157)
+- Add support for the definition of custom webhooks via the settings page (#581)
+- Allow the user to select their own preferred language (#1263)
+- Support multiple Bootswatch themes for the app (#1205)
+- Providers and secretaries must only be able to see and manage their own customers (#1199)
+- Use the default service duration if the user just clicks on a calendar slot for creating a new appointment (#1237)
+- Google Calendar synchronisation failure when symbols/emoji appear in events to be imported (#1182)
+- Add the customer timezone field in the appointment modal of the calendar page (#1094)
+- Add a new setting that toggles the login link of the booking page (#1148)
+- Add custom Matomo analytics integration (#974)
+- Prefill the form field though url parameters (#1021)
+- Color code events by provider or service (#422)
+- Service duration values shorter than 5 minutes should be acceptable via the services page (#1110)
+- Add a new "is_private" flag to services and providers so that they do not appear in the booking page (#378)
+- Skip the first booking step when only one service and one provider are available (#349)
+- Enable the change of the brand logo and colors from the backend (#789)
+- Add the ability to temporarily block new appointments / set away message (#940)
+- Add optional (configurable with setting) phone number validation (#820)
+- Add an option to deactivate the remove-all-data function for customers (#808)
+- Skip the first booking step if both provider and service are preselected (#1117)
+- Make delete appointment via API to send emails just like the calendar page does (#1101)
+- Create new layout structure for the markup, so that common HTML markup is being reused (#1152)
+- Have an option to hide customer data fields during booking (#1081)
+- 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)
+- Integrate CalDAV Protocol for appointment syncing (#209)
+- Add LDAP / Active Directory integration (#128)
+
+### Changed
+
+- Do not allow a customer to book the same hours multiple times (#1420)
+- All the user roles with access to the backend calendar page can filter by services (#956)
+- Update Bootstrap to version 5 (#1150)
+- Update FullCalendar to version 5 (#1151)
+- The availability generation algorithm needs performance improvements when many appointments are stored in the system (#1171)
+- Support for relative paths when loading resources or working with the session (#1158)
+- Support line breaks when displaying the service description (#1149)
+- Remove the CodeIgniter fork from the composer.json file and re-import the system directory (#1109)
+
+### Fixed
+
+- Sync all the providers without errors, when the user clicks on the "sync" button and "all" is selected in the calendar page (#1365)
+- Non-working time not showing correctly in the week view of calendar (#1381)
+- Make sure the booking cancellation is a post request and has a reason value provided (#1178)
+
+### Removed 
+
+- Remove the engine directory and files form the app (they're deprecated) (#971)
+- Remove the PHPMailer dependency from the app and use the built-in CodeIgniter mailer (#970)
+
+
 ## [1.4.3] - 2022-03-08
 
 ### Added

README.md

@@ -80,7 +80,7 @@ You can build the files by running `npm run build`. This command will bundle eve
 
 You will need to perform the following steps to install the application on your server:
 
-* Make sure that your server has Apache/Nginx, PHP and MySQL installed.
+* Make sure that your server has Apache/Nginx, PHP (8.2+) and MySQL installed.
 * Create a new database (or use an existing one).
 * Copy the "easyappointments" source folder on your server.
 * Make sure that the "storage" directory is writable.

application/config/app.php

@@ -0,0 +1,18 @@
+<?php defined('BASEPATH') or exit('No direct script access allowed');
+
+/*
+|--------------------------------------------------------------------------
+| App Configuration
+|--------------------------------------------------------------------------
+|
+| Declare some of the global config values of Easy!Appointments.
+|
+*/
+
+$config['version'] = '1.5.1'; // This must be changed manually.
+
+$config['url'] = Config::BASE_URL;
+
+$config['debug'] = Config::DEBUG_MODE;
+
+$config['cache_busting_token'] = 'TSJ77';

application/config/autoload.php

@@ -40,7 +40,6 @@
 
 $autoload['packages'] = [];
 
-
 /*
 | -------------------------------------------------------------------
 |  Auto-load Libraries
@@ -55,7 +54,6 @@
 
 $autoload['libraries'] = ['database', 'session'];
 
-
 /*
 | -------------------------------------------------------------------
 |  Auto-load Helper Files
@@ -65,8 +63,29 @@
 |	$autoload['helper'] = array('url', 'file');
 */
 
-$autoload['helper'] = ['custom_exceptions', 'url', 'file', 'language', 'asset', 'config', 'render', 'rate_limit', 'security'];
-
+$autoload['helper'] = [
+    'array',
+    'asset',
+    'config',
+    'date',
+    'debug',
+    'env',
+    'file',
+    'html',
+    'http',
+    'installation',
+    'language',
+    'password',
+    'path',
+    'permission',
+    'rate_limit',
+    'routes',
+    'session',
+    'setting',
+    'string',
+    'url',
+    'validation'
+];
 
 /*
 | -------------------------------------------------------------------
@@ -81,8 +100,7 @@
 |
 */
 
-$autoload['config'] = ['google', 'email'];
-
+$autoload['config'] = ['app', 'google', 'email'];
 
 /*
 | -------------------------------------------------------------------
@@ -99,7 +117,6 @@
 
 $autoload['language'] = [];
 
-
 /*
 | -------------------------------------------------------------------
 |  Auto-load Models
@@ -112,6 +129,5 @@
 
 $autoload['model'] = [];
 
-
 /* End of file autoload.php */
 /* Location: ./application/config/autoload.php */