1 files changed, 25 insertions, 3 deletions
diff --git a/Swiften/Elements/Form.cpp b/Swiften/Elements/Form.cpp
index cf9ecf6..4915e2a 100644
--- a/Swiften/Elements/Form.cpp
+++ b/Swiften/Elements/Form.cpp
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -12,6 +12,8 @@ namespace Swift {
 std::string Form::getFormType() const {
 	FormField::ref field = getField("FORM_TYPE");
-	boost::shared_ptr<HiddenFormField> f = boost::dynamic_pointer_cast<HiddenFormField>(field);
-	return (f ? f->getValue() : "");
+	if (field && field->getType() == FormField::HiddenType) {
+		return field->getValues().empty() ? "" : field->getValues()[0];
+	}
+	return "";
 }
 
@@ -41,3 +43,23 @@ const std::vector<Form::FormItem>& Form::getItems() const {
 }
 
+void Form::clearEmptyTextFields() {
+	std::vector<FormField::ref> populatedFields;
+	foreach (FormField::ref field, fields_) {
+		if (field->getType() == FormField::TextSingleType) {
+			if (!field->getTextSingleValue().empty()) {
+				populatedFields.push_back(field);
+			}
+		}
+		else if (field->getType() == FormField::TextMultiType) {
+			if (!field->getTextMultiValue().empty()) {
+				populatedFields.push_back(field);
+			}
+		}
+		else {
+			populatedFields.push_back(field);
+		}
+	}
+	fields_ = populatedFields;
+}
+
 }