From a80d7db423ac782816fb66027a82ad44836fc572 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 1 Mar 2024 15:02:47 +0100
Subject: [PATCH] Fix multiple issues in XSD files

Closes #5809
---
 XSD/acpMenu.xsd             |  8 ++++++--
 XSD/bbcode.xsd              | 10 +++++++---
 XSD/cronjob.xsd             | 40 ++++++++++++++++++++-----------------
 XSD/language.xsd            | 20 +++++++++++--------
 XSD/objectType.xsd          | 26 ++++++++++++++++++++++--
 XSD/option.xsd              |  3 +++
 XSD/packageUpdateServer.xsd |  3 +--
 XSD/userGroupOption.xsd     |  4 +++-
 XSD/userMenu.xsd            |  8 ++++++--
 XSD/userOption.xsd          |  2 ++
 10 files changed, 86 insertions(+), 38 deletions(-)

diff --git a/XSD/acpMenu.xsd b/XSD/acpMenu.xsd
index efcc4cea79..da96c7b1de 100644
--- 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 a6e1015f93..724730dd5c 100644
--- 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 6bc26a4279..62cbe75737 100644
--- 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 9c5e933f88..77955ad9d3 100644
--- 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 ac28411505..9daa1e07d6 100644
--- 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 94067e031a..4b4d26d658 100644
--- 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 e5b47e54f1..0bd25aac2a 100644
--- 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 57b2e8b289..1fc6cd649f 100644
--- 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 30bf104066..7b442f7bf5 100644
--- 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 846001059f..4e805d33ff 100644
--- 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>
-- 
2.20.1