Fix multiple issues in XSD files

Closes #5809

diff --git a/XSD/acpMenu.xsd b/XSD/acpMenu.xsd
index efcc4cea79d22d230893997121935116e5bbb580..da96c7b1de1254f4bf6fb3777dcaaeb0d7610c7f 100644 (file)
--- a/XSD/acpMenu.xsd
+++ b/XSD/acpMenu.xsd
@@ -34,7 +34,11 @@
        </xs:complexType>
 
        <xs:complexType name="acpmenuitem_icon">
-               <xs:attribute name="solid" type="xs:boolean" />
+               <xs:simpleContent>
+                       <xs:extension base="woltlab_varchar">
+                               <xs:attribute name="solid" type="xs:boolean" />
+                       </xs:extension>
+               </xs:simpleContent>
        </xs:complexType>
        
        <!-- imported/updated acp menu item element type -->
@@ -53,4 +57,4 @@
                        </xs:extension>
                </xs:complexContent>
        </xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>

diff --git a/XSD/bbcode.xsd b/XSD/bbcode.xsd
index a6e1015f93737cfce0b72a12c96d3dcc67d557a1..724730dd5c3a41eb42b6f05ecf2dff98a1be2e52 100644 (file)
--- a/XSD/bbcode.xsd
+++ b/XSD/bbcode.xsd
@@ -34,7 +34,11 @@
        </xs:complexType>
 
        <xs:complexType name="bbcode_icon">
-               <xs:attribute name="solid" type="xs:boolean" />
+               <xs:simpleContent>
+                       <xs:extension base="woltlab_varchar">
+                               <xs:attribute name="solid" type="xs:boolean" />
+                       </xs:extension>
+               </xs:simpleContent>
        </xs:complexType>
        
        <!-- imported/updated page menu item element -->
@@ -57,7 +61,7 @@
        
        <xs:complexType name="attributes_element">
                <xs:sequence>
-                       <xs:element name="attribute" type="attribute_element" minOccurs="1" />
+                       <xs:element name="attribute" type="attribute_element" minOccurs="1" maxOccurs="unbounded" />
                </xs:sequence>
        </xs:complexType>
        
@@ -77,4 +81,4 @@
        <xs:complexType name="attribute_element_basic">
                <xs:attribute name="name" type="xs:unsignedInt" use="required" />
        </xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>

diff --git a/XSD/cronjob.xsd b/XSD/cronjob.xsd
index 6bc26a4279cb88f9168a252dfab925c9df207e04..62cbe75737a1ca66c813bf5f262701352bad779f 100644 (file)
--- a/XSD/cronjob.xsd
+++ b/XSD/cronjob.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- The file "cronjobs.xsd" is used for xml-files which installs, updates or deletes searchable cronjobs. -->
+<!-- The file "cronjobs.xsd" is used for xml-files which installs, updates or deletes cronjobs. -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
        <!-- include types -->
        <xs:include schemaLocation="types.xsd" />
@@ -30,27 +30,23 @@
        
        <!-- cronjob element type -->
        <xs:complexType name="cronjob_import">
