Adjusts the option type template names to match the class names

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 4f151a458f0ecf982f5bf621d0b9a8f323cd5b77..edcae451852b03805c7df6bc93d32465135b73e2 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -157,7 +157,7 @@
                        <!-- general.image -->
                        <option name="image_adapter_type">
                                <categoryname>general.image</categoryname>
-                               <optiontype>radiobuttons</optiontype>
+                               <optiontype>radioButton</optiontype>
                                <defaultvalue><![CDATA[gd]]></defaultvalue>
                                <selectoptions>
                                        <![CDATA[gd:wcf.acp.option.image_adapter_type.gd
@@ -285,7 +285,7 @@ imagick:wcf.acp.option.image_adapter_type.imagick]]>
                        <!-- mail.send -->
                        <option name="mail_send_method">
                                <categoryname>general.mail.send</categoryname>
-                               <optiontype>radiobuttons</optiontype>
+                               <optiontype>radioButton</optiontype>
                                <defaultvalue><![CDATA[php]]></defaultvalue>
                                <selectoptions><![CDATA[php:wcf.acp.option.mail_send_method.php
 smtp:wcf.acp.option.mail_send_method.smtp
@@ -328,7 +328,7 @@ debug:mail_debug_logfile_path,!mail_use_f_param,!mail_smtp_host,!mail_smtp_port,
                        <!-- general.cache -->
                        <option name="cache_source_type">
                                <categoryname>general.cache.general</categoryname>
-                               <optiontype>radiobuttons</optiontype>
+                               <optiontype>radioButton</optiontype>
                                <defaultvalue><![CDATA[disk]]></defaultvalue>
                                <selectoptions><![CDATA[disk:wcf.acp.option.cache_source_type.disk
 memcache:wcf.acp.option.cache_source_type.memcache

diff --git a/com.woltlab.wcf/template/booleanOptionType.tpl b/com.woltlab.wcf/template/booleanOptionType.tpl
new file mode 100644 (file)
index 0000000..5250110
--- /dev/null
+++ b/com.woltlab.wcf/template/booleanOptionType.tpl
@@ -0,0 +1 @@
+<input type="checkbox" id="{$option->optionName}" {if $value} checked="checked"{/if} name="values[{$option->optionName}]" value="1" {if $disableOptions || $enableOptions}class="enablesOptions" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]" {/if} />

diff --git a/com.woltlab.wcf/template/multiSelectOptionType.tpl b/com.woltlab.wcf/template/multiSelectOptionType.tpl
new file mode 100644 (file)
index 0000000..3c8ce85
--- /dev/null
+++ b/com.woltlab.wcf/template/multiSelectOptionType.tpl
@@ -0,0 +1,5 @@
+<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple="multiple" size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}">
+{foreach from=$selectOptions key=key item=selectOption}
+       <option value="{$key}"{if $key|in_array:$value} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+{/foreach}
+</select>

diff --git a/com.woltlab.wcf/template/optionTypeBoolean.tpl b/com.woltlab.wcf/template/optionTypeBoolean.tpl
deleted file mode 100644 (file)
index 5250110..0000000
--- a/com.woltlab.wcf/template/optionTypeBoolean.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<input type="checkbox" id="{$option->optionName}" {if $value} checked="checked"{/if} name="values[{$option->optionName}]" value="1" {if $disableOptions || $enableOptions}class="enablesOptions" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]" {/if} />

diff --git a/com.woltlab.wcf/template/optionTypeMultiselect.tpl b/com.woltlab.wcf/template/optionTypeMultiselect.tpl
deleted file mode 100644 (file)
index 3c8ce85..0000000
--- a/com.woltlab.wcf/template/optionTypeMultiselect.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple="multiple" size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}">
-{foreach from=$selectOptions key=key item=selectOption}
-       <option value="{$key}"{if $key|in_array:$value} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
-{/foreach}
-</select>

