Commit Graph

451 Commits

Author SHA1 Message Date
1a18f5a386
Stable Release of version 2.10.5 2019-11-09 14:49:20 +02:00
04c080d460
Resolved gh-489 to load field name with the field type 2019-11-09 04:00:14 +02:00
6539862534
Improved the internal session handel of JCB. Fixed gh-487 that removed the data size when creating a new field. 2019-11-08 18:24:03 +02:00
010a134e1a
Moved the phpseclib files to their own folder in libraries. Improved the composer autoloader in JCB. Improved the phpseclib class implementation. Added a new Expert Mode to field modeling under the database tab in the field area. 2019-10-16 22:38:43 +02:00
b8d8b8e813
Resolved gh-460 to insure that all default fields, including the access and meta fields can be overwriten/replaced with self build fields. Added the UIKIT3 Icon JS to the document where needed. Fixed the permissions implementation to insure spacer fields are not targeted with edit controll and when a view permission is set, it behave correctly. 2019-10-11 15:41:00 +02:00
773a753323
Resolved gh-463 to insure data types that require length is enforced by default in the GUI. 2019-09-12 22:06:52 +02:00
2b1e0a65fa
Added option to include or exclude Joomla Plugins from being compiled or exported. Added the Joomla\Utilities\ArrayHelper to helper class header. Added option to only export words if required global option fields are set. Added option to use strict field access on all exports if required global option fields are set. Fixed gh-475 by adding the option to add a github token if needed under the global options global tab, also updated the error message. 2019-09-10 19:38:16 +02:00
e3f22d631c
Fixed count (php 7.2) issue across JCB. Improved the setModelExportMethod method in the compiler to now work as a setGetItemsModelMethod instead. Added more strict permissional implementation per/field across the export methods of JCB. 2019-09-05 23:12:56 +02:00
3cbe21f57d
Improved the compiler getDynamicScript to also use function tabs. Moved the fucntion tab to helper class. Added dynamic title and description insertion options to permissions area. 2019-09-04 13:52:31 +02:00
d2f94d84fa
Improved the plugin form builder, to allow multi form field relationships. 2019-08-22 03:55:06 +02:00
04ed58afe8
Fixed gh-458 so that the && is not added if we have no extra values to validate. Added linked to details to Joomla Plugin area. 2019-08-15 16:26:46 +02:00
3a27038164
Stable release v2.10.0 2019-08-14 13:45:49 +02:00
7fed9d7a1c
Resolved gh-436 so that the new Joomla plugin builder/feature is fully active, and part of the import and export of JCB packages. 2019-08-13 03:08:30 +02:00
ed43b00862
Expande the compiler to fully build and zip plugins linked to components. Added plugin_updates area. Fixed gh-454 to insure placeholders are build even if no local db placeholders are found. Fixed gh-453 to prevent count error with null return value. 2019-08-08 17:45:50 +02:00
4581b310de
Updated the compiler to now add GUI placeholders, resolved gh-451 so we now have easy roundtrip development beyond the original custom-code implementation. Added the files, folders, url option, and added the install fields to the new plugin area. gh-436 2019-07-28 23:48:42 +02:00
affaeb72f8
Resolved gh-441 to allow fieldtype name prefixing. Resolved gh-443 to allow Alphanumeric+dot in fieldtype name. Fixed gh-446 to insure that JFormRuleInt validates correctly in the admin field realtions. Improved the new plugin area to also have system name and option to add custom header code. gh-436 2019-07-19 04:32:41 +02:00
a5ae94b93a
Linked the new plugin area to Joomla components. gh-436 2019-07-17 04:37:50 +02:00
fcd5846c5a
Update the phpseclib via composer. 2019-07-17 02:29:27 +02:00
8d2af8365b
Added more dynamic behavior to the new plugin area. Added a funding yml file. 2019-07-17 01:26:18 +02:00
e476bcb7b5
Added the main GUI for the plugin area, gh-436 2019-07-15 22:00:46 +02:00
2af4b8cf50
Removed required from all code/editor field to improve the behavior of the codemirror editor. Improved the token validation via Ajax. 2019-07-08 18:05:54 +02:00
9e6233c64f
Fixed gh-434 to add the missing table path if not set. Resolved gh-427 to allow numbers in the name of a field. Impoved the compiler by adding a method to set the Lang Content array. 2019-07-05 01:53:54 +02:00
b9c758b800
Added context to all compiler events. Added layout fields override options for dynamic field generation. 2019-07-01 19:17:16 +02:00
663f8405e5
Fixed gh-433 to allow ->value in the Value Key field on the where subform in the Tweak tab of the dynamicGet view. 2019-06-29 23:11:37 +02:00
e84105c3bd
Adapted the safeName to a global safeFieldName method so to use it all over JCB to safely build field names. gh-427 2019-06-18 16:12:49 +02:00
8acbb3b3a4
Fixed gh-422 to insure the details tab always gets added if no custom tab names are found. Added the option to run the expantion option without installing the components locally. 2019-06-18 00:03:04 +02:00
2fb4a1ae43
Improved the getInput method for custom fields, so to allow the edit button to show more consistently. 2019-06-13 23:12:16 +02:00
236ecd53f4
Fixed gh-424 so that the global settings of JCB will save even if the components are not selected in the Development Method tab. 2019-06-13 18:45:55 +02:00
f03c6f5204
Added an after cancel custom code area also in connection with gh-418 in the admin view. 2019-06-12 22:36:05 +02:00
eae13dff06
Resolved gh-418 by adding an on before cancel custom script area to the admin view. 2019-06-12 22:06:19 +02:00
c8b5993219
Fixed gh-420 to allow the linked site view to save correctly. 2019-06-11 17:54:31 +02:00
dda33d66cb
fixed the subform build, to allow required value to be set to true. 2019-05-25 22:20:12 +02:00
a90d6f51f7
Fixed the code search keys to include new views, and fields across JCB. 2019-05-20 22:55:25 +02:00
d3f623d184
Improved on the mysql default selected values to use InnoDB, utf8mb4, utf8mb4_general_ci 2019-05-17 00:43:24 +02:00
42d5b3b55c
Added the feature that loads the company global values when creating a new component, if they are set. 2019-05-16 01:07:38 +02:00
8e79417664
Added create new custom code to all fields that have string lenght. 2019-05-16 00:50:45 +02:00
80c588a33a
Added Captcha field type. Started adding the crowdin integration. 2019-05-15 19:45:36 +02:00
a23f1fe79a
Fixed gh-394 so to be able to target the component instead of a single view. 2019-05-06 03:05:15 +02:00
d7b555e7af
Resolved gh-410 to allow default data type values for the database to be set per fieldtype. 2019-05-03 01:00:14 +02:00
b55d824e63
Resolved gh-379 to allow null and zero values to pass via ajax call/post 2019-04-28 00:16:06 +02:00
a817bae010
Resolved gh-321 by adding the option te set a create menu for admin edit views that are also added to the front-end. 2019-04-09 23:54:54 +02:00
fd154a81bc
Resolved gh-404 by adding the option to use grouping in dynamicGet query. 2019-04-09 22:42:32 +02:00
3a0b5706c4
Fixed the issue that caused linked files and folders from not showing in a library. gh-399 2019-03-19 17:33:03 +02:00
098c82c222
fixed gh-383 to insure the new button works on frontend/site. Improved the JCB package import to also now import the new placeholder feature values correctly. 2019-03-04 14:50:46 +02:00
9fcb317275
updated the year value. Added placeholder search to the new placeholder area. 2019-02-23 15:29:16 +02:00
25c14b45de
Added the new placeholder area for global & component level placeholders. Just like customcode you can now with the placeholders generate dynamic behaviour with placeholders all over the JCB custom areas. 2019-02-16 00:03:37 +02:00
104c4e6bae
Fixed gh-373 so that the auto update of selection is only triggered when toggling the all selection button. 2019-02-06 11:32:38 +02:00
1a538e71d7
Added buttons to edit cutomcode directly from where it is added in other areas around the component. This will improve the customcode workflow in JCB. 2019-01-31 23:44:21 +02:00
018eed3054
Resolved gh-370 so that all fields get loaded in a dynamicGet, even new once created at a later stage. 2019-01-29 16:43:27 +02:00
3abae0494e
Added the option to set the row_format per table in the admin view. Converted all the JCB tables to have a DYNAMIC row format. Fixed gh-369 so that JCB packages like JMM can be imported. 2019-01-26 05:52:05 +02:00
4e2c51c303
Resolved gh-360 by adding the blob data type as an option for data types. Resolved gh-362 by adding the nested subform compatibility to subforms in JCB. Resolved gh-365 by improving the customscript validation search of save of custom code area. Added email validation to the email helper script. 2019-01-14 17:41:49 +02:00
b7a5cb7285
fixed issue that caused some custom code not to export for a JCB packages if found in anther custom code area. Made some corrections to the router helper class. Added return_here value admin views to improve the return values in url redirection. Improved the open valid base64 method to make use of default string. Update many ajax calls to not use jsonp, and infact be more secure. 2018-12-29 17:05:01 +02:00
279831da30
Added open Collective to the readme, thanks @monkeywithacupcake. Added default selection to adding admin views to component. Update some helper methods, and comments. 2018-12-19 06:14:51 +02:00
a52d230aeb
Improved the custom code area to now allow custom code in custom code with the help of placheholders. Removed the static wiki page, and relinked to the github wiki. 2018-11-27 15:05:47 +02:00
180f1cec6d
Moved the customcode together in the helper class. Improvd the note in the custom code area. Added helper method to load dynamic content, like banners accross JCB backend 2018-11-08 06:07:13 +02:00
6c4bab5ea9
Resolved gh-323 so we can load fields only in the linked or admin list views or in both. Added the option to also add permission to access fields. Improved the checkArray method to return arry count value. Fixed issue in field permissions when the value is and array, field type can not be made hidden, but should instead just be removed. Fixed an issue in the code search methods to insure all areas are looked at, and search and export. 2018-10-29 18:38:00 +02:00
043686814c
Further fix to the search of customcode placeholders accross the system. 2018-09-29 23:52:22 +02:00
fdd1cf7390
Added the option to random order the dynamic get result set. gh-348 2018-09-29 02:57:11 +02:00
1447e06dd7
Fixed the search for customcode placeholders accross the system. gh-341 2018-09-28 17:47:04 +02:00
c0f79ec4ba
Changed the text field for Value/Example in the Fieldtype area to a textarea so we can add more code per/line. gh-341 2018-09-27 00:09:29 +02:00
73d383c755
Resolved gh-345 by adding whole new mysql table selection options in the admin view, under the mySql tab. Fixed the folder & file loader. Fixed the Update of custom files, so even the custom code and external code placholders will work in external files. Update all tables in JCB to use InnoDB Engine, utf8md4 Charset and utf8mb4_unicode_ci Collation. 2018-09-25 22:02:48 +02:00
6ad253be44
Resolved gh-341 that adds the feature to expand the custom field option far beyond the default. Moved the menu prefix option in to the Joomla component area -> tab -> Settings to allow each component to override the global setting. 2018-09-24 16:37:51 +02:00
f19b0335ed
Fixed the import of JCB packages, that had an issue of not storing multiple list selection values correctly during import. 2018-09-11 23:37:48 +02:00
45c255485f
Made a little tweak to placeholders, to remove uneeded space. 2018-09-11 22:28:17 +02:00
49ef674c79
Made more changes to the Admin Fields Conditions area to insure that the correct behaviour is aplied to the required fields. Removed the double forward slashes from the paths in the structure area of the compiler. 2018-09-10 13:04:52 +02:00
5b1813db7c
Update some comments. Fixed some conditional implementation of the show hide fields area in the admin views. 2018-09-09 22:04:38 +02:00
abb046f671
Fixed gh-334 to insure that we always have a path/string in the default value. Made other improvements in the compiler and the bcmath methods. 2018-08-31 23:11:23 +02:00
b3c4414320
Fixed some collusion issue in the dynamic get build process when custom query is used. Fixed the issue found in the import of JCB packages that caused custom code to be imported in duplication, also added the option to turn off (unpublish) custom code no longer in use. 2018-08-30 18:33:30 +02:00
be0d61ceae
Patch to fix the bug in the new custom_tabs area to insure the full list of tab names are loaded every time 2018-08-25 23:17:42 +02:00
231d8aa984
Added the option to add custom tabs to the edit view of any admin view 2018-08-24 23:46:41 +02:00
42e85b3944
Added context to site and custom admin views to better target triggered events. Added the redering option in the admin edit view, so to expand forms via plugins. Improved the codename build in site and custom admin view. 2018-08-23 23:52:00 +02:00
fdc66fe4c7
Added the feature to add custom Joomla fields to your components, requested in gh-247. Added plugin events to the dynamic get area. Added the script to remove field build in relation to component when component gets uninstalled. Improved the getForm method in the model to allow the passing of options to the form. Made further improvements to the implementation of the return parameter across the component redirecting behavior. Made some changes to the list layout views using the field relations area. 2018-08-23 03:59:45 +02:00
2a6be54317
Adapted the custom buttons and layout in the components, admins and libraries views. Fixed a bug in the JCB package import that missed custom code imports when code is changed inside the custom code. 2018-08-19 22:15:43 +02:00
103457eef7
Futher improved the redirect option to use return and stack the return path to take the user back to the original area from where they clicked away. 2018-08-18 14:09:17 +02:00
70e198abf3
improved the redirect option to work even if the parent method returns false. Resolved gh-330 by addig a full width class 2018-08-14 10:25:46 +02:00
78208d1525
Fixed the compiler to allow edit views be build even if no other site views are set. Removed all the depreciated joomla jimport statments. Update the getModel method in the controller. Updated the getRedirectToItemAppend, cancel and save method in the controller to also use the return value if internal. Added the addTablePath to the getTable method in the model to insure table is found when called from outside the in another component. Updated the diplay method in the JViewLagacy class to also use the return value if not null. Updated the component core to use JAccessExceptionNotallowed instead of JError::raiseWaring when user not have access to core. 2018-08-07 14:25:26 +02:00
f5c6fa899d
Added a fix to prefent language strings colliding on compilation. Added the option to use []+, in the custom code arg values. Added easy debug option for the setDynamicValues method in the compiler. Fixed the editor issue in the fields view. 2018-08-02 07:36:47 +02:00
e36b84f301
Stable Release of version 2.8.5 2018-07-30 08:10:50 +02:00
812857da81
Fixed gh-324 that had a typo with the storing of the PHPx values. Improved the safeString helper method 2018-07-23 04:53:59 +02:00
6dd654c745
Improved the Admin Fields Relations area to allow more custom coding without the need of selecting Join Field/s. Improved the dynamic get string fixing implementation to avoid conflict when the same field name is used in multiple joined tables requiering string fixing. Fixed gh-322 to insure ID is always readonly even if override detected. Added new feature to control access and view/hide control per/field. 2018-07-21 09:10:37 +02:00
0ca49414d2
Fixed gh-315 to insure all the WHMCS features work as expected 2018-07-08 22:19:01 +02:00
3a4a0e613b
Added the table and field validation to avoid import breakages due to new table or fields not found in the older local install of JCB. 2018-07-07 02:12:13 +02:00
9fd59f2353
Added none as the fallback if an editor gets unpublished. 2018-07-07 00:27:29 +02:00
2b39af94a2
fixed gh-312 that caused an error when creating a new component. 2018-07-07 00:01:30 +02:00
1a19a510dc
fixed line spacing in getform method 2018-07-06 17:56:29 +02:00
769e31061c
fixed line spacing in getform method 2018-07-06 17:52:24 +02:00
69d358ca06
fixed line spacing in getform method 2018-07-06 17:47:27 +02:00
a9a0952ff3
Added a global editor switch for all editors in JCB, the default is none. gh-305 Added two new fields to the admin view to target the getform method in the model. 2018-07-06 15:46:30 +02:00
25650efa47
Added Joomla volunteers banner. Fixed a syntax error in the custom admin view called get snippets. 2018-06-29 04:19:50 +02:00
1312e45d4a
Converting the textarea fields to editor fields, in the rest of JCB where code is being edited. gh-305 2018-06-25 22:54:26 +02:00
fd93feac42
added a validation rule to allow the submition of code in JCB 2018-06-25 04:26:05 +02:00
e774bf1002
Converting the textarea fields to editor fields, starting in the admin view. gh-305 2018-06-25 04:25:10 +02:00
8402051a94
fixed mismatch on field import of JCB packages 2018-06-13 22:38:32 +02:00
2ca5419106
fixed the dashboard JCB package import that did not update the ID in the Joomla Component Area 2018-06-12 17:39:13 +02:00
01149bfb7c
Mode some improvements to the new relation area. Fixed the notice message regarding the linked fields. 2018-05-31 12:31:44 +02:00
7f325b1233
Fixed a notice in the JCB package exporter. 2018-05-29 06:59:08 +02:00
a7c3a6e8f2
Fixed the javascript in the new relation area. Fixed gh-294 that hade count not array errors. Added the option to over-ride the column name in the new relation area. 2018-05-29 05:45:16 +02:00
f7be7ddad0
Resolved gh-287 that adds the feature to join/combine results of multiple fields in the admin list view. Update the tab string to make tabs dynamic in nature. Imporved the compiler building of the admin list view 2018-05-26 12:03:08 +02:00
fef3460772
Refactored the compiler list view body builder, in preparation of the relation fields. Added more options to the relation admin fields. gh-287 2018-05-24 15:58:48 +02:00
2543d11277
Updated compiler to allow dynamic update for language strings. Started adding the field relationship feature requested in gh-287 2018-05-22 21:01:55 +02:00
8488392fac
Update the header details in all files 2018-05-18 08:40:07 +02:00
e04db1b5b2
Added the email field type to resolve gh-283. Fixed the CSS inclution error to resolve gh-278. Added the option to add sql_uninstall dump value to a component. Did some class formating on the compiler. 2018-05-11 06:08:14 +02:00
476a0c525a
Added option to add source link to JCB packages, this also improved the JCB package import area 2018-05-05 16:47:48 +02:00
7cb78222ea
Fixed the clone method that gave the error Call to undefined method ComponentbuilderModelImport_joomla_components::updateAfter() 2018-05-04 22:27:49 +02:00
cc35295cf6
fixed export key setting, to be false when no key is found 2018-05-04 02:15:57 +02:00
3329aad3c7
Added the option to Manage JCB Package Directories in the globle Options area 2018-05-03 16:04:47 +02:00
47f90de990
Speedup the import page of JCB packages, to via background ajax get package info and store it in local browser memory 2018-05-03 13:30:53 +02:00
d961652f56
Futher improved the JCB package manager, so to be more stable and give enough information about selected packages 2018-05-02 16:47:01 +02:00
dfef0774f3
Improved the JCB package import area 2018-05-02 03:38:42 +02:00
88dbcee380
Added the community JCB package import option. Improved the jsonToString method to be more dynamic 2018-05-02 00:19:42 +02:00
8b4efd640f
Fixed the subform to allow encryption of values without data lose. 2018-04-30 14:06:05 +02:00
cec566176d
Fixed admin_fields_conditions edit view to insure an array gets given to the count function 2018-04-27 15:45:50 +02:00
47d1a6c155
Added the feature that allows you to setup the behaviour of a selected set of components that will be auto build and installed. So you do not need to manually compile and install those components any more, the system does all that automatically for you. We have called the feature Expansion Development Method, and it can be set in the global settings of JCB under the Development Method tab. 2018-04-25 00:36:05 +02:00
909a91844f
Fixed the auto backup system, to allow JCB to be backed up automatically 2018-04-23 14:47:19 +02:00
0857101371
Tweaked the field database area to insure that users are forced to set the database values 2018-04-23 02:42:41 +02:00
a110ff0e35
Fixed a strange mismatch issue with JCB package import with more then 10 components at a time. Also fixed the translation entranslation to source. 2018-04-20 23:14:49 +02:00
4b57e69edb
Improved JCB to now be able to have other languanges then en-GB as its base/main/global language. This will allow you to build your components in a language of your choice. 2018-04-20 01:36:49 +02:00
d1813147d3
Added edit links to templates and layouts. Fixed the alias and title selection issue in admin fields area. Added all available languages in Joomla to language area. 2018-04-19 17:52:47 +02:00
48a3a49d6f
Added minify of JS to the compiler area, also improved the infusion area to make more use of the getCustomScriptBuilder method 2018-04-18 21:11:14 +02:00
0dc22b100b
Added the option to clone a Component and all its linked data, also to import a JCB package without merging with local Component 2018-04-17 23:25:03 +02:00
dfff74989e
Keeping naming consistency resolved gh-265. Started adding the needed features for the new translation improvment gh-261 2018-04-15 22:21:34 +02:00
4e7d4af1d3
Added the php field properties to a textarea outside of the subform for easier editing 2018-04-15 00:52:48 +02:00
81e5038bb2
Fixed gh-264 another glitch due to the update of the field area, that caused the language tag selection to break 2018-04-14 02:04:12 +02:00
3002e093de
Added custom getOptions back after the fix of the field area 2018-04-13 22:11:35 +02:00
a0890ea87f
Fixed gh-262 that broke the saving of php values in custom field 2018-04-13 22:06:45 +02:00
694612aff9
Urgent fix to the fields area to address the extra field options, and fields with 0 being removed. Added the option to add a field and not add it to the database, so it will show in the edit view but will not be stored to the database. This is to use javascript/php to use that field value, and then drop it. 2018-04-13 17:24:06 +02:00
51d13b75f0
Fixed the css missing fields from field area 2018-04-11 23:04:33 +02:00
802554e7a9
Fixed line break error in JavaScript building area, also added little notice in field area to select field type. 2018-04-11 22:53:11 +02:00
e6b2b48ac7
Update the field area to be more user friendly, phase A of gh-258 2018-04-11 22:06:12 +02:00
10fdac5d60
Improved the field builder around JCB, moved some xml function into the JCB helper class core 2018-04-08 08:12:18 +02:00
6a77d71095
Fixed the import JCB packages link on dashboard, add frame to layout and template snippet display in related views 2018-04-03 08:24:24 +02:00
0a4b8f067f
Added the validation rules to the export and import of JCB packages 2018-03-30 11:32:22 +02:00
af1e76d21e
Made further improvments to the dynamic button to list fields 2018-03-30 09:58:24 +02:00
07662a8a8b
Fixed gh-255 to insure that the correct component name is used when building the button on the edit view where the custom field is used. 2018-03-30 06:41:33 +02:00
65e0a19dee
Fixed the edit-view for front-end to insure ajax also gets moved to site ajax. Also updated the UIkit notify to target uikit2 convention. 2018-03-30 03:29:24 +02:00
4e740f568e
Added the option for automatic alias building, resolve gh-246. Made improvements to the buttons all over JCB, and the tweaked the field view a little more. 2018-03-28 11:46:14 +02:00
0ba2a0e8cf
Added validation rules resolve gh-254. Removed empty sql files. Improved the field area. 2018-03-27 11:57:16 +02:00
4f7ddcefe7
Added checksum validation for VDM packages and improved the JCB package import area 2018-03-24 03:36:07 +02:00
052adc271f
Upgraded to v2.7.0 with new VDM package import option 2018-03-21 05:10:34 +02:00
baba793def
Fix gh-249 that caused the admin views to break in PHP 7.2 We also added VDM package import to the import of JCB packages 2018-03-21 04:45:51 +02:00
1c8129eec7
Fixed the linked to feature to also detect fields linked to subforms and repeatable fields 2018-03-20 04:35:48 +02:00
42ae72d97e
Added string manipulation back as a field building method, to insure JCB always works well accross shared server invironments. We did not remove the SimpleXMLElement method, but kept both options with a global selection option and internal error handeling. Resolved gh-197 2018-03-18 06:28:54 +02:00
e715fa1614
Made some changes to insure JCB is stable in PHP7, removed the related translations string from joomla_component view to speed up page load. 2018-03-12 00:36:14 +02:00
1991a46689
Fixed the getFieldName method to always fall back to global name if none is set in the xml. 2018-03-11 04:59:46 +02:00
ee949fbe6e
Expanded the automatic DB update feature, to insure that any changes to a field name/datatype/lenght will now also create a DB update, resolve gh-241 2018-03-11 04:44:43 +02:00
34efe32002
Added the feature to use admin and custom admin views as the dashboard of the back-end of a component, requested in gh-148 2018-03-09 05:29:05 +02:00
417076243d
Added medium enencryption and added an over all improvment to the encryption implementation. Added extra security to EXTERNALCODE feature that only allows admin to make use of this feature. 2018-03-06 05:03:44 +02:00
a39289ac9c
Added feature that will allow custom icons on the dashboard of component to use custom links - resolved gh-240. Tweaked the compiler messages. 2018-03-05 02:13:42 +02:00
45e1c33865
Fixed the export feature to insure no old data structures are exported. Added extra field detection to insure all related fields are exported 2018-03-03 05:19:28 +02:00
1902604328
added some updated notes to the paths area 2018-03-02 04:08:40 +02:00