-               <xs:complexContent>
-                       <xs:extension base="cronjob_delete">
-                               <xs:choice maxOccurs="unbounded" minOccurs="0">
-                                       <xs:element name="description" type="description_element" minOccurs="0" maxOccurs="unbounded" />
-                                       <xs:element name="expression" type="woltlab_varchar" minOccurs="1" />
-                                       <xs:element name="canbeedited" type="woltlab_boolean" minOccurs="0" default="1" />
-                                       <xs:element name="canbedisabled" type="woltlab_boolean" minOccurs="0" default="1" />
-                                       <xs:element name="isdisabled" type="woltlab_boolean" minOccurs="0" default="0" />
-                                       <xs:element name="options" type="xs:string" minOccurs="0" />
-                               </xs:choice>
-                       </xs:extension>
-               </xs:complexContent>
+               <xs:choice maxOccurs="unbounded">
+                       <xs:element name="classname" type="woltlab_varchar" minOccurs="1" maxOccurs="1" />
+                       <xs:element name="description" type="description_element" minOccurs="0" maxOccurs="unbounded" />
+                       <xs:element name="expression" type="expression_element" minOccurs="1" maxOccurs="1" />
+                       <xs:element name="canbeedited" type="woltlab_boolean" minOccurs="0" maxOccurs="1" default="1" />
+                       <xs:element name="canbedisabled" type="woltlab_boolean" minOccurs="0" maxOccurs="1" default="1" />
+                       <xs:element name="isdisabled" type="woltlab_boolean" minOccurs="0" maxOccurs="1" default="0" />
+                       <xs:element name="options" type="xs:string" minOccurs="0" maxOccurs="1" />
+               </xs:choice>
+               <xs:attribute name="name" type="woltlab_varchar" use="required" />
        </xs:complexType>
        
        <xs:complexType name="cronjob_delete">
+               <xs:all>
+                       <xs:element name="classname" type="woltlab_varchar_nullable" minOccurs="0" />
+               </xs:all>
                <xs:attribute name="name" type="woltlab_varchar" use="optional" />
-               <xs:complexContent>
-                       <xs:all>
-                               <xs:element name="classname" type="woltlab_varchar_nullable" minOccurs="0" />
-                       </xs:all>
-               </xs:complexContent>
        </xs:complexType>
        
        <xs:complexType name="description_element">
@@ -60,4 +56,12 @@
                        </xs:extension>
                </xs:simpleContent>
        </xs:complexType>
+
+       <xs:complexType name="expression_element">
+               <xs:simpleContent>
+                       <xs:extension base="woltlab_varchar">
+                               <xs:attribute name="type" type="woltlab_varchar" use="optional" />
+                       </xs:extension>
+               </xs:simpleContent>
+       </xs:complexType>
 </xs:schema>

diff --git a/XSD/language.xsd b/XSD/language.xsd
index 9c5e933f88ce3d2893da881a811b0356640e0b10..77955ad9d3a723dfa483a3493d6495ab18573984 100644 (file)
--- a/XSD/language.xsd
+++ b/XSD/language.xsd
@@ -7,13 +7,17 @@
        <!-- data element -->
        <xs:element name="language">
                <xs:complexType>
-                       <!-- deprecated since 5.5 -->
-                       <xs:sequence>
-                               <xs:element name="category" type="category" maxOccurs="unbounded" />
-                       </xs:sequence>
-                       <!-- /deprecated since 5.5 -->
-                       <xs:element name="import" type="import" minOccurs="0" />
-                       <xs:element name="delete" type="delete" minOccurs="0" />
+                       <xs:choice>
+                               <!-- deprecated since 5.5 -->
+                               <xs:sequence>
+                                       <xs:element name="category" type="category" maxOccurs="unbounded" />
+                               </xs:sequence>
+                               <!-- /deprecated since 5.5 -->
+                               <xs:sequence>
+                                       <xs:element name="import" type="import" minOccurs="0" />
+                                       <xs:element name="delete" type="delete" minOccurs="0" />
+                               </xs:sequence>
+                       </xs:choice>
                        <xs:attribute name="languagecode" type="woltlab_varchar" use="required" />
                        <xs:attribute name="languagename" type="woltlab_varchar" use="optional" />
                        <xs:attribute name="countrycode" type="woltlab_varchar" use="optional" />
@@ -46,4 +50,4 @@
        <xs:complexType name="item" mixed="true">
                <xs:attribute name="name" type="woltlab_varchar" use="required" />
        </xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>

