diff --git a/.gitignore b/.gitignore index b9c3b5e0..0ac90687 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ /docs/jsdoc/html /docs/plato/html /docker/mysql/* -/docker/build/iflrandevu-* +/docker/build/maket-* !/docker/mysql/.gitkeep /node_modules/ /npm-debug.log diff --git a/application/config/autoload.php b/application/config/autoload.php index b5d8fd4c..a7dde363 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -64,7 +64,7 @@ $autoload['libraries'] = ['database', 'session']; */ $autoload['helper'] = [ - 'iflrandevu/branding', + 'maketrandevu/branding', 'array', 'asset', 'config', diff --git a/application/controllers/About.php b/application/controllers/About.php index 9422d43e..d1c9252f 100644 --- a/application/controllers/About.php +++ b/application/controllers/About.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Account.php b/application/controllers/Account.php index 9212bcdc..02cdd5ef 100644 --- a/application/controllers/Account.php +++ b/application/controllers/Account.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Admins.php b/application/controllers/Admins.php index 59ce9b71..ecccea04 100644 --- a/application/controllers/Admins.php +++ b/application/controllers/Admins.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Api_settings.php b/application/controllers/Api_settings.php index 7999f253..11a00896 100644 --- a/application/controllers/Api_settings.php +++ b/application/controllers/Api_settings.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Appointments.php b/application/controllers/Appointments.php index a010ceca..46913696 100644 --- a/application/controllers/Appointments.php +++ b/application/controllers/Appointments.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Backend.php b/application/controllers/Backend.php index 5aee4ed6..4ba326e1 100755 --- a/application/controllers/Backend.php +++ b/application/controllers/Backend.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Backend_api.php b/application/controllers/Backend_api.php index 54b30b50..4224a035 100755 --- a/application/controllers/Backend_api.php +++ b/application/controllers/Backend_api.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Blocked_periods.php b/application/controllers/Blocked_periods.php index 7a127509..cbf1d451 100644 --- a/application/controllers/Blocked_periods.php +++ b/application/controllers/Blocked_periods.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Booking.php b/application/controllers/Booking.php index be37d103..9709d893 100755 --- a/application/controllers/Booking.php +++ b/application/controllers/Booking.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Booking_cancellation.php b/application/controllers/Booking_cancellation.php index f2e5a84e..5fa3f057 100755 --- a/application/controllers/Booking_cancellation.php +++ b/application/controllers/Booking_cancellation.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Booking_confirmation.php b/application/controllers/Booking_confirmation.php index 657a0d65..4c49fac0 100755 --- a/application/controllers/Booking_confirmation.php +++ b/application/controllers/Booking_confirmation.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Booking_settings.php b/application/controllers/Booking_settings.php index b19dd7a2..021b7ff6 100644 --- a/application/controllers/Booking_settings.php +++ b/application/controllers/Booking_settings.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Business_settings.php b/application/controllers/Business_settings.php index 05b218e3..c8a17026 100644 --- a/application/controllers/Business_settings.php +++ b/application/controllers/Business_settings.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Calendar.php b/application/controllers/Calendar.php index 40be2c76..aff99bea 100644 --- a/application/controllers/Calendar.php +++ b/application/controllers/Calendar.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Captcha.php b/application/controllers/Captcha.php index efdd622c..0997e7dc 100644 --- a/application/controllers/Captcha.php +++ b/application/controllers/Captcha.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Consents.php b/application/controllers/Consents.php index 8dba49fe..ec1b526a 100644 --- a/application/controllers/Consents.php +++ b/application/controllers/Consents.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Console.php b/application/controllers/Console.php index 1690a416..c0744330 100644 --- a/application/controllers/Console.php +++ b/application/controllers/Console.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Customers.php b/application/controllers/Customers.php index 7305ff33..2d0fb96f 100644 --- a/application/controllers/Customers.php +++ b/application/controllers/Customers.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/General_settings.php b/application/controllers/General_settings.php index 14c47980..e158f9fd 100644 --- a/application/controllers/General_settings.php +++ b/application/controllers/General_settings.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Google.php b/application/controllers/Google.php index 4ce10a4b..54336e57 100644 --- a/application/controllers/Google.php +++ b/application/controllers/Google.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Google_analytics_settings.php b/application/controllers/Google_analytics_settings.php index 698eff2a..97704772 100644 --- a/application/controllers/Google_analytics_settings.php +++ b/application/controllers/Google_analytics_settings.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Installation.php b/application/controllers/Installation.php index d9f4880e..4a643193 100644 --- a/application/controllers/Installation.php +++ b/application/controllers/Installation.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Integrations.php b/application/controllers/Integrations.php index 659aefd1..8c2c3ef7 100644 --- a/application/controllers/Integrations.php +++ b/application/controllers/Integrations.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Legal_settings.php b/application/controllers/Legal_settings.php index a9a1b40d..ea7555bd 100644 --- a/application/controllers/Legal_settings.php +++ b/application/controllers/Legal_settings.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Login.php b/application/controllers/Login.php index d473e96d..675a03b0 100644 --- a/application/controllers/Login.php +++ b/application/controllers/Login.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Logout.php b/application/controllers/Logout.php index 5167de82..7a116f1e 100644 --- a/application/controllers/Logout.php +++ b/application/controllers/Logout.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Matomo_analytics_settings.php b/application/controllers/Matomo_analytics_settings.php index b1883710..e948d2b0 100644 --- a/application/controllers/Matomo_analytics_settings.php +++ b/application/controllers/Matomo_analytics_settings.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Privacy.php b/application/controllers/Privacy.php index c25b2258..d3888fe3 100644 --- a/application/controllers/Privacy.php +++ b/application/controllers/Privacy.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Providers.php b/application/controllers/Providers.php index af6d0aa4..7ed24164 100644 --- a/application/controllers/Providers.php +++ b/application/controllers/Providers.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Recovery.php b/application/controllers/Recovery.php index 935d7258..0ef9c7a4 100644 --- a/application/controllers/Recovery.php +++ b/application/controllers/Recovery.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Secretaries.php b/application/controllers/Secretaries.php index fc052297..53d7af5c 100644 --- a/application/controllers/Secretaries.php +++ b/application/controllers/Secretaries.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Service_categories.php b/application/controllers/Service_categories.php index ed22d822..79f3cdb2 100644 --- a/application/controllers/Service_categories.php +++ b/application/controllers/Service_categories.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Services.php b/application/controllers/Services.php index 3ccd449e..87420403 100644 --- a/application/controllers/Services.php +++ b/application/controllers/Services.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Test.php b/application/controllers/Test.php index bf6964f4..c500eed7 100644 --- a/application/controllers/Test.php +++ b/application/controllers/Test.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Unavailabilities.php b/application/controllers/Unavailabilities.php index fb84e8e3..5699b8ec 100644 --- a/application/controllers/Unavailabilities.php +++ b/application/controllers/Unavailabilities.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Update.php b/application/controllers/Update.php index 5a9416d0..1fecf61f 100644 --- a/application/controllers/Update.php +++ b/application/controllers/Update.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/User.php b/application/controllers/User.php index 53a8e0d9..52b0ca31 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/Webhooks.php b/application/controllers/Webhooks.php index 27a46b1c..ea38e34e 100644 --- a/application/controllers/Webhooks.php +++ b/application/controllers/Webhooks.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/api/v1/Admins_api_v1.php b/application/controllers/api/v1/Admins_api_v1.php index cd2febae..19c822b6 100644 --- a/application/controllers/api/v1/Admins_api_v1.php +++ b/application/controllers/api/v1/Admins_api_v1.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/api/v1/Appointments_api_v1.php b/application/controllers/api/v1/Appointments_api_v1.php index eca0157c..3afda6ea 100644 --- a/application/controllers/api/v1/Appointments_api_v1.php +++ b/application/controllers/api/v1/Appointments_api_v1.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/api/v1/Availabilities_api_v1.php b/application/controllers/api/v1/Availabilities_api_v1.php index 76246f75..746e75e1 100644 --- a/application/controllers/api/v1/Availabilities_api_v1.php +++ b/application/controllers/api/v1/Availabilities_api_v1.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/api/v1/Customers_api_v1.php b/application/controllers/api/v1/Customers_api_v1.php index fe6cb2d2..0df3e983 100644 --- a/application/controllers/api/v1/Customers_api_v1.php +++ b/application/controllers/api/v1/Customers_api_v1.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/api/v1/Providers_api_v1.php b/application/controllers/api/v1/Providers_api_v1.php index d0343ccc..bd388f2d 100644 --- a/application/controllers/api/v1/Providers_api_v1.php +++ b/application/controllers/api/v1/Providers_api_v1.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/api/v1/Secretaries_api_v1.php b/application/controllers/api/v1/Secretaries_api_v1.php index bd04930a..c7b643e2 100644 --- a/application/controllers/api/v1/Secretaries_api_v1.php +++ b/application/controllers/api/v1/Secretaries_api_v1.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/api/v1/Service_categories_api_v1.php b/application/controllers/api/v1/Service_categories_api_v1.php index e4046847..c215b87e 100644 --- a/application/controllers/api/v1/Service_categories_api_v1.php +++ b/application/controllers/api/v1/Service_categories_api_v1.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/api/v1/Services_api_v1.php b/application/controllers/api/v1/Services_api_v1.php index 8e5779fd..b023d531 100644 --- a/application/controllers/api/v1/Services_api_v1.php +++ b/application/controllers/api/v1/Services_api_v1.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/api/v1/Settings_api_v1.php b/application/controllers/api/v1/Settings_api_v1.php index d5bfcecf..67fb8ba7 100644 --- a/application/controllers/api/v1/Settings_api_v1.php +++ b/application/controllers/api/v1/Settings_api_v1.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/api/v1/Unavailabilities_api_v1.php b/application/controllers/api/v1/Unavailabilities_api_v1.php index e99a9ed5..0213582b 100644 --- a/application/controllers/api/v1/Unavailabilities_api_v1.php +++ b/application/controllers/api/v1/Unavailabilities_api_v1.php @@ -1,7 +1,7 @@ diff --git a/application/controllers/api/v1/Webhooks_api_v1.php b/application/controllers/api/v1/Webhooks_api_v1.php index d62dacfd..329d78ca 100644 --- a/application/controllers/api/v1/Webhooks_api_v1.php +++ b/application/controllers/api/v1/Webhooks_api_v1.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Benchmark.php b/application/core/EA_Benchmark.php index 2a779724..eec79be6 100644 --- a/application/core/EA_Benchmark.php +++ b/application/core/EA_Benchmark.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Cache.php b/application/core/EA_Cache.php index 206671ec..f3954295 100644 --- a/application/core/EA_Cache.php +++ b/application/core/EA_Cache.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Calendar.php b/application/core/EA_Calendar.php index 4e2b53e2..3e8ad3ef 100644 --- a/application/core/EA_Calendar.php +++ b/application/core/EA_Calendar.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Config.php b/application/core/EA_Config.php index 7054258d..b04f4e91 100644 --- a/application/core/EA_Config.php +++ b/application/core/EA_Config.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Controller.php b/application/core/EA_Controller.php index a643efe0..dc469a6c 100644 --- a/application/core/EA_Controller.php +++ b/application/core/EA_Controller.php @@ -1,7 +1,7 @@ @@ -122,7 +122,7 @@ class EA_Controller extends CI_Controller } $this->lang->load('translations'); - $this->lang->load('iflrandevu/translations'); + $this->lang->load('maketrandevu/translations'); } /** diff --git a/application/core/EA_DB_forge.php b/application/core/EA_DB_forge.php index 7ceaae3f..a6b917a2 100644 --- a/application/core/EA_DB_forge.php +++ b/application/core/EA_DB_forge.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_DB_query_builder.php b/application/core/EA_DB_query_builder.php index 0c94109f..1f2b48ea 100644 --- a/application/core/EA_DB_query_builder.php +++ b/application/core/EA_DB_query_builder.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_DB_utility.php b/application/core/EA_DB_utility.php index 1ebb6f12..513075f4 100644 --- a/application/core/EA_DB_utility.php +++ b/application/core/EA_DB_utility.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Email.php b/application/core/EA_Email.php index 53367a5a..aca08c34 100644 --- a/application/core/EA_Email.php +++ b/application/core/EA_Email.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Encrypt.php b/application/core/EA_Encrypt.php index 21daeab2..8aa92781 100644 --- a/application/core/EA_Encrypt.php +++ b/application/core/EA_Encrypt.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Encryption.php b/application/core/EA_Encryption.php index a2d2ed22..2e1730c5 100644 --- a/application/core/EA_Encryption.php +++ b/application/core/EA_Encryption.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Exceptions.php b/application/core/EA_Exceptions.php index 444645b3..7161b7c0 100644 --- a/application/core/EA_Exceptions.php +++ b/application/core/EA_Exceptions.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Hooks.php b/application/core/EA_Hooks.php index 6a6bda45..95c1714e 100644 --- a/application/core/EA_Hooks.php +++ b/application/core/EA_Hooks.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Input.php b/application/core/EA_Input.php index bb9221f4..953e16be 100644 --- a/application/core/EA_Input.php +++ b/application/core/EA_Input.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Lang.php b/application/core/EA_Lang.php index 23146626..b58e23ff 100644 --- a/application/core/EA_Lang.php +++ b/application/core/EA_Lang.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Loader.php b/application/core/EA_Loader.php index 3bd93754..9bfa2eda 100644 --- a/application/core/EA_Loader.php +++ b/application/core/EA_Loader.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Log.php b/application/core/EA_Log.php index d0de82db..912096ad 100644 --- a/application/core/EA_Log.php +++ b/application/core/EA_Log.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Migration.php b/application/core/EA_Migration.php index dfe96945..0a524bfc 100644 --- a/application/core/EA_Migration.php +++ b/application/core/EA_Migration.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Model.php b/application/core/EA_Model.php index 22f1ac1b..a2437e84 100644 --- a/application/core/EA_Model.php +++ b/application/core/EA_Model.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Output.php b/application/core/EA_Output.php index 660dc695..b4203cba 100644 --- a/application/core/EA_Output.php +++ b/application/core/EA_Output.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Profiler.php b/application/core/EA_Profiler.php index 952c4d3b..60a2d3a8 100644 --- a/application/core/EA_Profiler.php +++ b/application/core/EA_Profiler.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Router.php b/application/core/EA_Router.php index 228f633f..8023c0d1 100644 --- a/application/core/EA_Router.php +++ b/application/core/EA_Router.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Security.php b/application/core/EA_Security.php index a8adc11a..1543f113 100644 --- a/application/core/EA_Security.php +++ b/application/core/EA_Security.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Session.php b/application/core/EA_Session.php index b08b3494..603ecb0e 100644 --- a/application/core/EA_Session.php +++ b/application/core/EA_Session.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_URI.php b/application/core/EA_URI.php index 2513705e..6203bd40 100644 --- a/application/core/EA_URI.php +++ b/application/core/EA_URI.php @@ -1,7 +1,7 @@ diff --git a/application/core/EA_Upload.php b/application/core/EA_Upload.php index 22fc3e6d..1e55f4ab 100644 --- a/application/core/EA_Upload.php +++ b/application/core/EA_Upload.php @@ -1,7 +1,7 @@ diff --git a/application/helpers/asset_helper.php b/application/helpers/asset_helper.php index 464006c8..433b6341 100644 --- a/application/helpers/asset_helper.php +++ b/application/helpers/asset_helper.php @@ -1,7 +1,7 @@ diff --git a/application/helpers/config_helper.php b/application/helpers/config_helper.php index 6ed35696..5142da55 100644 --- a/application/helpers/config_helper.php +++ b/application/helpers/config_helper.php @@ -1,7 +1,7 @@ diff --git a/application/helpers/debug_helper.php b/application/helpers/debug_helper.php index d4103f28..85803259 100644 --- a/application/helpers/debug_helper.php +++ b/application/helpers/debug_helper.php @@ -3,7 +3,7 @@ defined('BASEPATH') or exit('No direct script access allowed'); /* ---------------------------------------------------------------------------- - * IFLRandevu - İzmir Fen Lisesi Randevu Portalı + * MaketRandevu - MAKET Randevu Portalı * * @package EasyAppointments * @author A.Tselegidis diff --git a/application/helpers/env_helper.php b/application/helpers/env_helper.php index badd7a34..eee32569 100644 --- a/application/helpers/env_helper.php +++ b/application/helpers/env_helper.php @@ -1,7 +1,7 @@ diff --git a/application/helpers/html_helper.php b/application/helpers/html_helper.php index f6f8a4da..320b0e51 100644 --- a/application/helpers/html_helper.php +++ b/application/helpers/html_helper.php @@ -1,7 +1,7 @@ diff --git a/application/helpers/http_helper.php b/application/helpers/http_helper.php index b842ba68..3ccf5e3f 100644 --- a/application/helpers/http_helper.php +++ b/application/helpers/http_helper.php @@ -1,7 +1,7 @@ diff --git a/application/helpers/installation_helper.php b/application/helpers/installation_helper.php index 276cd0dc..9d9e8197 100644 --- a/application/helpers/installation_helper.php +++ b/application/helpers/installation_helper.php @@ -1,7 +1,7 @@ diff --git a/application/helpers/language_helper.php b/application/helpers/language_helper.php index d2c7c6fb..68fdd06b 100644 --- a/application/helpers/language_helper.php +++ b/application/helpers/language_helper.php @@ -1,7 +1,7 @@ diff --git a/application/helpers/iflrandevu/branding_helper.php b/application/helpers/maketrandevu/branding_helper.php similarity index 82% rename from application/helpers/iflrandevu/branding_helper.php rename to application/helpers/maketrandevu/branding_helper.php index b33dbd20..5851a101 100644 --- a/application/helpers/iflrandevu/branding_helper.php +++ b/application/helpers/maketrandevu/branding_helper.php @@ -3,11 +3,11 @@ /** * Copyleft * - * @package iflrandevu + * @package maketrandevu * @author asandikci * @copyright Copyleft (c) 2023 - 2024 * @license https://opensource.org/licenses/GPL-3.0 GPL3.0 License - * @link https://iflpanel.com/about/randevu + * @link https://iflpanel.com/about/maketrandevu * @since Version 1.4.3 * @filesource */ @@ -17,9 +17,9 @@ use function PHPSTORM_META\type; defined('BASEPATH') or exit('No direct script access allowed'); /** - * IFLRandevu Branding Helper + * MaketRandevu Branding Helper * - * @package iflrandevu + * @package maketrandevu * @subpackage Helpers * @category Helpers * @author asandikci @@ -46,17 +46,17 @@ if (!function_exists('branding')) { // Yazılım Sağlayıcı Bilgileri $software = array( - "name" => "İFL Randevu", - "description" => "İzmir Fen Lisesi Randevu Portalı", + "name" => "MAKET", + "description" => "MAKET Randevu Portalı", "maintainers" => "Aliberk Sandıkçı & Alex Tselegidis", // to also give credit to original maintainer "maintainer_nickname" => "asandikci", "maintainer_name" => "Aliberk Sandıkçı", "maintainer_website" => "https://asandikci.com/", "license" => "GPL3.0", - "website" => "https://iflpanel.com/about/iflrandevu", + "website" => "https://iflpanel.com/about/maketrandevu", "example" => "https://randevu.iflpanel.com/", - "source" => "https://git.aliberksandikci.com.tr/ifl/iflrandevu", - "issues" => "https://git.aliberksandikci.com.tr/ifl/iflrandevu/issues" + "source" => "https://git.aliberksandikci.com.tr/maket/maketrandevu", + "issues" => "https://git.aliberksandikci.com.tr/maket/maketrandevu/issues" ); // Upstream Yazılım Sağlayıcı Bilgileri diff --git a/application/helpers/password_helper.php b/application/helpers/password_helper.php index 0f684f48..b20bdf04 100644 --- a/application/helpers/password_helper.php +++ b/application/helpers/password_helper.php @@ -1,7 +1,7 @@ diff --git a/application/helpers/path_helper.php b/application/helpers/path_helper.php index 3691e307..4c3a70e6 100644 --- a/application/helpers/path_helper.php +++ b/application/helpers/path_helper.php @@ -1,7 +1,7 @@ diff --git a/application/helpers/permission_helper.php b/application/helpers/permission_helper.php index 95151e39..7fc9feb2 100644 --- a/application/helpers/permission_helper.php +++ b/application/helpers/permission_helper.php @@ -1,7 +1,7 @@ diff --git a/application/helpers/routes_helper.php b/application/helpers/routes_helper.php index f348d321..a2077674 100644 --- a/application/helpers/routes_helper.php +++ b/application/helpers/routes_helper.php @@ -1,7 +1,7 @@ diff --git a/application/helpers/session_helper.php b/application/helpers/session_helper.php index f80dec63..ee2a4abb 100644 --- a/application/helpers/session_helper.php +++ b/application/helpers/session_helper.php @@ -1,7 +1,7 @@ diff --git a/application/helpers/setting_helper.php b/application/helpers/setting_helper.php index 0a764fa3..e0e953a2 100644 --- a/application/helpers/setting_helper.php +++ b/application/helpers/setting_helper.php @@ -1,7 +1,7 @@ diff --git a/application/helpers/validation_helper.php b/application/helpers/validation_helper.php index f4878e36..3c56c532 100644 --- a/application/helpers/validation_helper.php +++ b/application/helpers/validation_helper.php @@ -1,7 +1,7 @@ diff --git a/application/language/english/iflrandevu/translations_lang.php b/application/language/english/maketrandevu/translations_lang.php similarity index 100% rename from application/language/english/iflrandevu/translations_lang.php rename to application/language/english/maketrandevu/translations_lang.php diff --git a/application/language/turkish/iflrandevu/translations_lang.php b/application/language/turkish/maketrandevu/translations_lang.php similarity index 100% rename from application/language/turkish/iflrandevu/translations_lang.php rename to application/language/turkish/maketrandevu/translations_lang.php diff --git a/application/libraries/Accounts.php b/application/libraries/Accounts.php index 7fa6201d..6523cc52 100644 --- a/application/libraries/Accounts.php +++ b/application/libraries/Accounts.php @@ -1,7 +1,7 @@ diff --git a/application/libraries/Api.php b/application/libraries/Api.php index 1f2ba8d8..1796d2e4 100644 --- a/application/libraries/Api.php +++ b/application/libraries/Api.php @@ -3,7 +3,7 @@ defined('BASEPATH') or exit('No direct script access allowed'); /* ---------------------------------------------------------------------------- - * IFLRandevu - İzmir Fen Lisesi Randevu Portalı + * MaketRandevu - MAKET Randevu Portalı * * @package EasyAppointments * @author A.Tselegidis diff --git a/application/libraries/Availability.php b/application/libraries/Availability.php index aa895786..2f142312 100644 --- a/application/libraries/Availability.php +++ b/application/libraries/Availability.php @@ -1,7 +1,7 @@ diff --git a/application/libraries/Email_messages.php b/application/libraries/Email_messages.php index bf67463d..2d39f769 100644 --- a/application/libraries/Email_messages.php +++ b/application/libraries/Email_messages.php @@ -1,7 +1,7 @@ diff --git a/application/libraries/Google_sync.php b/application/libraries/Google_sync.php index d8e0fd2d..6149fbe4 100644 --- a/application/libraries/Google_sync.php +++ b/application/libraries/Google_sync.php @@ -1,7 +1,7 @@ diff --git a/application/libraries/Ics_file.php b/application/libraries/Ics_file.php index c6fe4cc3..3ea0ddb1 100644 --- a/application/libraries/Ics_file.php +++ b/application/libraries/Ics_file.php @@ -1,7 +1,7 @@ diff --git a/application/libraries/Instance.php b/application/libraries/Instance.php index 3edf9bf5..8d672816 100644 --- a/application/libraries/Instance.php +++ b/application/libraries/Instance.php @@ -1,7 +1,7 @@ diff --git a/application/libraries/Notifications.php b/application/libraries/Notifications.php index 44f295bc..f2014ea4 100644 --- a/application/libraries/Notifications.php +++ b/application/libraries/Notifications.php @@ -1,7 +1,7 @@ diff --git a/application/libraries/Permissions.php b/application/libraries/Permissions.php index b6b3b2c5..98d47a21 100644 --- a/application/libraries/Permissions.php +++ b/application/libraries/Permissions.php @@ -1,7 +1,7 @@ diff --git a/application/libraries/Synchronization.php b/application/libraries/Synchronization.php index 00c0db62..1e4ff9a5 100644 --- a/application/libraries/Synchronization.php +++ b/application/libraries/Synchronization.php @@ -1,7 +1,7 @@ diff --git a/application/libraries/Timezones.php b/application/libraries/Timezones.php index 3a65a9a2..6cc92b59 100644 --- a/application/libraries/Timezones.php +++ b/application/libraries/Timezones.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/001_specific_calendar_sync.php b/application/migrations/001_specific_calendar_sync.php index 2015ac72..691b4005 100644 --- a/application/migrations/001_specific_calendar_sync.php +++ b/application/migrations/001_specific_calendar_sync.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/002_add_google_analytics_setting.php b/application/migrations/002_add_google_analytics_setting.php index 9412c0eb..fa105358 100644 --- a/application/migrations/002_add_google_analytics_setting.php +++ b/application/migrations/002_add_google_analytics_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/003_add_customer_notifications_setting.php b/application/migrations/003_add_customer_notifications_setting.php index 51b771c6..40e99914 100644 --- a/application/migrations/003_add_customer_notifications_setting.php +++ b/application/migrations/003_add_customer_notifications_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/004_add_date_format_setting.php b/application/migrations/004_add_date_format_setting.php index cfd75134..da06f0a5 100644 --- a/application/migrations/004_add_date_format_setting.php +++ b/application/migrations/004_add_date_format_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/005_add_require_captcha_setting.php b/application/migrations/005_add_require_captcha_setting.php index f3a90229..c6a512d7 100644 --- a/application/migrations/005_add_require_captcha_setting.php +++ b/application/migrations/005_add_require_captcha_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/006_add_calendar_view_setting.php b/application/migrations/006_add_calendar_view_setting.php index 39f0da93..4b2b689e 100644 --- a/application/migrations/006_add_calendar_view_setting.php +++ b/application/migrations/006_add_calendar_view_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/007_add_service_availabilities_type.php b/application/migrations/007_add_service_availabilities_type.php index e43ef3eb..fc42f5c6 100644 --- a/application/migrations/007_add_service_availabilities_type.php +++ b/application/migrations/007_add_service_availabilities_type.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/008_add_service_attendants_number.php b/application/migrations/008_add_service_attendants_number.php index e66e6759..16781817 100644 --- a/application/migrations/008_add_service_attendants_number.php +++ b/application/migrations/008_add_service_attendants_number.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/009_change_column_types.php b/application/migrations/009_change_column_types.php index dc003350..e75d7a03 100644 --- a/application/migrations/009_change_column_types.php +++ b/application/migrations/009_change_column_types.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/010_add_time_format_setting.php b/application/migrations/010_add_time_format_setting.php index d748b1fc..88c1fee2 100644 --- a/application/migrations/010_add_time_format_setting.php +++ b/application/migrations/010_add_time_format_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/011_remove_prefix_from_fkey_constraints.php b/application/migrations/011_remove_prefix_from_fkey_constraints.php index d14bcd1f..eee1716a 100644 --- a/application/migrations/011_remove_prefix_from_fkey_constraints.php +++ b/application/migrations/011_remove_prefix_from_fkey_constraints.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/012_legal_contents.php b/application/migrations/012_legal_contents.php index 52cdd6c7..554ab9b9 100644 --- a/application/migrations/012_legal_contents.php +++ b/application/migrations/012_legal_contents.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/013_add_weekday_start_setting.php b/application/migrations/013_add_weekday_start_setting.php index 234e806e..ad88c00a 100644 --- a/application/migrations/013_add_weekday_start_setting.php +++ b/application/migrations/013_add_weekday_start_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/014_create_appointment_location_column.php b/application/migrations/014_create_appointment_location_column.php index eef2f981..e652e4cf 100644 --- a/application/migrations/014_create_appointment_location_column.php +++ b/application/migrations/014_create_appointment_location_column.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/015_add_working_plan_exceptions_to_user_settings.php b/application/migrations/015_add_working_plan_exceptions_to_user_settings.php index b4993bf9..af6ebea2 100644 --- a/application/migrations/015_add_working_plan_exceptions_to_user_settings.php +++ b/application/migrations/015_add_working_plan_exceptions_to_user_settings.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/016_add_require_phone_number_setting.php b/application/migrations/016_add_require_phone_number_setting.php index c6ea1f0d..9fbbf893 100644 --- a/application/migrations/016_add_require_phone_number_setting.php +++ b/application/migrations/016_add_require_phone_number_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/017_add_api_token_setting.php b/application/migrations/017_add_api_token_setting.php index 1200fedd..c8f7df7b 100644 --- a/application/migrations/017_add_api_token_setting.php +++ b/application/migrations/017_add_api_token_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/018_add_timezone_to_users.php b/application/migrations/018_add_timezone_to_users.php index a7cfea5c..cd8ad22d 100644 --- a/application/migrations/018_add_timezone_to_users.php +++ b/application/migrations/018_add_timezone_to_users.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/019_add_display_any_provider_setting.php b/application/migrations/019_add_display_any_provider_setting.php index ae7a6361..228e12c0 100644 --- a/application/migrations/019_add_display_any_provider_setting.php +++ b/application/migrations/019_add_display_any_provider_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/020_add_language_to_users.php b/application/migrations/020_add_language_to_users.php index 77b60ba3..23b8751e 100644 --- a/application/migrations/020_add_language_to_users.php +++ b/application/migrations/020_add_language_to_users.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/021_modify_sync_period_columns.php b/application/migrations/021_modify_sync_period_columns.php index b71ffa56..c4a49e25 100644 --- a/application/migrations/021_modify_sync_period_columns.php +++ b/application/migrations/021_modify_sync_period_columns.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/022_add_booking_field_settings.php b/application/migrations/022_add_booking_field_settings.php index 49f342ff..12bd5bea 100644 --- a/application/migrations/022_add_booking_field_settings.php +++ b/application/migrations/022_add_booking_field_settings.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/023_rename_service_categories_table_to_categories.php b/application/migrations/023_rename_service_categories_table_to_categories.php index b9be174c..4318327b 100644 --- a/application/migrations/023_rename_service_categories_table_to_categories.php +++ b/application/migrations/023_rename_service_categories_table_to_categories.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/024_rename_id_service_categories_column_of_services_table.php b/application/migrations/024_rename_id_service_categories_column_of_services_table.php index 77263afd..7da09186 100644 --- a/application/migrations/024_rename_id_service_categories_column_of_services_table.php +++ b/application/migrations/024_rename_id_service_categories_column_of_services_table.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/025_rename_is_unavailable_column_of_appointments_table.php b/application/migrations/025_rename_is_unavailable_column_of_appointments_table.php index 4e46bec0..f93c35d0 100644 --- a/application/migrations/025_rename_is_unavailable_column_of_appointments_table.php +++ b/application/migrations/025_rename_is_unavailable_column_of_appointments_table.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/028_add_matomo_analytics_url_setting.php b/application/migrations/028_add_matomo_analytics_url_setting.php index 4655ccf1..dcdd049e 100644 --- a/application/migrations/028_add_matomo_analytics_url_setting.php +++ b/application/migrations/028_add_matomo_analytics_url_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/029_add_display_delete_personal_information_setting.php b/application/migrations/029_add_display_delete_personal_information_setting.php index 73213e55..aeb16e74 100644 --- a/application/migrations/029_add_display_delete_personal_information_setting.php +++ b/application/migrations/029_add_display_delete_personal_information_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/030_add_disable_booking_setting.php b/application/migrations/030_add_disable_booking_setting.php index 5effa744..23210c82 100644 --- a/application/migrations/030_add_disable_booking_setting.php +++ b/application/migrations/030_add_disable_booking_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/031_add_disable_booking_message_setting.php b/application/migrations/031_add_disable_booking_message_setting.php index 00b1b99d..63a26ff4 100644 --- a/application/migrations/031_add_disable_booking_message_setting.php +++ b/application/migrations/031_add_disable_booking_message_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/032_add_company_logo_setting.php b/application/migrations/032_add_company_logo_setting.php index 39890e0a..a9b59b80 100644 --- a/application/migrations/032_add_company_logo_setting.php +++ b/application/migrations/032_add_company_logo_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/033_add_company_color_setting.php b/application/migrations/033_add_company_color_setting.php index 16f6aa8c..82923fab 100644 --- a/application/migrations/033_add_company_color_setting.php +++ b/application/migrations/033_add_company_color_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/034_add_display_login_button_setting.php b/application/migrations/034_add_display_login_button_setting.php index e19ff35d..c03bf227 100644 --- a/application/migrations/034_add_display_login_button_setting.php +++ b/application/migrations/034_add_display_login_button_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/038_add_theme_setting.php b/application/migrations/038_add_theme_setting.php index 1d82dab1..b717d72d 100644 --- a/application/migrations/038_add_theme_setting.php +++ b/application/migrations/038_add_theme_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/039_add_limit_customer_access_setting.php b/application/migrations/039_add_limit_customer_access_setting.php index 51d70944..53644505 100644 --- a/application/migrations/039_add_limit_customer_access_setting.php +++ b/application/migrations/039_add_limit_customer_access_setting.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/040_create_webhooks_table.php b/application/migrations/040_create_webhooks_table.php index fb59fe22..ddee289f 100644 --- a/application/migrations/040_create_webhooks_table.php +++ b/application/migrations/040_create_webhooks_table.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/041_add_webhooks_column_to_roles_table.php b/application/migrations/041_add_webhooks_column_to_roles_table.php index 117ef203..7fec234f 100644 --- a/application/migrations/041_add_webhooks_column_to_roles_table.php +++ b/application/migrations/041_add_webhooks_column_to_roles_table.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/046_revert_rename_service_categories_table_to_categories.php b/application/migrations/046_revert_rename_service_categories_table_to_categories.php index 64c51763..4a3a8abf 100644 --- a/application/migrations/046_revert_rename_service_categories_table_to_categories.php +++ b/application/migrations/046_revert_rename_service_categories_table_to_categories.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/047_revert_rename_id_service_categories_column_of_services_table.php b/application/migrations/047_revert_rename_id_service_categories_column_of_services_table.php index d9faa08b..8b10f2bd 100644 --- a/application/migrations/047_revert_rename_id_service_categories_column_of_services_table.php +++ b/application/migrations/047_revert_rename_id_service_categories_column_of_services_table.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/048_create_blocked_periods_table.php b/application/migrations/048_create_blocked_periods_table.php index e9ad756c..d65fbb8a 100644 --- a/application/migrations/048_create_blocked_periods_table.php +++ b/application/migrations/048_create_blocked_periods_table.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/049_add_blocked_periods_column_to_roles_table.php b/application/migrations/049_add_blocked_periods_column_to_roles_table.php index c2c410b6..a23ea287 100644 --- a/application/migrations/049_add_blocked_periods_column_to_roles_table.php +++ b/application/migrations/049_add_blocked_periods_column_to_roles_table.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/050_add_custom_fields_columns_to_users_table.php b/application/migrations/050_add_custom_fields_columns_to_users_table.php index c0a98175..d9b48307 100644 --- a/application/migrations/050_add_custom_fields_columns_to_users_table.php +++ b/application/migrations/050_add_custom_fields_columns_to_users_table.php @@ -1,7 +1,7 @@ diff --git a/application/migrations/051_insert_custom_field_rows_to_settings_table.php b/application/migrations/051_insert_custom_field_rows_to_settings_table.php index 3ac63593..86fdf9bc 100644 --- a/application/migrations/051_insert_custom_field_rows_to_settings_table.php +++ b/application/migrations/051_insert_custom_field_rows_to_settings_table.php @@ -1,7 +1,7 @@ diff --git a/application/models/Admins_model.php b/application/models/Admins_model.php index 996c4b3d..e67cc025 100644 --- a/application/models/Admins_model.php +++ b/application/models/Admins_model.php @@ -1,7 +1,7 @@ diff --git a/application/models/Appointments_model.php b/application/models/Appointments_model.php index e63a398e..1eedf7bd 100644 --- a/application/models/Appointments_model.php +++ b/application/models/Appointments_model.php @@ -1,7 +1,7 @@ diff --git a/application/models/Blocked_periods_model.php b/application/models/Blocked_periods_model.php index 2a3439ea..0cc47a47 100644 --- a/application/models/Blocked_periods_model.php +++ b/application/models/Blocked_periods_model.php @@ -1,7 +1,7 @@ diff --git a/application/models/Consents_model.php b/application/models/Consents_model.php index 1074a602..8b2da674 100644 --- a/application/models/Consents_model.php +++ b/application/models/Consents_model.php @@ -1,7 +1,7 @@ diff --git a/application/models/Customers_model.php b/application/models/Customers_model.php index f1313415..cdff1505 100644 --- a/application/models/Customers_model.php +++ b/application/models/Customers_model.php @@ -1,7 +1,7 @@ diff --git a/application/models/Providers_model.php b/application/models/Providers_model.php index 7d609c53..5b4c7ad6 100755 --- a/application/models/Providers_model.php +++ b/application/models/Providers_model.php @@ -1,7 +1,7 @@ diff --git a/application/models/Roles_model.php b/application/models/Roles_model.php index 80d4fde1..11a279f5 100644 --- a/application/models/Roles_model.php +++ b/application/models/Roles_model.php @@ -1,7 +1,7 @@ diff --git a/application/models/Secretaries_model.php b/application/models/Secretaries_model.php index 1dd26daf..d0f7fac7 100644 --- a/application/models/Secretaries_model.php +++ b/application/models/Secretaries_model.php @@ -1,7 +1,7 @@ diff --git a/application/models/Service_categories_model.php b/application/models/Service_categories_model.php index ff83c627..eccce43b 100644 --- a/application/models/Service_categories_model.php +++ b/application/models/Service_categories_model.php @@ -1,7 +1,7 @@ diff --git a/application/models/Services_model.php b/application/models/Services_model.php index 7f09c274..1b67e527 100644 --- a/application/models/Services_model.php +++ b/application/models/Services_model.php @@ -1,7 +1,7 @@ diff --git a/application/models/Settings_model.php b/application/models/Settings_model.php index d34c4383..f10101e9 100644 --- a/application/models/Settings_model.php +++ b/application/models/Settings_model.php @@ -1,7 +1,7 @@ diff --git a/application/models/Unavailabilities_model.php b/application/models/Unavailabilities_model.php index d75ecfa3..3c120ca8 100644 --- a/application/models/Unavailabilities_model.php +++ b/application/models/Unavailabilities_model.php @@ -1,7 +1,7 @@ diff --git a/application/models/Users_model.php b/application/models/Users_model.php index 1a12893a..6cdefe1e 100644 --- a/application/models/Users_model.php +++ b/application/models/Users_model.php @@ -1,7 +1,7 @@ diff --git a/application/models/Webhooks_model.php b/application/models/Webhooks_model.php index 283b5e43..b74cc10b 100644 --- a/application/models/Webhooks_model.php +++ b/application/models/Webhooks_model.php @@ -1,7 +1,7 @@ diff --git a/composer.json b/composer.json index 99ead34f..633d00f2 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,8 @@ { - "name": "ifl/iflrandevu", - "description": "İzmir Fen Lisesi Randevu Portalı", - "version": "dev-1.5.0", - "homepage": "https://iflpanel.com/about/randevu", + "name": "maket/maketrandevu", + "description": "MAKET Randevu Portalı", + "version": "1.5.0-p1", + "homepage": "https://iflpanel.com/about/maketrandevu", "type": "project", "license": "GPL-3.0", "authors": [ @@ -16,9 +16,9 @@ } ], "support": { - "issues": "https://git.aliberksandikci.com.tr/ifl/iflrandevu/issues", + "issues": "https://git.aliberksandikci.com.tr/maket/maketrandevu/issues", "wiki": "https://easyappointments.org/docs", - "source": "https://git.aliberksandikci.com.tr/ifl/iflrandevu" + "source": "https://git.aliberksandikci.com.tr/maket/maketrandevu" }, "keywords": [ "calendar", diff --git a/composer.lock b/composer.lock index ac84812b..70d9877b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a1c5fb74db4dc8a868bd2c3548b4916d", + "content-hash": "70cead7cce550cc0e5a37eb1e558aee9", "packages": [ { "name": "firebase/php-jwt", @@ -140,16 +140,16 @@ }, { "name": "google/apiclient-services", - "version": "v0.328.0", + "version": "v0.329.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", - "reference": "211ba786d30a4ab21e012d2b7dbefc49b4fc6a3d" + "reference": "3216fd1b6ba33c5f6658c3581e9723ff21d9acb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/211ba786d30a4ab21e012d2b7dbefc49b4fc6a3d", - "reference": "211ba786d30a4ab21e012d2b7dbefc49b4fc6a3d", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/3216fd1b6ba33c5f6658c3581e9723ff21d9acb7", + "reference": "3216fd1b6ba33c5f6658c3581e9723ff21d9acb7", "shasum": "" }, "require": { @@ -178,9 +178,9 @@ ], "support": { "issues": "https://github.com/googleapis/google-api-php-client-services/issues", - "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.328.0" + "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.329.0" }, - "time": "2023-12-18T01:00:18+00:00" + "time": "2023-12-24T01:02:15+00:00" }, { "name": "google/auth", @@ -895,16 +895,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.34", + "version": "3.0.35", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "56c79f16a6ae17e42089c06a2144467acc35348a" + "reference": "4b1827beabce71953ca479485c0ae9c51287f2fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/56c79f16a6ae17e42089c06a2144467acc35348a", - "reference": "56c79f16a6ae17e42089c06a2144467acc35348a", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/4b1827beabce71953ca479485c0ae9c51287f2fe", + "reference": "4b1827beabce71953ca479485c0ae9c51287f2fe", "shasum": "" }, "require": { @@ -985,7 +985,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.34" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.35" }, "funding": [ { @@ -1001,7 +1001,7 @@ "type": "tidelift" } ], - "time": "2023-11-27T11:13:31+00:00" + "time": "2023-12-29T01:59:53+00:00" }, { "name": "psr/cache", @@ -2163,12 +2163,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "be9456d1430df8be755ff7da33b22b80f0ed2f5f" + "reference": "cbce83127406d8e91ec92b053a44cf917800646b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/be9456d1430df8be755ff7da33b22b80f0ed2f5f", - "reference": "be9456d1430df8be755ff7da33b22b80f0ed2f5f", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/cbce83127406d8e91ec92b053a44cf917800646b", + "reference": "cbce83127406d8e91ec92b053a44cf917800646b", "shasum": "" }, "conflict": { @@ -2200,7 +2200,7 @@ "athlon1600/php-proxy": "<=5.1", "athlon1600/php-proxy-app": "<=3", "austintoddj/canvas": "<=3.4.2", - "automad/automad": "<1.8", + "automad/automad": "<=1.10.9", "awesome-support/awesome-support": "<=6.0.7", "aws/aws-sdk-php": "<3.288.1", "azuracast/azuracast": "<0.18.3", @@ -2242,6 +2242,7 @@ "cesnet/simplesamlphp-module-proxystatistics": "<3.1", "chriskacerguis/codeigniter-restserver": "<=2.7.1", "civicrm/civicrm-core": ">=4.2,<4.2.9|>=4.3,<4.3.3", + "ckeditor/ckeditor": "<4.17", "cockpit-hq/cockpit": "<=2.6.3", "codeception/codeception": "<3.1.3|>=4,<4.1.22", "codeigniter/framework": "<3.1.9", @@ -2249,7 +2250,7 @@ "codeigniter4/shield": "<1.0.0.0-beta8", "codiad/codiad": "<=2.8.4", "composer/composer": "<1.10.27|>=2,<2.2.22|>=2.3,<2.6.4", - "concrete5/concrete5": "<9.2.2", + "concrete5/concrete5": "<9.2.3", "concrete5/core": "<8.5.8|>=9,<9.1", "contao-components/mediaelement": ">=2.14.2,<2.21.1", "contao/contao": ">=4,<4.4.56|>=4.5,<4.9.40|>=4.10,<4.11.7|>=4.13,<4.13.21|>=5.1,<5.1.4", @@ -2456,6 +2457,7 @@ "magento/magento1ee": ">=1,<1.14.4.3-dev", "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2.0-patch2", "maikuolan/phpmussel": ">=1,<1.6", + "mainwp/mainwp": "<=4.4.3.3", "mantisbt/mantisbt": "<=2.25.7", "marcwillmann/turn": "<0.3.3", "matyhtf/framework": "<3.0.6", @@ -2774,6 +2776,8 @@ "wikibase/wikibase": "<=1.39.3", "wikimedia/parsoid": "<0.12.2", "willdurand/js-translation-bundle": "<2.1.1", + "winter/wn-backend-module": "<1.2.4", + "winter/wn-system-module": "<1.2.4", "wintercms/winter": "<1.2.3", "woocommerce/woocommerce": "<6.6", "wp-cli/wp-cli": "<2.5", @@ -2872,7 +2876,7 @@ "type": "tidelift" } ], - "time": "2023-12-22T00:14:36+00:00" + "time": "2023-12-29T19:04:11+00:00" }, { "name": "sebastian/cli-parser", diff --git a/docker/build/docker.sh b/docker/build/docker.sh index 3f77b023..1a94ebbf 100755 --- a/docker/build/docker.sh +++ b/docker/build/docker.sh @@ -1,25 +1,25 @@ #!/bin/bash -# Docker commands to build iflrandevu +# Docker commands to build maketrandevu # First setup docker and install alpine image # Approximately 10min (tested with 4vcpu / 8GB RAM / 30Mbps network speed) -# IFLRANDEVU_VER="test" -IFLRANDEVU_VER="1.4.3-ifl.2" # UPDATE MANUALLY ! +# MAKETRANDEVU_VER="test" +MAKETRANDEVU_VER="1.5.0-p1" # UPDATE MANUALLY ! _RED='\033[0;31m' _NC='\033[0m \e[0m' # No Color, No Effect if [[ $1 != "docker" ]]; then - if [[ $(pwd) != *iflrandevu/docker/build ]]; then - echo "PLEASE CHANGE DIRECTORY TO \`iflrandevu/docker/build\` BEFORE STARTING SCRIPT" + if [[ $(pwd) != *maketrandevu/docker/build ]]; then + echo "PLEASE CHANGE DIRECTORY TO \`maketrandevu/docker/build\` BEFORE STARTING SCRIPT" exit fi - docker rm IFLRANDEVU_BUILDER + docker rm MAKETRANDEVU_BUILDER echo "removed" - docker run -it -d --name IFLRANDEVU_BUILDER --mount type=bind,source=".",target=/link/ alpine:latest "/bin/sh" + docker run -it -d --name MAKETRANDEVU_BUILDER --mount type=bind,source=".",target=/link/ alpine:latest "/bin/sh" echo -e "RUN COMMANDS IN ALPINE DOCKER" echo -e "RUN SCRIPT: \`${_RED}apk add bash && bash /link/docker.sh docker${_NC}\`" - docker attach IFLRANDEVU_BUILDER --detach-keys="ctrl-k" + docker attach MAKETRANDEVU_BUILDER --detach-keys="ctrl-k" echo "EXIT" exit elif [[ $1 == "docker" ]]; then @@ -30,9 +30,9 @@ elif [[ $1 == "docker" ]]; then apk add php-gd php-dom php-xml php-xmlwriter phpunit mkdir /docker_build/ - cd /docker_build/ - git clone https://git.aliberksandikci.com.tr/ifl/iflrandevu - cd iflrandevu + cd /docker_build/ || exit + git clone https://git.aliberksandikci.com.tr/maket/maketrandevu + cd maketrandevu || exit composer update composer upgrade @@ -82,16 +82,16 @@ elif [[ $1 == "docker" ]]; then echo "waiting before archiving(10)" sleep 10 apk add zip - if [[ -f "/link/iflrandevu-$IFLRANDEVU_VER.zip" ]]; then + if [[ -f "/link/maketrandevu-$MAKETRANDEVU_VER.zip" ]]; then echo "THIS VERSION ALREADY EXIST" sleep 1 echo -e "${_RED}DELETING OLD ARCHIVE${_NC} (after waiting 10 sec)" sleep 10 - rm "/link/iflrandevu-$IFLRANDEVU_VER.zip" + rm "/link/maketrandevu-$MAKETRANDEVU_VER.zip" fi - cd /docker_build/iflrandevu/build/ - zip -r "/link/iflrandevu-$IFLRANDEVU_VER.zip" ./* + cd /docker_build/maketrandevu/build/ || exit + zip -r "/link/maketrandevu-$MAKETRANDEVU_VER.zip" ./* sleep 5 echo "BYE!" exit diff --git a/gulpfile.js b/gulpfile.js index 53f57135..0a481373 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,11 +1,11 @@ /* ---------------------------------------------------------------------------- * İFL Randevu (fork of easy_appointments)- Open Source Web Scheduler * - * @package EasyAppointments - * @author A.Tselegidis + * @package maketrandevu + * @author asandikci * @copyright Copyright (c) Alex Tselegidis * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link https://easyappointments.org + * @link https://iflpanel.com/about/maketrandevu * @since v1.4.0 * ---------------------------------------------------------------------------- */ @@ -25,7 +25,8 @@ const zip = require('zip-dir'); // const debug = require('gulp-debug'); function archive(done) { - const filename = 'easyappointments-0.0.0.zip'; + const version = "1.5.0-p1" + const filename = 'maketrandevu-' + version + '.zip'; fs.removeSync('build'); fs.removeSync(filename); @@ -69,7 +70,7 @@ function archive(done) { fs.removeSync('build/composer.lock'); del.sync('**/.DS_Store'); - zip('build', {saveTo: filename}, function (error) { + zip('build', { saveTo: filename }, function (error) { if (error) { console.log('Zip Error', error); } @@ -89,8 +90,8 @@ function scripts() { .src(['assets/js/**/*.js', '!assets/js/**/*.min.js']) .pipe(plumber()) .pipe(changed('assets/js/**/*')) - .pipe(babel({comments: false})) - .pipe(rename({suffix: '.min'})) + .pipe(babel({ comments: false })) + .pipe(rename({ suffix: '.min' })) .pipe(gulp.dest('assets/js')); } @@ -102,7 +103,7 @@ function styles() { .pipe(sass().on('error', sass.logError)) .pipe(gulp.dest('assets/css')) .pipe(css()) - .pipe(rename({suffix: '.min'})) + .pipe(rename({ suffix: '.min' })) .pipe(gulp.dest('assets/css')); } @@ -184,7 +185,7 @@ function vendor(done) { gulp.src(['node_modules/flatpickr/dist/themes/material_green.css']) .pipe(css()) - .pipe(rename({suffix: '.min'})) + .pipe(rename({ suffix: '.min' })) .pipe(gulp.dest('assets/vendor/flatpickr')); done(); diff --git a/nginx_docker_localtest.sh b/nginx_docker_localtest.sh index 341b2fdb..1e5e61eb 100755 --- a/nginx_docker_localtest.sh +++ b/nginx_docker_localtest.sh @@ -2,15 +2,15 @@ # Nginx Docker Localtest -CONT_NAME="IFLRANDEVU_NGINX_LOCALTEST" # nginx docker name +CONT_NAME="MAKETRANDEVU_NGINX_LOCALTEST" # nginx docker name MOUNT_PATH="/source" # binded mount path in nginx docker SCRIPT_NAME="nginx_docker_localtest.sh" # name of the *this* file DEBUG="FALSE" ### REMOTE RELEASE ### -LATEST_RELEASE="1.4.3-ifl.2" -FILE_NAME="iflrandevu-$LATEST_RELEASE.zip" -DOWNLOAD_LINK=https://git.aliberksandikci.com.tr/ifl/iflrandevu/releases/download/$LATEST_RELEASE/$FILE_NAME +LATEST_RELEASE="1.5.0-p1" +FILE_NAME="maketrandevu-$LATEST_RELEASE.zip" +DOWNLOAD_LINK=https://git.aliberksandikci.com.tr/maket/maketrandevu/releases/download/$LATEST_RELEASE/$FILE_NAME WEB_ROOT_FOLDER="/usr/share/nginx/html/" @@ -26,7 +26,7 @@ Usage: COMMANDS: ${_RED}ini:${_NC} initialize dock command - install: install iflrandevu + install: install maketrandevu local: get from local /source/ remote: get from git service reconf : reconfigure configs @@ -43,18 +43,18 @@ COMMANDS: CONFIG_FILE_CONTENT=""" * @copyright Copyleft 2023 - 2024 * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link https://iflpanel.com/about/iflrandevu + * @link https://iflpanel.com/about/maketrandevu * @since v1.4.3 * ---------------------------------------------------------------------------- */ /** - * IFLRandevu Configuration File + * Maket Randevu Configuration File */ class Config { @@ -71,7 +71,7 @@ class Config { // ------------------------------------------------------------------------ const DB_HOST = 'localhost'; - const DB_NAME = 'iflrandevu'; + const DB_NAME = 'maketrandevu'; const DB_USERNAME = 'root'; const DB_PASSWORD = 'root'; @@ -90,28 +90,6 @@ class Config { /* Location: ./config.php */ """ -OLD_CONFIG=""" -server { - listen 80; - server_name localhost:8000; - root $WEB_ROOT_FOLDER; - - access_log /var/log/nginx/example.journaldev.com-access.log; - error_log /var/log/nginx/example.journaldev.com-error.log error; - index index.php; - - location / { - try_files \$uri \$uri/ /index.php\$is_args\$args; - } - - location ~ \.php\$ { - fastcgi_split_path_info ^(.+\.php)(/.+)\$; - fastcgi_pass unix:/var/run/php/php8.2-fpm-iflrandevu.sock; - fastcgi_index index.php; - include fastcgi_params; - } -} -""" NGINX_CONFIG_FILE=""" server { listen 80; @@ -128,7 +106,7 @@ server { try_files \$uri \$uri/ index.php; location ~ [^/]\.php(/|\$) { fastcgi_split_path_info ^(.+?\.php)(/.*)\$; - fastcgi_pass unix:/var/run/php/php8.2-fpm-iflrandevu.sock; + fastcgi_pass unix:/var/run/php/php8.2-fpm-maketrandevu.sock; fastcgi_index index.php; include fastcgi_params; @@ -146,14 +124,14 @@ server { """ PHP_FPM_CONFIG_FILE=""" -[iflrandevu] +[maketrandevu] -user = iflrandevu -group = iflrandevu +user = maketrandevu +group = maketrandevu chdir = /usr/share/nginx/html -listen = /var/run/php/php8.2-fpm-iflrandevu.sock +listen = /var/run/php/php8.2-fpm-maketrandevu.sock listen.owner = nginx listen.group = nginx listen.mode = 0660 @@ -198,8 +176,8 @@ _status() { } if [[ $# -eq 0 ]]; then - if [[ $(pwd) != *iflrandevu ]]; then - echo "PLEASE CHANGE DIRECTORY TO \`iflrandevu/\` BEFORE STARTING SCRIPT" + if [[ $(pwd) != *maketrandevu ]]; then + echo "PLEASE CHANGE DIRECTORY TO \`maketrandevu/\` BEFORE STARTING SCRIPT" exit fi # TODO silmeden önce onay iste! @@ -253,7 +231,7 @@ elif [[ $1 == "docker" ]]; then echo -e "$CONFIG_FILE_CONTENT" >"$WEB_ROOT_FOLDER/config.php" echo -e "$NGINX_CONFIG_FILE" >"/etc/nginx/conf.d/default.conf" - echo -e "$PHP_FPM_CONFIG_FILE" >"/etc/php/8.2/fpm/pool.d/iflrandevu.conf" + echo -e "$PHP_FPM_CONFIG_FILE" >"/etc/php/8.2/fpm/pool.d/maketrandevu.conf" echo RECONFIGURED echo _exit @@ -273,7 +251,7 @@ elif [[ $1 == "docker" ]]; then apt install nano exa tree wget unzip less rsync -y rm -rf $WEB_ROOT_FOLDER mkdir -p $WEB_ROOT_FOLDER - cd $WEB_ROOT_FOLDER + cd $WEB_ROOT_FOLDER || exit if [[ $3 == "local" ]]; then cp -r /source/build/* $WEB_ROOT_FOLDER/ elif [[ $3 == "remote" ]]; then @@ -290,15 +268,15 @@ elif [[ $1 == "docker" ]]; then apt install php php-fpm -y apt install mariadb-server php-mysql -y service mariadb start - mysql -u root -e "create database iflrandevu" + mysql -u root -e "create database maketrandevu" mysql -u root -e "set password for root@localhost = password('root');" echo -e "$CONFIG_FILE_CONTENT" >"$WEB_ROOT_FOLDER/config.php" echo -e "$NGINX_CONFIG_FILE" >"/etc/nginx/conf.d/default.conf" - echo -e "$PHP_FPM_CONFIG_FILE" >"/etc/php/8.2/fpm/pool.d/iflrandevu.conf" - groupadd iflrandevu - useradd -g iflrandevu iflrandevu - cd $WEB_ROOT_FOLDER - chown iflrandevu:nginx -R . + echo -e "$PHP_FPM_CONFIG_FILE" >"/etc/php/8.2/fpm/pool.d/maketrandevu.conf" + groupadd maketrandevu + useradd -g maketrandevu maketrandevu + cd $WEB_ROOT_FOLDER || exit + chown maketrandevu:nginx -R . chmod 770 storage service php8.2-fpm start diff --git a/package-lock.json b/package-lock.json index 6713cf39..9b2f5c78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,10 +1,10 @@ { - "name": "iflrandevu", + "name": "maketrandevu", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "iflrandevu", + "name": "maketrandevu", "license": "GPL-3.0", "dependencies": { "@fortawesome/fontawesome-free": "^6.2.1", diff --git a/package.json b/package.json index e6b9c1a6..b907ab80 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "iflrandevu", - "description": "İzmir Fen Lisesi Randevu Portalı", + "name": "maketrandevu", + "description": "MAKET Randevu Portalı", "homepage": "https://randevu.iflpanel.com", "author": "asandikci ", "license": "GPL-3.0", @@ -20,10 +20,10 @@ ], "repository": { "type": "git", - "url": "git+https://git.aliberksandikci.com.tr/ifl/iflrandevu.git" + "url": "git+https://git.aliberksandikci.com.tr/maket/maketrandevu.git" }, "bugs": { - "url": "https://git.aliberksandikci.com.tr/ifl/iflrandevu/issues" + "url": "https://git.aliberksandikci.com.tr/maket/maketrandevu/issues" }, "engines": { "node": ">=14"