diff --git a/com.woltlab.wcf/template/optionTypeRadiobuttons.tpl b/com.woltlab.wcf/template/optionTypeRadiobuttons.tpl
deleted file mode 100644 (file)
index 744a948..0000000
--- a/com.woltlab.wcf/template/optionTypeRadiobuttons.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<fieldset>
-       <dl>
-               {foreach from=$selectOptions key=key item=selectOption}
-                       <dd>
-                               <label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="enablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
-                       </dd>
-               {/foreach}
-       </dl>
-</fieldset>

diff --git a/com.woltlab.wcf/template/optionTypeSelect.tpl b/com.woltlab.wcf/template/optionTypeSelect.tpl
deleted file mode 100644 (file)
index caa4a50..0000000
--- a/com.woltlab.wcf/template/optionTypeSelect.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<select id="{$option->optionName}" name="values[{$option->optionName}]">
-{foreach from=$selectOptions key=key item=selectOption}
-       <option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
-{/foreach}
-</select>
\ No newline at end of file

diff --git a/com.woltlab.wcf/template/optionTypeText.tpl b/com.woltlab.wcf/template/optionTypeText.tpl
deleted file mode 100644 (file)
index bec294b..0000000
--- a/com.woltlab.wcf/template/optionTypeText.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if} />
\ No newline at end of file

diff --git a/com.woltlab.wcf/template/optionTypeTextarea.tpl b/com.woltlab.wcf/template/optionTypeTextarea.tpl
deleted file mode 100644 (file)
index 657ee51..0000000
--- a/com.woltlab.wcf/template/optionTypeTextarea.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10">{$value}</textarea>
\ No newline at end of file

diff --git a/com.woltlab.wcf/template/radioButtonOptionType.tpl b/com.woltlab.wcf/template/radioButtonOptionType.tpl
new file mode 100644 (file)
index 0000000..744a948
--- /dev/null
+++ b/com.woltlab.wcf/template/radioButtonOptionType.tpl
@@ -0,0 +1,9 @@
+<fieldset>
+       <dl>
+               {foreach from=$selectOptions key=key item=selectOption}
+                       <dd>
+                               <label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="enablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
+                       </dd>
+               {/foreach}
+       </dl>
+</fieldset>

diff --git a/com.woltlab.wcf/template/selectOptionType.tpl b/com.woltlab.wcf/template/selectOptionType.tpl
new file mode 100644 (file)
index 0000000..caa4a50
--- /dev/null
+++ b/com.woltlab.wcf/template/selectOptionType.tpl
@@ -0,0 +1,5 @@
+<select id="{$option->optionName}" name="values[{$option->optionName}]">
+{foreach from=$selectOptions key=key item=selectOption}
+       <option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+{/foreach}
+</select>
\ No newline at end of file

diff --git a/com.woltlab.wcf/template/textI18nOptionType.tpl b/com.woltlab.wcf/template/textI18nOptionType.tpl
new file mode 100644 (file)
index 0000000..8caccff
--- /dev/null
+++ b/com.woltlab.wcf/template/textI18nOptionType.tpl
@@ -0,0 +1,10 @@
+<script type="text/javascript">
+       //<![CDATA[
+       $(function() {
+               var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
+               var $optionValues = { {implode from=$i18nValues[$option->optionName] key=languageID item=value}'{@$languageID}': '{$value}'{/implode} };
+               new WCF.MultipleLanguageInput('{$option->optionName}', false, $optionValues, $availableLanguages);
+       });
+       //]]>
+</script>
+<input type="{@$inputType}" id="{$option->optionName}" name="{$option->optionName}" value="{$i18nPlainValues[$option->optionName]}" />

diff --git a/com.woltlab.wcf/template/textOptionType.tpl b/com.woltlab.wcf/template/textOptionType.tpl
new file mode 100644 (file)
index 0000000..bec294b
--- /dev/null
+++ b/com.woltlab.wcf/template/textOptionType.tpl
@@ -0,0 +1 @@
+<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if} />
\ No newline at end of file