diff --git a/XSD/objectType.xsd b/XSD/objectType.xsd
index ac2841150570593a73e5ecc07264fc9445a12b78..9daa1e07d60a5610c2e193267ae1cf8109b8929c 100644 (file)
--- a/XSD/objectType.xsd
+++ b/XSD/objectType.xsd
@@ -43,15 +43,37 @@
                        <xs:element name="allowcontent" type="woltlab_boolean" minOccurs="0" />
                        <xs:element name="allowsidebar" type="woltlab_boolean" minOccurs="0" />
                        <xs:element name="nicevalue" type="xs:integer" minOccurs="0" />
+                       <xs:element name="options" type="woltlab_varchar_nullable" minOccurs="0" />
+                       <xs:element name="supportsReactions" type="woltlab_boolean" minOccurs="0" />
+                       <xs:element name="searchindex" type="woltlab_varchar_nullable" minOccurs="0" />
+                       <xs:element name="enableToc" type="woltlab_boolean" minOccurs="0" />
+                       <xs:element name="disallowedBBCodesPermission" type="woltlab_varchar_nullable" minOccurs="0" />
+                       <xs:element name="tableName" type="woltlab_varchar_nullable" minOccurs="0" />
+                       <xs:element name="tablePrimaryKey" type="woltlab_varchar_nullable" minOccurs="0" />
+                       <xs:element name="default" type="woltlab_varchar_nullable" minOccurs="0" />
+                       <xs:element name="conditiongroup" type="woltlab_varchar_nullable" minOccurs="0" />
+                       <xs:element name="propertyname" type="woltlab_varchar_nullable" minOccurs="0" />
+                       <xs:element name="minvalue" type="woltlab_varchar_nullable" minOccurs="0" />
+                       <xs:element name="conditionobject" type="woltlab_varchar_nullable" minOccurs="0" />
+                       <xs:element name="includeguests" type="woltlab_boolean" minOccurs="0" />
+                       <xs:element name="cssclassname" type="woltlab_varchar_nullable" minOccurs="0" />
+                       <xs:element name="action" type="woltlab_varchar_nullable" minOccurs="0" />
+                       <xs:element name="permissions" type="woltlab_varchar_nullable" minOccurs="0" />
+                       <xs:element name="ignoreZeroTime" type="woltlab_boolean" minOccurs="0" />
+                       <xs:element name="priority" type="woltlab_varchar_nullable" minOccurs="0" />
+                       <xs:element name="changeFreq" type="woltlab_varchar_nullable" minOccurs="0" />
+                       <xs:element name="rebuildTime" type="woltlab_varchar_nullable" minOccurs="0" />
+                       <xs:element name="icon" type="woltlab_varchar_nullable" minOccurs="0" />
+
                </xs:all>
        </xs:complexType>
        
        <!-- delete element type -->
        <xs:complexType name="type_delete">
-               <xs:attribute name="name" type="woltlab_varchar" use="required" />
                <xs:all>
                        <xs:element name="name" type="woltlab_varchar_nullable" minOccurs="0" />
                        <xs:element name="definitionname" type="woltlab_varchar_nullable" minOccurs="0" />
                </xs:all>
+               <xs:attribute name="name" type="woltlab_varchar" use="required" />
        </xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>

diff --git a/XSD/option.xsd b/XSD/option.xsd
index 94067e031aa0db9aec4bc8b5ef486f98b42334ac..4b4d26d658e132c11cfec29de68dea45d7786eef 100644 (file)
--- a/XSD/option.xsd
+++ b/XSD/option.xsd
@@ -74,6 +74,9 @@
                                        <xs:element name="maxvalue" type="xs:int" minOccurs="0" />
                                        <xs:element name="minlength" type="xs:int" minOccurs="0" />
                                        <xs:element name="maxlength" type="xs:int" minOccurs="0" />
+                                       <xs:element name="allowemptyvalue" type="woltlab_boolean" minOccurs="0" />
+                                       <xs:element name="disableAutocomplete" type="woltlab_boolean" minOccurs="0" />
+                                       <xs:element name="issortable" type="woltlab_boolean" minOccurs="0" />
                                </xs:all>
                        </xs:extension>
                </xs:complexContent>

