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
@@ -20,148 +20,163 @@ using namespace Swift;
 
 namespace {
 	template<typename T> void serializeValueAsString(boost::shared_ptr<FormField> field, boost::shared_ptr<XMLElement> parent) {
 		std::string value = boost::dynamic_pointer_cast<T>(field)->getValue();
 		if (!value.empty()) {
 			boost::shared_ptr<XMLElement> valueElement(new XMLElement("value"));
 			valueElement->addNode(XMLTextNode::create(value));
 			parent->addNode(valueElement);
 		}
 	}
 }
 
 
 namespace Swift {
 
 FormSerializer::FormSerializer() : GenericPayloadSerializer<Form>() {
 }
 
 std::string FormSerializer::serializePayload(boost::shared_ptr<Form> form)  const {
 	boost::shared_ptr<XMLElement> formElement(new XMLElement("x", "jabber:x:data"));
 	std::string type;
 	switch (form->getType()) {
 		case Form::FormType: type = "form"; break;
 		case Form::SubmitType: type = "submit"; break;
 		case Form::CancelType: type = "cancel"; break;
 		case Form::ResultType: type = "result"; break;
 	}
 	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")));
 	}
 	if (!field->getDescription().empty()) {
 		boost::shared_ptr<XMLElement> descriptionElement(new XMLElement("desc"));
 		descriptionElement->addNode(boost::shared_ptr<XMLTextNode>(new XMLTextNode(field->getDescription())));
 		fieldElement->addNode(descriptionElement);
 	}
 
 	// Set the value and type
 	std::string fieldType;
 	if (boost::dynamic_pointer_cast<BooleanFormField>(field)) {
 		fieldType = "boolean";
 		boost::shared_ptr<XMLElement> valueElement(new XMLElement("value"));
 		valueElement->addNode(XMLTextNode::create(boost::dynamic_pointer_cast<BooleanFormField>(field)->getValue() ? "1" : "0"));
 		fieldElement->addNode(valueElement);
 	}
 	else if (boost::dynamic_pointer_cast<FixedFormField>(field)) {
 		fieldType = "fixed";
 		serializeValueAsString<FixedFormField>(field, fieldElement);
 	}
 	else if (boost::dynamic_pointer_cast<HiddenFormField>(field)) {
 		fieldType = "hidden";
 		serializeValueAsString<HiddenFormField>(field, fieldElement);
 	}
 	else if (boost::dynamic_pointer_cast<ListSingleFormField>(field)) {
 		fieldType = "list-single";
 		serializeValueAsString<ListSingleFormField>(field, fieldElement);
 	}
 	else if (boost::dynamic_pointer_cast<TextPrivateFormField>(field)) {
 		fieldType = "text-private";
 		serializeValueAsString<TextPrivateFormField>(field, fieldElement);
 	}
 	else if (boost::dynamic_pointer_cast<TextSingleFormField>(field)) {
 		fieldType = "text-single";
 		serializeValueAsString<TextSingleFormField>(field, fieldElement);
 	}
 	else if (boost::dynamic_pointer_cast<JIDMultiFormField>(field)) {
 		fieldType = "jid-multi";
 		std::vector<JID> jids = boost::dynamic_pointer_cast<JIDMultiFormField>(field)->getValue();
 		foreach(const JID& jid, jids) {
 			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);
 		}
 
 		boost::shared_ptr<XMLElement> valueElement(new XMLElement("value"));
 		valueElement->addNode(XMLTextNode::create(option.value));
 		optionElement->addNode(valueElement);
 
 		fieldElement->addNode(optionElement);
 	}
 
 	return fieldElement;
 }
 
 void FormSerializer::multiLineify(const std::string& text, const std::string& elementName, boost::shared_ptr<XMLElement> element) const {
 	std::string unRdText(text);
 	erase(unRdText, '\r');
 	std::vector<std::string> lines = String::split(unRdText, '\n');
 	foreach (std::string line, lines) {
 		boost::shared_ptr<XMLElement> lineElement(new XMLElement(elementName));
 		lineElement->addNode(boost::shared_ptr<XMLTextNode>(new XMLTextNode(line)));
 		element->addNode(lineElement);
 	}
 }
 
 }