diff --git a/com.woltlab.wcf/template/textareaI18nOptionType.tpl b/com.woltlab.wcf/template/textareaI18nOptionType.tpl
new file mode 100644 (file)
index 0000000..ecc8981
--- /dev/null
+++ b/com.woltlab.wcf/template/textareaI18nOptionType.tpl
@@ -0,0 +1,10 @@
+<script type="text/javascript">
+       //<![CDATA[
+       $(function() {
+               var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
+               var $optionValues = { {implode from=$i18nValues[$option->optionName] key=languageID item=value}'{@$languageID}': '{$value}'{/implode} };
+               new WCF.MultipleLanguageInput('{$option->optionName}', false, $optionValues, $availableLanguages);
+       });
+       //]]>
+</script>
+<textarea id="{$option->optionName}" name="{$option->optionName}" cols="40" rows="10">{$i18nPlainValues[$option->optionName]}</textarea>

diff --git a/com.woltlab.wcf/template/textareaOptionType.tpl b/com.woltlab.wcf/template/textareaOptionType.tpl
new file mode 100644 (file)
index 0000000..657ee51
--- /dev/null
+++ b/com.woltlab.wcf/template/textareaOptionType.tpl
@@ -0,0 +1 @@
+<textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10">{$value}</textarea>
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/booleanOptionType.tpl b/wcfsetup/install/files/acp/templates/booleanOptionType.tpl
new file mode 100644 (file)
index 0000000..5250110
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/booleanOptionType.tpl
@@ -0,0 +1 @@
+<input type="checkbox" id="{$option->optionName}" {if $value} checked="checked"{/if} name="values[{$option->optionName}]" value="1" {if $disableOptions || $enableOptions}class="enablesOptions" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]" {/if} />

diff --git a/wcfsetup/install/files/acp/templates/multiSelectOptionType.tpl b/wcfsetup/install/files/acp/templates/multiSelectOptionType.tpl
new file mode 100644 (file)
index 0000000..3c8ce85
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/multiSelectOptionType.tpl
@@ -0,0 +1,5 @@
+<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple="multiple" size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}">
+{foreach from=$selectOptions key=key item=selectOption}
+       <option value="{$key}"{if $key|in_array:$value} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+{/foreach}
+</select>

diff --git a/wcfsetup/install/files/acp/templates/optionTypeBoolean.tpl b/wcfsetup/install/files/acp/templates/optionTypeBoolean.tpl
deleted file mode 100644 (file)
index 5250110..0000000
--- a/wcfsetup/install/files/acp/templates/optionTypeBoolean.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<input type="checkbox" id="{$option->optionName}" {if $value} checked="checked"{/if} name="values[{$option->optionName}]" value="1" {if $disableOptions || $enableOptions}class="enablesOptions" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]" {/if} />

diff --git a/wcfsetup/install/files/acp/templates/optionTypeMultiselect.tpl b/wcfsetup/install/files/acp/templates/optionTypeMultiselect.tpl
deleted file mode 100644 (file)
index 3c8ce85..0000000
--- a/wcfsetup/install/files/acp/templates/optionTypeMultiselect.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple="multiple" size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}">
-{foreach from=$selectOptions key=key item=selectOption}
-       <option value="{$key}"{if $key|in_array:$value} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
-{/foreach}
-</select>

diff --git a/wcfsetup/install/files/acp/templates/optionTypeRadiobuttons.tpl b/wcfsetup/install/files/acp/templates/optionTypeRadiobuttons.tpl
deleted file mode 100644 (file)
index 744a948..0000000
--- a/wcfsetup/install/files/acp/templates/optionTypeRadiobuttons.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<fieldset>
-       <dl>
-               {foreach from=$selectOptions key=key item=selectOption}
-                       <dd>
-                               <label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="enablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
-                       </dd>
-               {/foreach}
-       </dl>
-</fieldset>

