[pull] master from mstilkerich:master #94
+6,976
−937
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
There is still a couple of issues (reported to psalm) and thus quite a few workaround annotations that can hopefully be removed in the future.
The change to the previous behavior is that no error messages will be logged anymore in case read-only or inactive addressbooks pass the matchurl/matchname filters and are subsequently sorted out. This change means the admin will not have no make sure the matchers do not match read-only (and inactive) addressbooks, as these will not even be considered in the initial set of candidates.
This avoids error messages in case the name attribute is fixed and the name template refers to server-side properties of an addressbook, which could not be queried anymore
…s of an addressbook gracefully When a fixed name setting is used and the template refers to server-side properties of an addressbook, this querying may fail and would have caused the updating of the preset to be aborted with an error logged. Now this is handled better in that only the name attribute will not be updated on failure to get the current server side property values, but the other fixed attributes and the other addressbooks of the server will still be updated.
This would happen when the shortcut in AdminSettings::getAddressbookTemplate() was taken to simply return the complete preset as template addressbook. However, this would have caused the addressbook template to override account fields when creating the UI form. While the latter is fixed in this commit as well, it is not expected to have account attributes inside the template addressbook in the first place, so this is addressed now, too.
This could only happen with manipulated requests. However, when the admin configures a preset account as hidden, their intention is that the user cannot see or modify the preferences for this account, so it makes sense to ensure this.
…e form itself An ID must only be assigned to one DOM element. We do not need IDs on the tables, so simply remove them at that place.
Omit the value attribute instead
Psalm will make sure we do not call these functions with unknown UI element types.
And add the flags column to all data sets that contain account data
…ss needed settings
…t not be a hardcoded fixed field anymore as it could now be changeable from UI
…m a preset (Fixes #440)
In the past, we used to have different default values for the last_updated timestamp, so we need to set it explicitly to a fixed value in the test.
The behavior of rcube_result_set->next() was changed upstream. This fixes enumeration within the search() function.
…ks (#470) When a card is moved or copied from one CardDAV addressbook to another via the roundcube web interface, the Addressbook::insert() function will receive a save_data object produced by rcmcarddav's DataConversion class, which includes a dummy vcard, but also the original vcard object. With the recent change to use a vcard provided by roundcube upon the import action, this dummy vcard would wrongly be added to the target addressbook. To avoid this, use the original vcard object that is also included in the save_data when it has been produced by rcmcarddav.
In more recent versions of mariadb, the mysql commmands (mysql, mysqldump) etc. are not present anymore. Instead, mariadb and mariadb-dump need to be used.
Newer versions of mysql docker image do not include the which command
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )