Facebook: Improve login procedure (not finished) and fix getting login errors; version bump

git-svn-id: http://svn.miranda-ng.org/main/trunk@16275 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 5 insertions, 4 deletions

diff --git a/utils/std_string_utils.cpp b/utils/std_string_utils.cpp
index 35038977d9..a824ef87eb 100644
--- a/utils/std_string_utils.cpp
+++ b/utils/std_string_utils.cpp
@@ -428,12 +428,13 @@ std::string utils::text::source_get_value2(std::string* data, const char *term,
 	return ret;

 }

 

-std::string utils::text::source_get_form_data(std::string* data)

+std::string utils::text::source_get_form_data(std::string* data, boolean hiddenOnly)

 {

+	const char *search = hiddenOnly ? "<input type=\"hidden\"" : "<input";

 	std::string values;

 

 	std::string::size_type start = 0;

-	start = data->find("<input", start);

+	start = data->find(search, start);

 	while (start != std::string::npos) {

 		start++;

 		std::string attr, value;

@@ -461,7 +462,7 @@ std::string utils::text::source_get_form_data(std::string* data)
 				values += "&";

 			values += attr + "=" + value;

 		}

-		start = data->find("<input", start);

+		start = data->find(search, start);

 	}

 

 	return values;

diff --git a/utils/std_string_utils.h b/utils/std_string_utils.h
index 387d8f1fc6..4aec3cb574 100644
--- a/utils/std_string_utils.h
+++ b/utils/std_string_utils.h
@@ -72,7 +72,7 @@ namespace utils
 		std::string trim(const std::string &data, bool rtrim = false);

 		std::string source_get_value(std::string* data, unsigned int argument_count, ...);

 		std::string source_get_value2(std::string* data, const char *term, const char *endings, bool wholeString = false);

-		std::string source_get_form_data(std::string* data);

+		std::string source_get_form_data(std::string* data, boolean hiddenOnly = false);

 		std::string rand_string(int len, const char *chars = "0123456789" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz", unsigned int *number = NULL);

 		void explode(std::string str, const std::string &separator, std::vector<std::string>* results);

 		void append_ordinal(unsigned long value, std::string* data);