diff --git a/XSD/packageUpdateServer.xsd b/XSD/packageUpdateServer.xsd
index e5b47e54f1708dd11b0798a8063072257f4f8996..0bd25aac2a3918f2bc0fa5bb1237a6b1b1074809 100644 (file)
--- a/XSD/packageUpdateServer.xsd
+++ b/XSD/packageUpdateServer.xsd
@@ -83,9 +83,8 @@
                        <xs:sequence>
                                <xs:element minOccurs="0" ref="fromversions" />
                                <xs:element minOccurs="0" ref="requiredpackages" />
-                               <xs:element ref="updatetype" />
                                <xs:element ref="timestamp" />
-                               <xs:element ref="versiontype" />
+                               <xs:element name="versiontype" type="woltlab_varchar" />
                                <xs:element ref="license" />
                        </xs:sequence>
                        <xs:attribute name="name" use="required" />

diff --git a/XSD/userGroupOption.xsd b/XSD/userGroupOption.xsd
index 57b2e8b2891d2713e1399ad75a39b4c95f1211dc..1fc6cd649f421185bf0e08b725e333238c0397c3 100644 (file)
--- a/XSD/userGroupOption.xsd
+++ b/XSD/userGroupOption.xsd
@@ -71,9 +71,11 @@
                                        <xs:element name="usersonly" type="woltlab_boolean" minOccurs="0" />
                                        <xs:element name="wildcard" type="woltlab_varchar_nullable" minOccurs="0" />
                                        <xs:element name="minvalue" type="xs:unsignedInt" minOccurs="0" />
+                                       <xs:element name="maxvalue" type="xs:unsignedInt" minOccurs="0" />
                                        <xs:element name="excludedInTinyBuild" type="woltlab_boolean" minOccurs="0" />
+                                       <xs:element name="suffix" type="woltlab_varchar" minOccurs="0" />
                                </xs:all>
                        </xs:extension>
                </xs:complexContent>
        </xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>

diff --git a/XSD/userMenu.xsd b/XSD/userMenu.xsd
index 30bf104066bab7ec6c8c88f4c2f14f0d95477b27..7b442f7bf54ecebb25b41e032085b32e9cdb54cc 100644 (file)
--- a/XSD/userMenu.xsd
+++ b/XSD/userMenu.xsd
@@ -34,7 +34,11 @@
        </xs:complexType>
        
        <xs:complexType name="usermenuitem_icon">
-               <xs:attribute name="solid" type="xs:boolean" />
+               <xs:simpleContent>
+                       <xs:extension base="woltlab_varchar">
+                               <xs:attribute name="solid" type="xs:boolean" />
+                       </xs:extension>
+               </xs:simpleContent>
        </xs:complexType>
 
        <!-- imported/updated page menu item element -->
@@ -53,4 +57,4 @@
                        </xs:extension>
                </xs:complexContent>
        </xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>

diff --git a/XSD/userOption.xsd b/XSD/userOption.xsd
index 846001059fd59f42dc246d2a293c2e56cb71bf3b..4e805d33ff32c8e82cb8fb4b8b9e0c1292bf4dd1 100644 (file)
--- a/XSD/userOption.xsd
+++ b/XSD/userOption.xsd
@@ -88,6 +88,8 @@
                                        <xs:element name="options" type="xs:string" minOccurs="0" />
                                        <xs:element name="permissions" type="xs:string" minOccurs="0" />
                                        <xs:element name="isdisabled" type="woltlab_boolean" minOccurs="0" />
+                                       <xs:element name="messageObjectType" type="woltlab_varchar" minOccurs="0" />
+                                       <xs:element name="contentpattern" type="xs:string" minOccurs="0" />
                                </xs:all>
                        </xs:extension>
                </xs:complexContent>