#340 add support for security policy header

digedag · Nov 18, 2023 · 98da3ac · 98da3ac
1 parent b9908f7
commit 98da3ac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/Classes/Backend/Form/ToolBox.php b/Classes/Backend/Form/ToolBox.php
@@ -68,7 +68,7 @@ class ToolBox
     public const OPTION_TITLE = 'title';
 
     public const OPTION_CONFIRM = 'confirm';
-    public const OPTION_ICON_NAME = 'icon-name';
+    public const OPTION_ICON_NAME = 'icon';
     public const OPTION_HOVER_TEXT = 'hover';
 
     public const OPTION_PARAMS = 'params';
@@ -635,7 +635,6 @@ public function createLink($paramStr, $pid, $label, array $options = [])
      */
     public function createModuleLink(array $params, $pid, $label, array $options = [])
     {
-        $label = $this->buildIconTag($options, $label);
         if (!isset($_GET['id']) && !isset($params['id'])) {
             // ensure pid is set even on POST requests.
             $params['id'] = $pid;
@@ -648,8 +647,7 @@ public function createModuleLink(array $params, $pid, $label, array $options = [
             $recordButton->setHoverText($options[self::OPTION_HOVER_TEXT]);
         }
 
-        if (isset($options[self::OPTION_ICON_NAME])) {
-            $icon = Icons::getSpriteIcon($options[self::OPTION_ICON_NAME], ['asIcon' => true]);
+        if ($icon = $this->buildIcon($options)) {
             $recordButton->setIcon($icon);
         }
 
@@ -665,14 +663,17 @@ public function createModuleLink(array $params, $pid, $label, array $options = [
         return $recordButton->render();
     }
 
-    protected function buildIconTag(array $options, $label = '')
+    /**
+     * @return \TYPO3\CMS\Core\Imaging\Icon|null
+     */
+    protected function buildIcon(array $options)
     {
-        $tag = $label;
+        $tag = null;
         // $options['sprite'] für abwärtskompatibilität
         if (isset($options['icon']) || isset($options['sprite'])) {
             $icon = isset($options['icon']) ? $options['icon'] : $options['sprite'];
             // FIXME: label get lost here??
-            $tag = Icons::getSpriteIcon($icon, $options);
+            $tag = Icons::getSpriteIcon($icon, array_merge(['asIcon' => true], $options));
         }
 
         return $tag;
@@ -690,7 +691,9 @@ protected function buildIconTag(array $options, $label = '')
      */
     public function createSubmit($name, $value, $confirmMsg = '', $options = [])
     {
-        $icon = $this->buildIconTag($options, '');
+        // FIXME: das muss überarbeitet werden.
+        $icon = $this->buildIcon($options);
+        $icon = $icon ? $icon->render() : '';
         $onClick = '';
         if (strlen($confirmMsg)) {
             $onClick = 'onclick="return confirm('.Strings::quoteJSvalue($confirmMsg).')"';

diff --git a/tests/Classes/Backend/Form/ToolBoxTest.php b/tests/Classes/Backend/Form/ToolBoxTest.php
@@ -360,7 +360,7 @@ public function testCreateLinkWithIconForTypo387()
             ->will(self::returnValue('jumpUrl'));
 
         self::assertRegExp(
-            '/<a href="#" class="myClass" onclick="window.location.href=\'jumpUrl\'; return false;" >.*<img.*actions\-add\.svg" width="16" height="16".*<\/a>/s',
+            '/<a href="jumpUrl" class="myClass" title="mylabel">.*<img.*actions-add\.svg" width="16" height="16".*<\/a>/s',
             $formTool->createLink($urlParameters, 0, 'mylabel', $options)
         );
     }
@@ -386,7 +386,7 @@ public function testCreateLinkWithIconAndSizeForTypo387()
             ->will(self::returnValue('jumpUrl'));
 
         self::assertRegExp(
-            '/<a href="#" class="myClass" onclick="window.location.href=\'jumpUrl\'; return false;" >.*<img.*actions\-add\.svg" width="32" height="32".*<\/a>/s',
+            '/<a href="jumpUrl" class="myClass" title="mylabel">.*<img.*actions\-add\.svg" width="32" height="32".*<\/a>/s',
             $formTool->createLink($urlParameters, 0, 'mylabel', $options)
         );
     }