diff --git a/wcfsetup/install/files/acp/templates/optionTypeSelect.tpl b/wcfsetup/install/files/acp/templates/optionTypeSelect.tpl
deleted file mode 100644 (file)
index caa4a50..0000000
--- a/wcfsetup/install/files/acp/templates/optionTypeSelect.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<select id="{$option->optionName}" name="values[{$option->optionName}]">
-{foreach from=$selectOptions key=key item=selectOption}
-       <option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
-{/foreach}
-</select>
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/optionTypeText.tpl b/wcfsetup/install/files/acp/templates/optionTypeText.tpl
deleted file mode 100644 (file)
index bec294b..0000000
--- a/wcfsetup/install/files/acp/templates/optionTypeText.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if} />
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/optionTypeTextI18n.tpl b/wcfsetup/install/files/acp/templates/optionTypeTextI18n.tpl
deleted file mode 100644 (file)
index 8caccff..0000000
--- a/wcfsetup/install/files/acp/templates/optionTypeTextI18n.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<script type="text/javascript">
-       //<![CDATA[
-       $(function() {
-               var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
-               var $optionValues = { {implode from=$i18nValues[$option->optionName] key=languageID item=value}'{@$languageID}': '{$value}'{/implode} };
-               new WCF.MultipleLanguageInput('{$option->optionName}', false, $optionValues, $availableLanguages);
-       });
-       //]]>
-</script>
-<input type="{@$inputType}" id="{$option->optionName}" name="{$option->optionName}" value="{$i18nPlainValues[$option->optionName]}" />

diff --git a/wcfsetup/install/files/acp/templates/optionTypeTextarea.tpl b/wcfsetup/install/files/acp/templates/optionTypeTextarea.tpl
deleted file mode 100644 (file)
index 657ee51..0000000
--- a/wcfsetup/install/files/acp/templates/optionTypeTextarea.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10">{$value}</textarea>
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/optionTypeTextareaI18n.tpl b/wcfsetup/install/files/acp/templates/optionTypeTextareaI18n.tpl
deleted file mode 100644 (file)
index ecc8981..0000000
--- a/wcfsetup/install/files/acp/templates/optionTypeTextareaI18n.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<script type="text/javascript">
-       //<![CDATA[
-       $(function() {
-               var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
-               var $optionValues = { {implode from=$i18nValues[$option->optionName] key=languageID item=value}'{@$languageID}': '{$value}'{/implode} };
-               new WCF.MultipleLanguageInput('{$option->optionName}', false, $optionValues, $availableLanguages);
-       });
-       //]]>
-</script>
-<textarea id="{$option->optionName}" name="{$option->optionName}" cols="40" rows="10">{$i18nPlainValues[$option->optionName]}</textarea>

diff --git a/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl b/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl
new file mode 100644 (file)
index 0000000..744a948
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl
@@ -0,0 +1,9 @@
+<fieldset>
+       <dl>
+               {foreach from=$selectOptions key=key item=selectOption}
+                       <dd>
+                               <label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="enablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
+                       </dd>
+               {/foreach}
+       </dl>
+</fieldset>

diff --git a/wcfsetup/install/files/acp/templates/selectOptionType.tpl b/wcfsetup/install/files/acp/templates/selectOptionType.tpl
new file mode 100644 (file)
index 0000000..caa4a50
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/selectOptionType.tpl
@@ -0,0 +1,5 @@
+<select id="{$option->optionName}" name="values[{$option->optionName}]">
+{foreach from=$selectOptions key=key item=selectOption}
+       <option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+{/foreach}
+</select>
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl b/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl
new file mode 100644 (file)
index 0000000..8caccff
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl
@@ -0,0 +1,10 @@
+<script type="text/javascript">
+       //<![CDATA[
+       $(function() {
+               var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
+               var $optionValues = { {implode from=$i18nValues[$option->optionName] key=languageID item=value}'{@$languageID}': '{$value}'{/implode} };
+               new WCF.MultipleLanguageInput('{$option->optionName}', false, $optionValues, $availableLanguages);
+       });
+       //]]>
+</script>
+<input type="{@$inputType}" id="{$option->optionName}" name="{$option->optionName}" value="{$i18nPlainValues[$option->optionName]}" />

