Improve name of user location map option

[GitHub/WoltLab/WCF.git] / com.woltlab.wcf / option.xml

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 0f8f9b0a9fda1ea992655affc59e0ace00d3078d..7d8d0fca51d3f5766f78c1b15837f5b90ab9d9e6 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -29,15 +29,18 @@
                        </category>
                                <category name="general.page">
                                        <parent>general</parent>
+                                       <showorder>1</showorder>
                                </category>
                                        <category name="general.page.seo">
                                                <parent>general.page</parent>
                                        </category>
                                <category name="general.offline">
                                        <parent>general</parent>
+                                       <showorder>2</showorder>
                                </category>
                                <category name="general.system">
                                        <parent>general</parent>
+                                       <showorder>3</showorder>
                                </category>
                                        <category name="general.system.cookie">
                                                <parent>general.system</parent>
@@ -68,6 +71,7 @@
                                        </category>
                                <category name="general.mail">
                                        <parent>general</parent>
+                                       <showorder>4</showorder>
                                </category>
                                        <category name="general.mail.general">
                                                <parent>general.mail</parent>
@@ -77,6 +81,7 @@
                                        </category>
                                <category name="general.cache">
                                        <parent>general</parent>
+                                       <showorder>5</showorder>
                                </category>
                                        <category name="general.cache.general">
                                                <parent>general.cache</parent>
@@ -86,6 +91,7 @@
                                        </category>
                                <category name="general.payment">
                                        <parent>general</parent>
+                                       <showorder>6</showorder>
                                </category>
                                        <category name="general.payment.paidSubscription">
                                                <parent>general.payment</parent>
@@ -373,7 +379,7 @@
                        <option name="module_wcf_ad">
                                <categoryname>module.display</categoryname>
                                <optiontype>boolean</optiontype>
-                               <defaultvalue>1</defaultvalue>
+                               <defaultvalue>0</defaultvalue>
                        </option>
                        
                        <!-- general.page -->
@@ -424,16 +430,16 @@
                                <categoryname>general.page.seo</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>0</defaultvalue>
+                               <enableoptions>!url_controller_replacement</enableoptions>
                        </option>
                        <option name="url_omit_index_php">
                                <categoryname>general.page.seo</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>0</defaultvalue>
                        </option>
-                       <option name="url_to_lowercase">
+                       <option name="url_controller_replacement">
                                <categoryname>general.page.seo</categoryname>
-                               <optiontype>boolean</optiontype>
-                               <defaultvalue>1</defaultvalue>
+                               <optiontype>urlControllerReplacement</optiontype>
                        </option>
                        <option name="url_title_component_replacement">
                                <categoryname>general.page.seo</categoryname>
@@ -503,14 +509,6 @@ imagick:wcf.acp.option.image_adapter_type.imagick]]>
                                <categoryname>general.system.http</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>1</defaultvalue>
-                               <enableoptions><![CDATA[http_gzip_level]]></enableoptions>
-                       </option>
-                       <option name="http_gzip_level">
-                               <categoryname>general.system.http</categoryname>
-                               <optiontype>integer</optiontype>
-                               <defaultvalue>1</defaultvalue>
-                               <minvalue>1</minvalue>
-                               <maxvalue>9</maxvalue>
                        </option>
                        <!-- /general.system.http -->
                        
@@ -654,8 +652,7 @@ imagick:wcf.acp.option.image_adapter_type.imagick]]>
                                <categoryname>security.antispam.recaptcha</categoryname>
                                <optiontype>text</optiontype>
                                <validationpattern>^[^/]*$</validationpattern>
-                               <!-- wcf-recaptcha.woltlab.com global key -->
-                               <defaultvalue>6LfOlMYSAAAAADvo3s4puBAYDqI-6YK2ybe7BJE5</defaultvalue>
+                               <defaultvalue></defaultvalue>
                                <showorder>1</showorder>
                        </option>
                        <option name="recaptcha_privatekey">
@@ -663,7 +660,7 @@ imagick:wcf.acp.option.image_adapter_type.imagick]]>
                                <optiontype>text</optiontype>
                                <validationpattern>^[^/]*$</validationpattern>
                                <!-- wcf-recaptcha.woltlab.com global key -->
-                               <defaultvalue>6LfOlMYSAAAAAKR3m_EFxmDv1xS8PCfeaSZ2LdG9</defaultvalue>
+                               <defaultvalue></defaultvalue>
                                <showorder>2</showorder>
                        </option>
                        <!-- /security.antispam.recaptcha -->
@@ -750,6 +747,11 @@ physical:wcf.acp.option.google_maps_type.physical]]></selectoptions>
                                <optiontype>float</optiontype>
                                <defaultvalue>13.4</defaultvalue>
                        </option>
+                       <option name="google_maps_access_user_location">
+                               <categoryname>general.system.googleMaps</categoryname>
+                               <optiontype>boolean</optiontype>
+                               <defaultvalue>1</defaultvalue>
+                       </option>
                        <!-- /general.system.googleMaps -->
                        
                        <!-- general.mail.general -->
@@ -1120,13 +1122,13 @@ retro:wcf.acp.option.gravatar_default_type.retro]]></selectoptions>
                                <categoryname>user.avatar</categoryname>
                                <optiontype>integer</optiontype>
                                <defaultvalue>192</defaultvalue>
-                               <minvalue>48</minvalue>
+                               <minvalue>96</minvalue>
                        </option>
                        <option name="max_avatar_height">
                                <categoryname>user.avatar</categoryname>
                                <optiontype>integer</optiontype>
                                <defaultvalue>192</defaultvalue>
-                               <minvalue>48</minvalue>
+                               <minvalue>96</minvalue>
                        </option>
                        <!-- /user.avatar -->
                        
@@ -1254,7 +1256,7 @@ DESC:wcf.global.sortOrder.descending]]></selectoptions>
                        <option name="user_cleanup_notification_lifetime">
                                <categoryname>user.cleanup</categoryname>
                                <optiontype>integer</optiontype>
-                               <defaultvalue>60</defaultvalue>
+                               <defaultvalue>14</defaultvalue>
                                <minvalue>0</minvalue>
                        </option>
                        <option name="user_cleanup_activity_event_lifetime">
@@ -1404,5 +1406,7 @@ DESC:wcf.global.sortOrder.descending]]></selectoptions>
        
        <delete>
                <option name="cache_source_memcached_use_pconnect" />
+               <option name="http_gzip_level" />
+               <option name="url_to_lowercase" />
        </delete>
 </data>