Skip to content
Snippets Groups Projects
Commit b01a853f authored by Fabian de Rijk's avatar Fabian de Rijk
Browse files

Issue #3297744 by Project Update Bot, fabianderijk: Automated Drupal 10...

Issue #3297744 by Project Update Bot, fabianderijk: Automated Drupal 10 compatibility fixes // PHPCS fixes
parent da3e4538
Branches
Tags
No related merge requests found
Showing
with 28 additions and 27 deletions
name: 'Office 365 - Contacts'
type: module
description: 'Provides Office 365 Contacts. Makes it possible to: search contacts.'
core_version_requirement: ^8 || ^9
core_version_requirement: ^8.4 || ^9 || ^10
package: 'Microsoft Office'
dependencies:
- o365:o365
\ No newline at end of file
- o365:o365
name: 'Office 365 - Groups'
type: module
description: 'Connector between Office 365 Teams and Groups in Drupal.'
core_version_requirement: ^8 || ^9
core_version_requirement: ^8.4 || ^9 || ^10
package: 'Microsoft Office'
dependencies:
- o365:o365
......
......@@ -141,7 +141,7 @@ class GroupsService {
* @param string $id
* The channel ID.
*
* @return string|FALSE
* @return string|false
* The URL to the team or FALSE.
*
* @throws \Drupal\Core\TempStore\TempStoreException
......
name: 'Office 365 - Links to Office apps'
type: module
description: 'Provides a Office 365 links block for the users.'
core_version_requirement: ^8 || ^9
core_version_requirement: ^8.4 || ^9 || ^10
package: 'Microsoft Office'
configure: o365_links.settings
dependencies:
- o365:o365
\ No newline at end of file
- o365:o365
......@@ -9,4 +9,3 @@ frontend:
css:
component:
static/css/o365_links.frontend.css: {}
name: 'Office 365 - OneDrive'
type: module
description: 'OneDrive connector for the Office 365 module.'
core_version_requirement: ^8 || ^9
core_version_requirement: ^8.4 || ^9 || ^10
package: 'Microsoft Office'
dependencies:
- o365:o365
\ No newline at end of file
- o365:o365
......@@ -121,5 +121,4 @@ class RecentFilesBlock extends O365UncachedBlockBase implements ContainerFactory
$this->configuration['recent_files_block_text'] = $values['recent_files_block_text'];
}
}
......@@ -120,4 +120,5 @@ class SharedFilesBlock extends O365UncachedBlockBase implements ContainerFactory
$this->configuration['show_shared_files_block'] = $values['show_shared_files_block'];
$this->configuration['shared_files_block_text'] = $values['shared_files_block_text'];
}
}
name: 'Office 365 - Outlook Calendar'
type: module
description: 'Outlook connector for the Office 365 module.'
core_version_requirement: ^8 || ^9
core_version_requirement: ^8.4 || ^9 || ^10
package: 'Microsoft Office'
configure: o365_outlook_calendar.settings
dependencies:
......
......@@ -122,9 +122,10 @@ class OutlookCalendarSaveEventService {
$fields = [
'' => $empty,
];
$entityFields = $this->entityFieldManager->getFieldDefinitions('node', $contentType);
if (!empty($entityFields)) {
foreach ($entityFields as $fieldName => $fieldDefinition) {
foreach ($entityFields as $fieldDefinition) {
$fields[$fieldDefinition->getName()] = $fieldDefinition->getLabel() . ' (' . $fieldDefinition->getType() . ')';
}
}
......
name: 'Office 365 - Outlook Mail'
type: module
description: 'Outlook Mail connector for the Office 365 module'
core_version_requirement: ^8 || ^9
core_version_requirement: ^8.4 || ^9 || ^10
package: 'Microsoft Office'
dependencies:
- o365:o365
\ No newline at end of file
- o365:o365
name: 'Office 365 - Profiles and Personas'
type: module
description: 'Profile and Persona data from Office 365'
core_version_requirement: ^8 || ^9
core_version_requirement: ^8.4 || ^9 || ^10
package: 'Microsoft Office'
configure: o365_profile.teams_links_config
dependencies:
- o365:o365
\ No newline at end of file
- o365:o365
......@@ -82,9 +82,9 @@ class O365ProfileGetDataService {
$imageData = $this->o365Graph->getGraphData('/users/' . $profileData['currentUserId'] . '/photos/' . strtolower($photoSize) . '/$value', 'GET', TRUE);
if ($imageData) {
$profileData['imageData'] = $imageData;
$profileData['imageMeta'] = $this->o365Graph->getGraphData('/users/' . $profileData['currentUserId'] . '/photos/' . strtolower($photoSize));
$profileData['imageBase64'] = base64_encode($profileData['imageData']);
$profileData['imageSrc'] = 'data:' . $profileData['imageMeta']['@odata.mediaContentType'] . ';base64,' . base64_encode($profileData['imageData']);
$profileData['imageMeta'] = $this->o365Graph->getGraphData('/users/' . $profileData['currentUserId'] . '/photos/' . strtolower($photoSize));
$profileData['imageBase64'] = base64_encode($profileData['imageData']);
$profileData['imageSrc'] = 'data:' . $profileData['imageMeta']['@odata.mediaContentType'] . ';base64,' . base64_encode($profileData['imageData']);
}
}
catch (ClientException $exception) {
......
name: 'Office 365 - Profiles and Personas REST endpoints'
type: module
description: 'Profile and Persona data from Office 365 accessible in REST'
core_version_requirement: ^8 || ^9
core_version_requirement: ^8.4 || ^9 || ^10
package: 'Microsoft Office'
dependencies:
- drupal:rest
......
......@@ -7,4 +7,4 @@ configuration:
supported_formats:
- json
supported_auth:
- cookie
\ No newline at end of file
- cookie
name: 'Office 365 - REST'
type: module
description: 'Enable REST for Office 365 module, eg for getting the access token'
core_version_requirement: ^8 || ^9
core_version_requirement: ^8.4 || ^9 || ^10
package: 'Microsoft Office'
dependencies:
- o365_sso
- o365:o365_sso
- drupal:rest
......@@ -15,4 +15,3 @@ field.value.field_sharepoint_search_link:
sharepoint_web_url:
type: string
label: Web URL
name: 'Office 365 - SharePoint Search Field'
type: module
description: 'This module provides a "Field Type" that allows users to generate a link to SharePoint files'
core_version_requirement: ^8 || ^9
core_version_requirement: ^8.4 || ^9 || ^10
package: 'Microsoft Office'
dependencies:
- o365:o365
......
......@@ -24,4 +24,4 @@ o365_sharepoint_field.ckeditor_link_dialog:
requirements:
_permission: 'access content'
options:
_theme: ajax_base_page
\ No newline at end of file
_theme: ajax_base_page
......@@ -33,6 +33,8 @@ class SharePoint extends CKEditorPluginBase implements ContainerFactoryPluginInt
* The plugin id.
* @param string $plugin_definition
* The plugin definition.
* @param \Drupal\Core\Extension\ModuleExtensionList $moduleExtensionList
* The module extension list service.
*/
public function __construct(array $configuration, $plugin_id, $plugin_definition, ModuleExtensionList $moduleExtensionList) {
parent::__construct($configuration, $plugin_id, $plugin_definition);
......@@ -69,7 +71,7 @@ class SharePoint extends CKEditorPluginBase implements ContainerFactoryPluginInt
return [
'Sharepoint' => [
'label' => $this->t('SharePoint'),
'image' => drupal_get_path('module', 'o365_sharepoint_field') . '/js/plugins/sharepoint/sharepoint.png',
'image' => $this->modulePath . '/js/plugins/sharepoint/sharepoint.png',
],
];
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment