Merge branch 'MyDomoticz' of /home/domoshare into MyDomoticz

Conflicts:
	webserver/proxyclient.cpp

Author: rkluwen

main/WebServer.cpp

@@ -6481,6 +6481,13 @@ namespace http {
 			m_sql.UpdatePreferencesVar("FloorplanActiveOpacity", atoi(m_pWebEm->FindValue("FloorplanActiveOpacity").c_str()));
 			m_sql.UpdatePreferencesVar("FloorplanInactiveOpacity", atoi(m_pWebEm->FindValue("FloorplanInactiveOpacity").c_str()));
 
+			std::string md_userid, md_password;
+			md_userid = m_pWebEm->FindValue("MyDomoticzUserId");
+			md_password = m_pWebEm->FindValue("MyDomoticzPassword");
+			m_sql.UpdatePreferencesVar("MyDomoticzUserId", md_userid);
+			md_password = base64_encode((const unsigned char *)md_password.c_str(), md_password.length());
+			m_sql.UpdatePreferencesVar("MyDomoticzPassword", md_password);
+
 			m_notifications.LoadConfig();
 
 			return (char*)m_retstr.c_str();
@@ -10602,6 +10609,16 @@ namespace http {
 				{
 					root["WebTheme"] = sValue;
 				}
+				else if (Key == "MyDomoticzInstanceId") {
+					root["MyDomoticzInstanceId"] = sValue;
+				}
+				else if (Key == "MyDomoticzUserId") {
+					root["MyDomoticzUserId"] = sValue;
+				}
+				else if (Key == "MyDomoticzPassword") {
+					std::string tmp = base64_decode(sValue);
+					root["MyDomoticzPassword"] = tmp;
+				}
 			}
 		}
 

main/WebServerHelper.cpp

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "WebServerHelper.h"
+#include "../main/SQLHelper.h"
 
 namespace http {
 	namespace server {
@@ -50,7 +51,8 @@ namespace http {
 
 #if 1
 			// RK: TODO
-			const int connections = 3;
+			//m_sql.UpdatePreferencesVar("MyDomoticzInstanceId", "");
+			const int connections = GetNrMyDomoticzThreads();
 			proxymanagerCollection.resize(connections);
 			for (int i = 0; i < connections; i++) {
 				proxymanagerCollection[i] = new CProxyManager(serverpath, plainServer_->m_pWebEm);
@@ -112,5 +114,18 @@ namespace http {
 				(*it)->ReloadCustomSwitchIcons();
 			 }
 		}
+
+		int CWebServerHelper::GetNrMyDomoticzThreads()
+		{
+			std::string instanceid;
+			int nrThreads = 3;
+			m_sql.GetPreferencesVar("MyDomoticzInstanceId", instanceid);
+			if (instanceid == "") {
+				return 1;
+			}
+			m_sql.GetPreferencesVar("MyDomoticzNrThreads", nrThreads);
+			return nrThreads;
+		}
 	}
+
 }

main/WebServerHelper.h

@@ -30,6 +30,7 @@ namespace http {
 
 			// RK: TODO
 			std::vector<CProxyManager*> proxymanagerCollection;
+			int GetNrMyDomoticzThreads();
 };
 
 	} // end namespace server