diff --git a/wcfsetup/install/files/acp/templates/textOptionType.tpl b/wcfsetup/install/files/acp/templates/textOptionType.tpl
new file mode 100644 (file)
index 0000000..bec294b
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/textOptionType.tpl
@@ -0,0 +1 @@
+<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if} />
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/textareaI18nOptionType.tpl b/wcfsetup/install/files/acp/templates/textareaI18nOptionType.tpl
new file mode 100644 (file)
index 0000000..ecc8981
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/textareaI18nOptionType.tpl
@@ -0,0 +1,10 @@
+<script type="text/javascript">
+       //<![CDATA[
+       $(function() {
+               var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
+               var $optionValues = { {implode from=$i18nValues[$option->optionName] key=languageID item=value}'{@$languageID}': '{$value}'{/implode} };
+               new WCF.MultipleLanguageInput('{$option->optionName}', false, $optionValues, $availableLanguages);
+       });
+       //]]>
+</script>
+<textarea id="{$option->optionName}" name="{$option->optionName}" cols="40" rows="10">{$i18nPlainValues[$option->optionName]}</textarea>

diff --git a/wcfsetup/install/files/acp/templates/textareaOptionType.tpl b/wcfsetup/install/files/acp/templates/textareaOptionType.tpl
new file mode 100644 (file)
index 0000000..657ee51
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/textareaOptionType.tpl
@@ -0,0 +1 @@
+<textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10">{$value}</textarea>
\ No newline at end of file

diff --git a/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php b/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php
index 39458dc3b9854d00b17e2c6ed9d02a65c37ad839..a1b6fbf63c406417e50e1104a0e73e8c5406d941 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php
@@ -28,7 +28,7 @@ class BooleanOptionType extends AbstractOptionType implements ISearchableUserOpt
                        'option' => $option,
                        'value' => $value
                ));
-               return WCF::getTPL()->fetch('optionTypeBoolean');
+               return WCF::getTPL()->fetch('booleanOptionType');
        }
        
        /**

diff --git a/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
new file mode 100644 (file)
index 0000000..af3f05e
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
@@ -0,0 +1,64 @@
+<?php
+namespace wcf\system\option;
+use wcf\data\option\Option;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\exception\UserInputException;
+use wcf\system\WCF;
+use wcf\util\ArrayUtil;
+
+/**
+ * MultiSelectOptionType is an implementation of IOptionType for multiple 'select' tags.
+ *
+ * @author     Marcel Werk
+ * @copyright  2001-2011 WoltLab GmbH
+ * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package    com.woltlab.wcf
+ * @subpackage system.option
+ * @category   Community Framework
+ */
+class MultiSelectOptionType extends SelectOptionType {
+       /**
+        * @see wcf\system\option\IOptionType::getFormElement()
+        */
+       public function getFormElement(Option $option, $value) {
+               WCF::getTPL()->assign(array(
+                       'option' => $option,
+                       'selectOptions' => $option->parseSelectOptions(),
+                       'value' => explode("\n", $value)
+               ));
+               return WCF::getTPL()->fetch('multiSelectOptionType');
+       }
+       
+       /**
+        * @see wcf\system\option\IOptionType::validate()
+        */
+       public function validate(Option $option, $newValue) {
+               if (!is_array($newValue)) $newValue = array();
+               $options = $option->parseSelectOptions();
+               foreach ($newValue as $value) {
+                       if (!isset($options[$value])) {
+                               throw new UserInputException($option->optionName, 'validationFailed');
+                       }
+               }
+       }
+       
+       /**
+        * @see wcf\system\option\IOptionType::getData()
+        */
+       public function getData(Option $option, $newValue) {
+               if (!is_array($newValue)) $newValue = array();
+               return implode("\n", $newValue);
+       }
+       
+       /**
+        * @see wcf\system\option\ISearchableUserOption::getCondition()
+        */
+       public function getCondition(PreparedStatementConditionBuilder &$conditions, Option $option, $value) {
+               if (!is_array($value) || !count($value)) return false;
+               $value = ArrayUtil::trim($value);
+               if (!count($value)) return false;
+               
+               $conditions->add("option_value.userOption".$option->optionID." = ?", array(implode("\n", $value)));
+               return true;
+       }
+}

