1 files changed, 13 insertions, 4 deletions
diff --git a/Swiften/Base/DateTime.cpp b/Swiften/Base/DateTime.cpp
index 1120938..fae26d4 100644
--- a/Swiften/Base/DateTime.cpp
+++ b/Swiften/Base/DateTime.cpp
@@ -7,19 +7,28 @@
 #include <Swiften/Base/DateTime.h>
 
 #include <locale>
-
 #include <boost/date_time/time_facet.hpp>
+#include <boost/date_time/local_time/local_time.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
+#include <Swiften/Base/String.h>
+
 namespace Swift {
 
 boost::posix_time::ptime stringToDateTime(const std::string& string) {
-	static std::locale locale(std::locale::classic(), new boost::posix_time::time_input_facet("%Y-%m-%d %H:%M:%S%F%Q"));
+	static std::locale locale(std::locale::classic(), new boost::local_time::local_time_input_facet("%Y-%m-%d %H:%M:%S%F%ZP"));
 	std::istringstream stream(string); 
 	stream.imbue(locale);
-	boost::posix_time::ptime result(boost::posix_time::not_a_date_time);
+	boost::local_time::local_date_time result(boost::date_time::not_a_date_time);
 	stream >> result;
-	return result;
+	return result.utc_time();
+}
+
+std::string dateTimeToString(const boost::posix_time::ptime& time) {
+	std::string stampString = std::string(boost::posix_time::to_iso_extended_string(time));
+	String::replaceAll(stampString, ',', ".");
+	stampString += "Z";
+	return stampString;
 }
 
 }