--- smsdaemon/Util.cpp	2008/12/12 13:57:10	183
+++ smsdaemon/Util.cpp	2008/12/18 06:53:29	196
@@ -146,6 +146,18 @@
 		return str;
 	}
 
+
+	vector<string>  str_split(string input)
+	{
+		string buf;
+		stringstream ss(input);
+		vector<string> tokens;
+		while (ss >> buf)
+			tokens.push_back(buf);
+		return tokens;
+	}
+
+
 	vector<string> str_split(string input, string delimiter)
 	{
 		vector<string> retval;
@@ -225,22 +237,28 @@
 		string rep;
 		rep.append(1,197);
 		str = str_replace(str, "&#197;", rep);
+		str = str_replace(str, "&Aring;", rep);
 
 		rep.at(0) = 198;
 		str = str_replace(str, "&#198;", rep);
+		str = str_replace(str, "&AElig;", rep);
 
 		rep.at(0) = 216;
 		str = str_replace(str, "&#216;", rep);
+		str = str_replace(str, "&Oslash;", rep);
 
 
 		rep.at(0) = 229;
 		str = str_replace(str, "&#229;", rep);
+		str = str_replace(str, "&aring;", rep);
 
 		rep.at(0) = 230;
 		str = str_replace(str, "&#230;", rep);
+		str = str_replace(str, "&aelig;", rep);
 
 		rep.at(0) = 248;
 		str = str_replace(str, "&#248;", rep);
+		str = str_replace(str, "&oslash;", rep);
 
 		return str;
 	}
@@ -248,7 +266,8 @@
 
 	string str_gsm2latin(string str)
 	{
-		for (unsigned i=0; i<str.size(); i++) {
+		for (unsigned i=0; i<str.size(); i++)
+		{
 			str.at(i) = char_def_alphabet_decode(str.at(i));
 		}
 		return str;
@@ -256,12 +275,14 @@
 
 	string str_latin2gsm(string str)
 	{
-		for (unsigned i=0; i<str.size(); i++) {
+		for (unsigned i=0; i<str.size(); i++)
+		{
 			str.at(i) = char_def_alphabet_encode(str.at(i));
 		}
 		return str;
 	}
 
+	/* deprecated, use HttpClient instead
 	string readUrl(string url, string tempfile)
 	{
 		char buf[128000];
@@ -296,7 +317,7 @@
 		unlink(tempfile.c_str());
 
 		return document;
-	}
+	}*/