1 files changed, 19 insertions, 4 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/FormSerializer.cpp b/Swiften/Serializer/PayloadSerializers/FormSerializer.cpp
index 7a6bb79..15c4f32 100644
--- a/Swiften/Serializer/PayloadSerializers/FormSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/FormSerializer.cpp
@@ -46,24 +46,39 @@ std::string FormSerializer::serializePayload(boost::shared_ptr<Form> form)  cons
 	}
 	formElement->setAttribute("type", type);
 	if (!form->getTitle().empty()) {
 		multiLineify(form->getTitle(), "title", formElement);
 	}
 	if (!form->getInstructions().empty()) {
 		multiLineify(form->getInstructions(), "instructions", formElement);
 	}
 	foreach(boost::shared_ptr<FormField> field, form->getFields()) {
-		formElement->addNode(fieldToXML(field));
+		formElement->addNode(fieldToXML(field, true));
 	}
+	if (!form->getReportedFields().empty()) {
+		boost::shared_ptr<XMLElement> reportedElement(new XMLElement("reported"));
+		foreach(FormField::ref field, form->getReportedFields()) {
+			reportedElement->addNode(fieldToXML(field, true));
+		}
+		formElement->addNode(reportedElement);
+	}
+	foreach(Form::FormItem item, form->getItems()) {
+		boost::shared_ptr<XMLElement> itemElement(new XMLElement("item"));
+		foreach(FormField::ref field, item) {
+			itemElement->addNode(fieldToXML(field, false));
+		}
+		formElement->addNode(itemElement);
+	}
+
 	return formElement->serialize();
 }
 
-boost::shared_ptr<XMLElement> FormSerializer::fieldToXML(boost::shared_ptr<FormField> field) const {
+boost::shared_ptr<XMLElement> FormSerializer::fieldToXML(boost::shared_ptr<FormField> field, bool withTypeAttribute) const {
 	boost::shared_ptr<XMLElement> fieldElement(new XMLElement("field"));
 	if (!field->getName().empty()) {
 		fieldElement->setAttribute("var", field->getName());
 	}
 	if (!field->getLabel().empty()) {
 		fieldElement->setAttribute("label", field->getLabel());
 	}
 	if (field->getRequired()) {
 		fieldElement->addNode(boost::shared_ptr<XMLElement>(new XMLElement("required")));
@@ -109,37 +124,37 @@ boost::shared_ptr<XMLElement> FormSerializer::fieldToXML(boost::shared_ptr<FormF
 			boost::shared_ptr<XMLElement> valueElement(new XMLElement("value"));
 			valueElement->addNode(XMLTextNode::create(jid.toString()));
 			fieldElement->addNode(valueElement);
 		}
 	}
 	else if (boost::dynamic_pointer_cast<JIDSingleFormField>(field)) {
 		fieldType = "jid-single";
 		boost::shared_ptr<XMLElement> valueElement(new XMLElement("value"));
 		valueElement->addNode(XMLTextNode::create(boost::dynamic_pointer_cast<JIDSingleFormField>(field)->getValue().toString()));
-		fieldElement->addNode(valueElement);
+		if ( boost::dynamic_pointer_cast<JIDSingleFormField>(field)->getValue().isValid()) fieldElement->addNode(valueElement);
 	}
 	else if (boost::dynamic_pointer_cast<ListMultiFormField>(field)) {
 		fieldType = "list-multi";
 		std::vector<std::string> lines = boost::dynamic_pointer_cast<ListMultiFormField>(field)->getValue();
 		foreach(const std::string& line, lines) {
 			boost::shared_ptr<XMLElement> valueElement(new XMLElement("value"));
 			valueElement->addNode(XMLTextNode::create(line));
 			fieldElement->addNode(valueElement);
 		}
 	}
 	else if (boost::dynamic_pointer_cast<TextMultiFormField>(field)) {
 		fieldType = "text-multi";
 		multiLineify(boost::dynamic_pointer_cast<TextMultiFormField>(field)->getValue(), "value", fieldElement);
 	}
 	else {
 		assert(false);
 	}
-	if (!fieldType.empty()) {
+	if (!fieldType.empty() && withTypeAttribute) {
 		fieldElement->setAttribute("type", fieldType);
 	}
 
 	foreach (const FormField::Option& option, field->getOptions()) {
 		boost::shared_ptr<XMLElement> optionElement(new XMLElement("option"));
 		if (!option.label.empty()) {
 			optionElement->setAttribute("label", option.label);
 		}