Remove unnecessary uses of `@`

diff --git a/com.woltlab.wcf/templates/shared_lineBreakSeparatedTextOptionType.tpl b/com.woltlab.wcf/templates/shared_lineBreakSeparatedTextOptionType.tpl
index 0c2ef49a653a7388a0d25a826ea5862b74845389..b43652228097a11644d2a7da3acc990787c79870 100644 (file)
--- a/com.woltlab.wcf/templates/shared_lineBreakSeparatedTextOptionType.tpl
+++ b/com.woltlab.wcf/templates/shared_lineBreakSeparatedTextOptionType.tpl
@@ -1,5 +1,5 @@
 <ul class="scrollableCheckboxList" {*
-       *}id="lineBreakSeparatedTextOption_{@$identifier}"{*
+       *}id="lineBreakSeparatedTextOption_{$identifier}"{*
        *}{if $values|empty} style="display: none"{/if}{*
 *}>
        {foreach from=$values item=value}
@@ -22,7 +22,7 @@
                });
                
                new UiItemListLineBreakSeparatedText(
-                       document.getElementById("lineBreakSeparatedTextOption_{@$identifier}")
+                       document.getElementById("lineBreakSeparatedTextOption_{@$identifier|encodeJS}")
                );
        });
 </script>

diff --git a/com.woltlab.wcf/templates/textOptionType.tpl b/com.woltlab.wcf/templates/textOptionType.tpl
index 653d3c9eb30accf674fabdb36dd97e603d4d2129..716688893bd2ba35148ebc1bd479de6eb4381102 100644 (file)
--- a/com.woltlab.wcf/templates/textOptionType.tpl
+++ b/com.woltlab.wcf/templates/textOptionType.tpl
@@ -1 +1 @@
-<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $option->minlength > 0 || $option->required} required{/if}{if $option->maxlength} maxlength="{$option->maxlength}"{/if}{if $inputClass} class="{@$inputClass}"{/if}>
+<input type="{$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $option->minlength > 0 || $option->required} required{/if}{if $option->maxlength} maxlength="{$option->maxlength}"{/if}{if $inputClass} class="{$inputClass}"{/if}>

diff --git a/wcfsetup/install/files/acp/templates/textOptionType.tpl b/wcfsetup/install/files/acp/templates/textOptionType.tpl
index ac502b003196919e3403284ada7f44ffbb687669..50958b63cff5bf3ece6dff245e16f6993579fb83 100644 (file)
--- a/wcfsetup/install/files/acp/templates/textOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/textOptionType.tpl
@@ -1 +1 @@
-<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if}{if $inputType == 'password'} autocomplete="new-password"{elseif $option->disableAutocomplete} autocomplete="off"{/if}>
+<input type="{$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{$inputClass}"{/if}{if $inputType == 'password'} autocomplete="new-password"{elseif $option->disableAutocomplete} autocomplete="off"{/if}>

diff --git a/wcfsetup/install/files/lib/system/option/LineBreakSeparatedTextOptionType.class.php b/wcfsetup/install/files/lib/system/option/LineBreakSeparatedTextOptionType.class.php
index 22026885bfed332579db4ae01e65ec5d9cefb962..9e54f2fa07f649845cf705ebfe00c75c4b23c029 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/LineBreakSeparatedTextOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/LineBreakSeparatedTextOptionType.class.php
@@ -27,7 +27,7 @@ class LineBreakSeparatedTextOptionType extends TextareaOptionType
 
         static $identifiers = [];
         do {
-            $identifier = \substr(StringUtil::getRandomID(), 0, 8);
+            $identifier = \bin2hex(\random_bytes(4));
         } while (\in_array($identifier, $identifiers));
         $identifiers[] = $identifier;