diff --git a/wcfsetup/install/files/lib/system/option/MultiselectOptionType.class.php b/wcfsetup/install/files/lib/system/option/MultiselectOptionType.class.php
deleted file mode 100644 (file)
index 329ff7b..0000000
--- a/wcfsetup/install/files/lib/system/option/MultiselectOptionType.class.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-namespace wcf\system\option;
-use wcf\data\option\Option;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\exception\UserInputException;
-use wcf\system\WCF;
-use wcf\util\ArrayUtil;
-
-/**
- * MultiselectOptionType is an implementation of IOptionType for multiple 'select' tags.
- *
- * @author     Marcel Werk
- * @copyright  2001-2011 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package    com.woltlab.wcf
- * @subpackage system.option
- * @category   Community Framework
- */
-class MultiselectOptionType extends SelectOptionType {
-       /**
-        * @see wcf\system\option\IOptionType::getFormElement()
-        */
-       public function getFormElement(Option $option, $value) {
-               WCF::getTPL()->assign(array(
-                       'option' => $option,
-                       'selectOptions' => $option->parseSelectOptions(),
-                       'value' => explode("\n", $value)
-               ));
-               return WCF::getTPL()->fetch('optionTypeMultiselect');
-       }
-       
-       /**
-        * @see wcf\system\option\IOptionType::validate()
-        */
-       public function validate(Option $option, $newValue) {
-               if (!is_array($newValue)) $newValue = array();
-               $options = $option->parseSelectOptions();
-               foreach ($newValue as $value) {
-                       if (!isset($options[$value])) {
-                               throw new UserInputException($option->optionName, 'validationFailed');
-                       }
-               }
-       }
-       
-       /**
-        * @see wcf\system\option\IOptionType::getData()
-        */
-       public function getData(Option $option, $newValue) {
-               if (!is_array($newValue)) $newValue = array();
-               return implode("\n", $newValue);
-       }
-       
-       /**
-        * @see wcf\system\option\ISearchableUserOption::getCondition()
-        */
-       public function getCondition(PreparedStatementConditionBuilder &$conditions, Option $option, $value) {
-               if (!is_array($value) || !count($value)) return false;
-               $value = ArrayUtil::trim($value);
-               if (!count($value)) return false;
-               
-               $conditions->add("option_value.userOption".$option->optionID." = ?", array(implode("\n", $value)));
-               return true;
-       }
-}

diff --git a/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php b/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php
new file mode 100644 (file)
index 0000000..675438f
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php
@@ -0,0 +1,85 @@
+<?php
+namespace wcf\system\option;
+use wcf\data\option\Option;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\WCF;
+use wcf\system\UserInputException;
+use wcf\util\StringUtil;
+
+/**
+ * RadiobuttonsOptionType is an implementation of IOptionType for 'input type="radio"' tags.
+ *
+ * @author     Marcel Werk
+ * @copyright  2001-2011 WoltLab GmbH
+ * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package    com.woltlab.wcf
+ * @subpackage system.option
+ * @category   Community Framework
+ */
+class RadioButtonOptionType extends AbstractOptionType implements ISearchableUserOption {
+       /**
+        * name of the template that contains the form element of this option type
+        * @var string
+        */
+       public $templateName = 'radioButtonOptionType';
+
+       /**
+        * @see wcf\system\option\IOptionType::getFormElement()
+        */
+       public function getFormElement(Option $option, $value) {
+               // get options
+               $selectOptions = $option->parseSelectOptions();
+
+               $availableOptions = $option->parseMultipleEnableOptions();
+               $options = array(
+                       'disableOptions' => array(),
+                       'enableOptions' => array()
+               );
+               
+               foreach ($availableOptions as $key => $enableOptions) {
+                       $optionData = Option::parseEnableOptions($enableOptions);
+                       
+                       $options['disableOptions'][$key] = $optionData['disableOptions'];
+                       $options['enableOptions'][$key] = $optionData['enableOptions'];
+               }
+               
+               WCF::getTPL()->assign(array(
+                       'disableOptions' => $options['disableOptions'],
+                       'enableOptions' => $options['enableOptions'],
+                       'option' => $option,
+                       'selectOptions' => $selectOptions,
+                       'value' => $value
+               ));
+               return WCF::getTPL()->fetch($this->templateName);
+       }
+       
+       /**
+        * @see wcf\system\option\IOptionType::validate()
+        */
+       public function validate(Option $option, $newValue) {
+               if (!empty($newValue)) {
+                       $options = $option->parseSelectOptions();
+                       if (!isset($options[$newValue])) {
+                               throw new UserInputException($option->optionName, 'validationFailed');
+                       }
+               }
+       }
+       
+       /**
+        * @see wcf\system\option\ISearchableUserOption::getSearchFormElement()
+        */
+       public function getSearchFormElement(Option $option, $value) {
+               return $this->getFormElement($optionData, $value);
+       }
+       
+       /**
+        * @see wcf\system\option\ISearchableUserOption::getCondition()
+        */
+       public function getCondition(PreparedStatementConditionBuilder &$conditions, Option $option, $value) {
+               $value = StringUtil::trim($value);
+               if (!$value) return false;
+               
+               $conditions->add("option_value.userOption".$option->optionID." = ?", array($value));
+               return true;
+       }
+}

