'
+ return '
';
- return result;
}
}.bind(this, field.key)
@@ -71,28 +71,23 @@ pimcore.object.tags.rgbaColor = Class.create(pimcore.object.tags.abstract, {
},
getLayoutEdit: function () {
-
- var labelWidth = 100;
- var width = this.fieldConfig.width ? this.fieldConfig.width : 400;
- if (this.fieldConfig.labelWidth) {
- labelWidth = this.fieldConfig.labelWidth;
+ const labelWidth = this.fieldConfig.labelWidth ? this.fieldConfig.labelWidth : 100;
+ let width = this.fieldConfig.width ? this.fieldConfig.width : 400;
+ if (!this.fieldConfig.labelAlign || 'left' === this.fieldConfig.labelAlign) {
+ width = this.sumWidths(width, labelWidth);
}
- width = this.sumWidths(width, labelWidth);
-
- this.selector = new Ext.ux.colorpick.Selector(
- {
- showPreviousColor: true,
- hidden: true,
- bind: {
- value: '{color}',
- visible: '{full}'
- }
+
+ this.selector = new Ext.ux.colorpick.Selector({
+ showPreviousColor: true,
+ hidden: true,
+ bind: {
+ value: '{color}',
+ visible: '{full}'
}
- );
+ });
- var colorConfig = {
- fieldLabel: this.fieldConfig.title,
- labelWidth: labelWidth,
+ const colorConfig = {
+ flex: 1,
format: '#hex8',
isNull: !this.data,
hidden: true,
@@ -103,31 +98,45 @@ pimcore.object.tags.rgbaColor = Class.create(pimcore.object.tags.abstract, {
colorConfig["value"] = this.data;
}
- this.colorField = Ext.create('pimcore.colorpick.Field',
+ this.colorField = Ext.create(
+ 'pimcore.colorpick.Field',
colorConfig
);
- var panel = new Ext.panel.Panel({
+ const compositeCfg = {
viewModel: {
data: {
- color: this.data ? this.data : "FFFFFFFF"
+ color: this.data ? this.data : 'FFFFFFFF'
}
},
+ fieldLabel: this.fieldConfig.title,
+ labelWidth: labelWidth,
layout: 'hbox',
width: width,
- componentCls: this.getWrapperClassNames(),
- items: [this.colorField, this.selector,
+ items: [
+ this.colorField,
+ this.selector,
{
- xtype: "button",
- iconCls: "pimcore_icon_delete",
- style: "margin-left: 5px",
- handler: this.empty.bind(this),
- }],
- style: "padding-bottom: 10px;"
- });
+ xtype: 'button',
+ iconCls: 'pimcore_icon_delete',
+ style: 'margin-left: 5px',
+ handler: this.empty.bind(this),
+ }
+ ],
+ componentCls: this.getWrapperClassNames(),
+ border: false,
+ style: {
+ padding: 0
+ }
+ };
+
+ if (this.fieldConfig.labelAlign) {
+ compositeCfg.labelAlign = this.fieldConfig.labelAlign;
+ }
this.colorField.setVisible(true);
- this.component = panel;
+ this.component = Ext.create('Ext.form.FieldContainer', compositeCfg);
+
return this.component;
},
@@ -137,7 +146,6 @@ pimcore.object.tags.rgbaColor = Class.create(pimcore.object.tags.abstract, {
},
getLayoutShow: function () {
-
this.component = this.getLayoutEdit();
this.component.disable();
@@ -145,13 +153,13 @@ pimcore.object.tags.rgbaColor = Class.create(pimcore.object.tags.abstract, {
},
getValue: function () {
- var viewModel = this.component.getViewModel();
- var isNull = this.colorField.getIsNull();
+ const viewModel = this.component.getViewModel();
+ const isNull = this.colorField.getIsNull();
if (isNull) {
return null;
}
- var value = viewModel.get("color");
- return value;
+
+ return viewModel.get("color");
},
getName: function () {
@@ -159,8 +167,6 @@ pimcore.object.tags.rgbaColor = Class.create(pimcore.object.tags.abstract, {
},
isDirty: function () {
- var dirty = this.getValue() != this.data
-
- return dirty;
+ return this.getValue() != this.data;
}
});
diff --git a/src/Controller/Admin/Asset/AssetController.php b/src/Controller/Admin/Asset/AssetController.php
index b9a7300276..277cba2ab2 100644
--- a/src/Controller/Admin/Asset/AssetController.php
+++ b/src/Controller/Admin/Asset/AssetController.php
@@ -1232,7 +1232,7 @@ public function getImageThumbnailAction(Request $request): BinaryFileResponse|Js
fpassthru($stream);
}, 200, [
'Content-Type' => $thumbnail->getMimeType(),
- 'Access-Control-Allow-Origin', '*',
+ 'Access-Control-Allow-Origin' => '*',
]);
$this->addThumbnailCacheHeaders($response);
@@ -2330,6 +2330,12 @@ public function gridProxyAction(Request $request, EventDispatcherInterface $even
}
if ($dirty) {
+ $metadataEvent = new GenericEvent($this, [
+ 'id' => $asset->getId(),
+ 'metadata' => $metadata,
+ ]);
+ $eventDispatcher->dispatch($metadataEvent, AdminEvents::ASSET_METADATA_PRE_SET);
+
// $metadata = Asset\Service::minimizeMetadata($metadata, "grid");
$asset->setMetadataRaw($metadata);
$asset->save();
diff --git a/src/Controller/Admin/Asset/AssetHelperController.php b/src/Controller/Admin/Asset/AssetHelperController.php
index 07e3d2e360..099fa83b3d 100644
--- a/src/Controller/Admin/Asset/AssetHelperController.php
+++ b/src/Controller/Admin/Asset/AssetHelperController.php
@@ -604,7 +604,7 @@ protected function updateGridConfigFavourites(?GridConfig $gridConfig, array $me
$sharedUserIds = $metadata['sharedUserIds'];
if ($sharedUserIds) {
- $sharedUsers = explode(',', $sharedUserIds);
+ $sharedUsers = array_map('intval', explode(',', $sharedUserIds));
}
}
@@ -620,7 +620,7 @@ protected function updateGridConfigFavourites(?GridConfig $gridConfig, array $me
foreach ($sharedUsers as $id) {
// Check if the user has already a favourite
$favourite = GridConfigFavourite::getByOwnerAndClassAndObjectId(
- (int) $id,
+ $id,
$gridConfig->getClassId(),
0,
$gridConfig->getSearchType()
@@ -636,7 +636,7 @@ protected function updateGridConfigFavourites(?GridConfig $gridConfig, array $me
}
// Check if the user is the owner. If that is the case we do not update the favourite
- if ((int) $favouriteGridConfig->getOwnerId() === (int) $id) {
+ if ($favouriteGridConfig->getOwnerId() === $id) {
continue;
}
}
@@ -1054,6 +1054,12 @@ public function batchAction(Request $request, EventDispatcherInterface $eventDis
try {
if ($dirty) {
+ $metadataEvent = new GenericEvent($this, [
+ 'id' => $asset->getId(),
+ 'metadata' => $metadata,
+ ]);
+ $eventDispatcher->dispatch($metadataEvent, AdminEvents::ASSET_METADATA_PRE_SET);
+
// $metadata = Asset\Service::minimizeMetadata($metadata, "grid");
$asset->setMetadataRaw($metadata);
$asset->save();
diff --git a/src/Controller/Admin/DataObject/DataObjectActionsTrait.php b/src/Controller/Admin/DataObject/DataObjectActionsTrait.php
index ef7e2e7d2d..40c59c0fd2 100644
--- a/src/Controller/Admin/DataObject/DataObjectActionsTrait.php
+++ b/src/Controller/Admin/DataObject/DataObjectActionsTrait.php
@@ -229,7 +229,6 @@ private function prepareObjectData(
$fieldGetter = 'get' . ucfirst($brickField);
$brickGetter = 'get' . ucfirst($brickType);
- $valueSetter = 'set' . ucfirst($brickKey);
$brick = $object->$fieldGetter()->$brickGetter();
if (empty($brick)) {
@@ -257,7 +256,7 @@ private function prepareObjectData(
$localizedFields = $brick->getLocalizedfields();
$localizedFields->setLocalizedValue($brickKey, $value);
} else {
- $brick->$valueSetter($value);
+ $brick->setObjectVar($brickKey, $value);
}
} else {
if ($languagePermissions) {
diff --git a/src/Controller/Admin/DataObject/DataObjectController.php b/src/Controller/Admin/DataObject/DataObjectController.php
index 78e1daab9e..159ff190fa 100644
--- a/src/Controller/Admin/DataObject/DataObjectController.php
+++ b/src/Controller/Admin/DataObject/DataObjectController.php
@@ -410,7 +410,7 @@ static function (Task $task) {
try {
$this->getDataForObject($object, $objectFromVersion);
- } catch(\Throwable $e) {
+ } catch (\Throwable $e) {
$object = $objectFromDatabase;
$this->getDataForObject($object, false);
}
@@ -1352,7 +1352,7 @@ public function saveAction(Request $request): JsonResponse
if ($request->get('data')) {
try {
$this->applyChanges($object, $this->decodeJson($request->get('data')));
- } catch(\Throwable $e) {
+ } catch (\Throwable $e) {
$this->applyChanges($objectFromDatabase, $this->decodeJson($request->get('data')));
}
}
diff --git a/src/Controller/Admin/DataObject/DataObjectHelperController.php b/src/Controller/Admin/DataObject/DataObjectHelperController.php
index bdecb29d3b..02ea68322d 100644
--- a/src/Controller/Admin/DataObject/DataObjectHelperController.php
+++ b/src/Controller/Admin/DataObject/DataObjectHelperController.php
@@ -317,7 +317,7 @@ public function doGetGridColumnConfig(Request $request, Config $config, bool $is
$setAsFavourite = $savedGridConfig->isSetAsFavourite();
$saveFilters = $savedGridConfig->isSaveFilters();
- foreach($gridConfig['columns'] as &$column) {
+ foreach ($gridConfig['columns'] as &$column) {
if (array_key_exists('isOperator', $column) && $column['isOperator']) {
$colAttributes = &$column['fieldConfig']['attributes'];
SecurityHelper::convertHtmlSpecialCharsArrayKeys($colAttributes, ['label', 'attribute', 'param1']);
@@ -360,12 +360,9 @@ public function doGetGridColumnConfig(Request $request, Config $config, bool $is
'key' => $key,
'type' => 'system',
'label' => $key,
- 'locked' => $sc['locked'] ?? null,
'position' => $sc['position'],
];
- if (isset($sc['width'])) {
- $colConfig['width'] = $sc['width'];
- }
+ $this->injectCustomLayoutValues($colConfig, $sc);
$availableFields[] = $colConfig;
} else {
$keyParts = explode('~', $key);
@@ -387,9 +384,7 @@ public function doGetGridColumnConfig(Request $request, Config $config, bool $is
if ($fieldConfig) {
$fieldConfig['key'] = $key;
$fieldConfig['label'] = '#' . $keyFieldDef->getTitle();
- if (isset($sc['locked'])) {
- $fieldConfig['locked'] = $sc['locked'];
- }
+ $fieldConfig = $this->injectCustomLayoutValues($fieldConfig, $sc);
$availableFields[] = $fieldConfig;
}
}
@@ -427,12 +422,7 @@ public function doGetGridColumnConfig(Request $request, Config $config, bool $is
if ($fd !== null) {
$fieldConfig = $this->getFieldGridConfig($fd, $gridType, (string)$sc['position'], true, $keyPrefix, $class, $objectId);
if (!empty($fieldConfig)) {
- if (isset($sc['width'])) {
- $fieldConfig['width'] = $sc['width'];
- }
- if (isset($sc['locked'])) {
- $fieldConfig['locked'] = $sc['locked'];
- }
+ $fieldConfig = $this->injectCustomLayoutValues($fieldConfig, $sc);
$availableFields[] = $fieldConfig;
}
}
@@ -457,12 +447,7 @@ public function doGetGridColumnConfig(Request $request, Config $config, bool $is
if (!empty($fd)) {
$fieldConfig = $this->getFieldGridConfig($fd, $gridType, (string)$sc['position'], true, null, $class, $objectId);
if (!empty($fieldConfig)) {
- if (isset($sc['width'])) {
- $fieldConfig['width'] = $sc['width'];
- }
- if (isset($sc['locked'])) {
- $fieldConfig['locked'] = $sc['locked'];
- }
+ $fieldConfig = $this->injectCustomLayoutValues($fieldConfig, $sc);
$availableFields[] = $fieldConfig;
}
}
@@ -530,6 +515,26 @@ public function doGetGridColumnConfig(Request $request, Config $config, bool $is
];
}
+ private function injectCustomLayoutValues(array $fieldConfig, array $savedColumn): array
+ {
+ $keys = ['width', 'locked'];
+ foreach ($keys as $key) {
+ if (isset($savedColumn[$key])) {
+ $fieldConfig[$key] = $savedColumn[$key];
+ }
+ }
+
+ $fieldConfigKeys = ['noteditable'];
+ foreach ($fieldConfigKeys as $fieldConfigKey) {
+ if (isset($savedColumn['fieldConfig']['layout'][$fieldConfigKey])) {
+ $setter = 'set' . ucfirst($fieldConfigKey);
+ $fieldConfig['layout']->$setter($savedColumn['fieldConfig']['layout'][$fieldConfigKey]);
+ }
+ }
+
+ return $fieldConfig;
+ }
+
/**
* @param DataObject\ClassDefinition\Data[]|null $fields
*/
@@ -975,7 +980,7 @@ protected function updateGridConfigFavourites(?GridConfig $gridConfig, array $me
$sharedUserIds = $metadata['sharedUserIds'];
if ($sharedUserIds) {
- $sharedUsers = explode(',', $sharedUserIds);
+ $sharedUsers = array_map('intval', explode(',', $sharedUserIds));
}
}
@@ -991,7 +996,7 @@ protected function updateGridConfigFavourites(?GridConfig $gridConfig, array $me
foreach ($sharedUsers as $id) {
$global = true;
$favourite = GridConfigFavourite::getByOwnerAndClassAndObjectId(
- (int) $id,
+ $id,
$gridConfig->getClassId(),
$objectId,
$gridConfig->getSearchType()
@@ -1008,7 +1013,7 @@ protected function updateGridConfigFavourites(?GridConfig $gridConfig, array $me
}
// Check if the user is the owner. If that is the case we do not update the favourite
- if ((int) $favouriteGridConfig->getOwnerId() === (int) $id) {
+ if ($favouriteGridConfig->getOwnerId() === $id) {
continue;
}
}
@@ -1016,7 +1021,7 @@ protected function updateGridConfigFavourites(?GridConfig $gridConfig, array $me
// Check if the user has already a global favourite then we do not save the favourite as global
$favourite = GridConfigFavourite::getByOwnerAndClassAndObjectId(
- (int) $id,
+ $id,
$gridConfig->getClassId(),
0,
$gridConfig->getSearchType()
@@ -1032,7 +1037,7 @@ protected function updateGridConfigFavourites(?GridConfig $gridConfig, array $me
}
// Check if the user is the owner. If that is the case we do not update the global favourite
- if ($favouriteGridConfig->getOwnerId() === (int) $id) {
+ if ($favouriteGridConfig->getOwnerId() === $id) {
$global = false;
}
}
@@ -1179,7 +1184,7 @@ public function getExportJobsAction(Request $request, GridHelperService $gridHel
//prepare fields
$fieldnames = [];
$fields = json_decode($allParams['fields'][0], true);
- foreach($fields as $field) {
+ foreach ($fields as $field) {
$fieldnames[] = $field['key'];
}
$allParams['fields'] = $fieldnames;
diff --git a/src/Controller/Admin/ElementController.php b/src/Controller/Admin/ElementController.php
index 1bc30de37b..9d02a77bde 100644
--- a/src/Controller/Admin/ElementController.php
+++ b/src/Controller/Admin/ElementController.php
@@ -703,7 +703,7 @@ public function getRequiresDependenciesAction(Request $request): JsonResponse
'requires' => [], // Initialize 'requires' as an empty array
];
- if(count($elements) > 0) {
+ if (count($elements) > 0) {
$result = Model\Element\Service::getFilterRequiresForFrontend($elements);
$result['total'] = count($result['requires']);
@@ -765,7 +765,7 @@ public function getRequiredByDependenciesAction(Request $request): JsonResponse
'requiredBy' => [], // Initialize 'requiredBy' as an empty array
];
- if(count($elements) > 0) {
+ if (count($elements) > 0) {
$result = Model\Element\Service::getFilterRequiredByPathForFrontend($elements);
$result['total'] = count($result['requiredBy']);
diff --git a/src/Controller/Admin/MiscController.php b/src/Controller/Admin/MiscController.php
index 3f4762cf5b..87e6bf0561 100644
--- a/src/Controller/Admin/MiscController.php
+++ b/src/Controller/Admin/MiscController.php
@@ -129,7 +129,7 @@ public function jsonTranslationsSystemAction(Request $request, TranslatorInterfa
public function scriptProxyAction(Request $request): Response
{
$storageFile = $request->get('storageFile');
- if(!$storageFile) {
+ if (!$storageFile) {
throw new \InvalidArgumentException('The parameter storageFile is required');
}
diff --git a/src/Controller/Admin/TranslationController.php b/src/Controller/Admin/TranslationController.php
index facd96ec9c..d3f6af8783 100644
--- a/src/Controller/Admin/TranslationController.php
+++ b/src/Controller/Admin/TranslationController.php
@@ -634,10 +634,10 @@ protected function getGridFilterCondition(Request $request, string $tableName, b
];
}
- if(!empty($conditionFilters)) {
+ if (!empty($conditionFilters)) {
$conditions = [];
$params = [];
- foreach($conditionFilters as $conditionFilter) {
+ foreach ($conditionFilters as $conditionFilter) {
$conditions[] = $conditionFilter['condition'];
$params[$conditionFilter['field']] = $conditionFilter['value'];
}
diff --git a/src/Helper/GridHelperService.php b/src/Helper/GridHelperService.php
index a5256152fb..e6deaffb56 100644
--- a/src/Helper/GridHelperService.php
+++ b/src/Helper/GridHelperService.php
@@ -699,7 +699,7 @@ public function prepareListingForGrid(array $requestParams, string $requestedLan
if (isset($requestParams['filter_by_object_type'])) {
if ($requestParams['filter_by_object_type'] === 'only_objects') {
$list->setObjectTypes([DataObject::OBJECT_TYPE_OBJECT]);
- } elseif($requestParams['filter_by_object_type'] === 'only_variant_objects') {
+ } elseif ($requestParams['filter_by_object_type'] === 'only_variant_objects') {
$list->setObjectTypes([DataObject::OBJECT_TYPE_VARIANT]);
}
}
diff --git a/src/Security/ContentSecurityPolicyHandler.php b/src/Security/ContentSecurityPolicyHandler.php
index 3a93ab2c84..225bc4bef2 100644
--- a/src/Security/ContentSecurityPolicyHandler.php
+++ b/src/Security/ContentSecurityPolicyHandler.php
@@ -30,6 +30,8 @@ class ContentSecurityPolicyHandler implements LoggerAwareInterface
private ?string $nonce = null;
+ private const SELF = "'self'";
+
public const DEFAULT_OPT = 'default-src';
public const IMG_OPT = 'img-src';
@@ -46,6 +48,8 @@ class ContentSecurityPolicyHandler implements LoggerAwareInterface
public const FRAME_OPT = 'frame-src';
+ public const FRAME_ANCHESTORS = 'frame-ancestors';
+
public const WORKER_OPT = 'worker-src';
private array $allowedUrls = [
@@ -74,15 +78,16 @@ public function __construct(protected Config $config, protected array $cspHeader
public function configureOptions(OptionsResolver $resolver): void
{
$resolver->setDefaults([
- self::DEFAULT_OPT => "'self'",
+ self::DEFAULT_OPT => self::SELF,
self::IMG_OPT => '* data: blob:',
- self::MEDIA_OPT => "'self' data:",
- self::SCRIPT_OPT => "'self' 'nonce-" . $this->getNonce() . "' 'unsafe-inline' 'unsafe-eval'",
- self::STYLE_OPT => "'self' 'unsafe-inline'",
- self::FRAME_OPT => "'self' data:",
- self::CONNECT_OPT => "'self' blob:",
- self::FONT_OPT => "'self'",
- self::WORKER_OPT => "'self' blob:",
+ self::MEDIA_OPT => self::SELF . ' data:',
+ self::SCRIPT_OPT => self::SELF . " 'nonce-" . $this->getNonce() . "' 'unsafe-inline' 'unsafe-eval'",
+ self::STYLE_OPT => self::SELF . " 'unsafe-inline'",
+ self::FRAME_OPT => self::SELF . ' data:',
+ self::FRAME_ANCHESTORS => self::SELF,
+ self::CONNECT_OPT => self::SELF . ' blob:',
+ self::FONT_OPT => self::SELF,
+ self::WORKER_OPT => self::SELF . ' blob:',
]);
}
diff --git a/src/Service/PreviewGenerator.php b/src/Service/PreviewGenerator.php
index 688b310767..7899277c31 100644
--- a/src/Service/PreviewGenerator.php
+++ b/src/Service/PreviewGenerator.php
@@ -115,7 +115,7 @@ protected function getSitePreviewConfig(Concrete $object): array
$domains = $site->getDomains();
array_unshift($domains, $site->getMainDomain());
- if(is_null($preSelectedSite) && in_array(Tool::getHostname(), $domains)) {
+ if (is_null($preSelectedSite) && in_array(Tool::getHostname(), $domains)) {
$preSelectedSite = $sitesOptions[$label];
}
}
diff --git a/src/System/AdminConfig.php b/src/System/AdminConfig.php
index 65b98748d5..45f03887f2 100644
--- a/src/System/AdminConfig.php
+++ b/src/System/AdminConfig.php
@@ -62,7 +62,7 @@ public static function get(): array
// If the read target is settings-store and no data is found there,
// load the data from the container config
- if(!$data && $loadType === $repository::LOCATION_SETTINGS_STORE) {
+ if (!$data && $loadType === $repository::LOCATION_SETTINGS_STORE) {
$containerConfig = \Pimcore::getContainer()->getParameter('pimcore_admin.config');
$data[self::BRANDING] = $containerConfig[self::BRANDING];
$data[self::ASSETS] = $containerConfig[self::ASSETS];