diff --git a/wcfsetup/install/files/lib/system/option/RadiobuttonsOptionType.class.php b/wcfsetup/install/files/lib/system/option/RadiobuttonsOptionType.class.php
deleted file mode 100644 (file)
index 5677dae..0000000
--- a/wcfsetup/install/files/lib/system/option/RadiobuttonsOptionType.class.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-namespace wcf\system\option;
-use wcf\data\option\Option;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\WCF;
-use wcf\system\UserInputException;
-use wcf\util\StringUtil;
-
-/**
- * RadiobuttonsOptionType is an implementation of IOptionType for 'input type="radio"' tags.
- *
- * @author     Marcel Werk
- * @copyright  2001-2011 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package    com.woltlab.wcf
- * @subpackage system.option
- * @category   Community Framework
- */
-class RadiobuttonsOptionType extends AbstractOptionType implements ISearchableUserOption {
-       /**
-        * name of the template that contains the form element of this option type
-        * @var string
-        */
-       public $templateName = 'optionTypeRadiobuttons';
-
-       /**
-        * @see wcf\system\option\IOptionType::getFormElement()
-        */
-       public function getFormElement(Option $option, $value) {
-               // get options
-               $selectOptions = $option->parseSelectOptions();
-
-               $availableOptions = $option->parseMultipleEnableOptions();
-               $options = array(
-                       'disableOptions' => array(),
-                       'enableOptions' => array()
-               );
-               
-               foreach ($availableOptions as $key => $enableOptions) {
-                       $optionData = Option::parseEnableOptions($enableOptions);
-                       
-                       $options['disableOptions'][$key] = $optionData['disableOptions'];
-                       $options['enableOptions'][$key] = $optionData['enableOptions'];
-               }
-               
-               WCF::getTPL()->assign(array(
-                       'disableOptions' => $options['disableOptions'],
-                       'enableOptions' => $options['enableOptions'],
-                       'option' => $option,
-                       'selectOptions' => $selectOptions,
-                       'value' => $value
-               ));
-               return WCF::getTPL()->fetch($this->templateName);
-       }
-       
-       /**
-        * @see wcf\system\option\IOptionType::validate()
-        */
-       public function validate(Option $option, $newValue) {
-               if (!empty($newValue)) {
-                       $options = $option->parseSelectOptions();
-                       if (!isset($options[$newValue])) {
-                               throw new UserInputException($option->optionName, 'validationFailed');
-                       }
-               }
-       }
-       
-       /**
-        * @see wcf\system\option\ISearchableUserOption::getSearchFormElement()
-        */
-       public function getSearchFormElement(Option $option, $value) {
-               return $this->getFormElement($optionData, $value);
-       }
-       
-       /**
-        * @see wcf\system\option\ISearchableUserOption::getCondition()
-        */
-       public function getCondition(PreparedStatementConditionBuilder &$conditions, Option $option, $value) {
-               $value = StringUtil::trim($value);
-               if (!$value) return false;
-               
-               $conditions->add("option_value.userOption".$option->optionID." = ?", array($value));
-               return true;
-       }
-}

diff --git a/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php
index 00229c4950edd0c0e44e438a512a603d2ac26d3f..58e2b5bec173f18612a920b46e54cf147b6d8027 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php
@@ -28,7 +28,7 @@ class SelectOptionType extends RadiobuttonsOptionType {
                        'selectOptions' => $option->parseSelectOptions(),
                        'value' => $value
                ));
-               return WCF::getTPL()->fetch('optionTypeSelect');
+               return WCF::getTPL()->fetch('selectOptionType');
        }
        
        /**

diff --git a/wcfsetup/install/files/lib/system/option/TextI18nOptionType.class.php b/wcfsetup/install/files/lib/system/option/TextI18nOptionType.class.php
index 8b0392f175b0264ccad892e6c155d7dfcb6b1db2..dee53c4c8cedf3f0aefaf9c6224ea3f175d37138 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/TextI18nOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextI18nOptionType.class.php
@@ -33,7 +33,7 @@ class TextI18nOptionType extends TextOptionType {
                        'inputType' => $this->inputType,
                        'value' => $value
                ));
-               return WCF::getTPL()->fetch('optionTypeTextI18n');
+               return WCF::getTPL()->fetch('textI18nOptionType');
        }
        
        /**

diff --git a/wcfsetup/install/files/lib/system/option/TextOptionType.class.php b/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
index 38117881b29e75e018929b76ba078cefa3b487e5..05245fe0c0997ba244ea7d95d12461c2e35ca0fa 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
@@ -40,7 +40,7 @@ class TextOptionType extends AbstractOptionType implements ISearchableUserOption
                        'inputClass' => $this->inputClass,
                        'value' => $value
                ));
-               return WCF::getTPL()->fetch('optionTypeText');
+               return WCF::getTPL()->fetch('textOptionType');
        }
        
        /**

diff --git a/wcfsetup/install/files/lib/system/option/TextareaI18nOptionType.class.php b/wcfsetup/install/files/lib/system/option/TextareaI18nOptionType.class.php
index 0678c37e63200dd07a25a2aeb2a0611a9847f41c..50eb0a9abb23b71b37024bd9097d1f2ac12a387d 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/TextareaI18nOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextareaI18nOptionType.class.php
@@ -32,7 +32,7 @@ class TextareaI18nOptionType extends TextareaOptionType {
                        'option' => $option,
                        'value' => $value
                ));
-               return WCF::getTPL()->fetch('optionTypeTextareaI18n');
+               return WCF::getTPL()->fetch('textareaI18nOptionType');
        }
        
        /**

diff --git a/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php b/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php
index 082b0f1854526e0f3ba343799d003e30f3bc4459..83dce00058de916de1cd569005c010a1dd5684a6 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php
@@ -22,6 +22,6 @@ class TextareaOptionType extends TextOptionType {
                        'option' => $option,
                        'value' => $value
                ));
-               return WCF::getTPL()->fetch('optionTypeTextarea');
+               return WCF::getTPL()->fetch('textareaOptionType');
        }
 }

diff --git a/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php b/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php
index 52d973caf5a4d594002206de9564b5666175cbbf..3885f09ee34a936b9213f2f09775cc6aff60e479 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php
@@ -31,7 +31,7 @@ class TimezoneOptionType extends AbstractOptionType {
                        'selectOptions' => $timezoneOptions,
                        'value' => $value
                ));
-               return WCF::getTPL()->fetch('optionTypeSelect');
+               return WCF::getTPL()->fetch('selectOptionType');
        }
        
        /**