diff --git a/src/cpp/HTTPInterface/CheckEmailPage.cpp b/src/cpp/HTTPInterface/CheckEmailPage.cpp
index b140451c6..154417442 100644
--- a/src/cpp/HTTPInterface/CheckEmailPage.cpp
+++ b/src/cpp/HTTPInterface/CheckEmailPage.cpp
@@ -42,6 +42,7 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
auto lm = LanguageManager::getInstance();
auto em = EmailManager::getInstance();
+ auto user = mSession->getNewUser();
auto lang = chooseLanguage(request);
auto langCatalog = lm->getFreeCatalog(lang);
unsigned long long verificationCode = 0;
@@ -142,7 +143,7 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << " ";
// end include header.cpsp
responseStream << "\n";
-#line 68 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
+#line 69 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp"
responseStream << ( getErrorsHtml() );
responseStream << "\n";
responseStream << "\n";
diff --git a/src/cpp/HTTPInterface/UserUpdateGroupPage.cpp b/src/cpp/HTTPInterface/UserUpdateGroupPage.cpp
index e77304ae7..6f1fde683 100644
--- a/src/cpp/HTTPInterface/UserUpdateGroupPage.cpp
+++ b/src/cpp/HTTPInterface/UserUpdateGroupPage.cpp
@@ -95,7 +95,7 @@ void UserUpdateGroupPage::handleRequest(Poco::Net::HTTPServerRequest& request, P
Poco::AutoPtr transaction = tasks[0].cast();
if(transaction->getSignCount() == 0) {
pt->unlock();
- response.redirect(ServerConfig::g_serverPath + "/checkTransactions");
+ response.redirect(user->getGroupBaseUrl() + "/checkTransactions");
return;
}
}
diff --git a/src/cpp/SingletonManager/CronManager.cpp b/src/cpp/SingletonManager/CronManager.cpp
index 4e6082367..84af2dece 100644
--- a/src/cpp/SingletonManager/CronManager.cpp
+++ b/src/cpp/SingletonManager/CronManager.cpp
@@ -180,8 +180,9 @@ int PingServerTask::run()
if (model::table::NODE_SERVER_GRADIDO_COMMUNITY == mNodeServer->getModel()->getNodeServerType()) {
std::string url_port = mNodeServer->getModel()->getUrlWithPort();
//printf("%s [PingServerTask::run] call update for %s\n", Poco::DateTimeFormatter::format(current, "%d.%m.%y %H:%M:%S.%i").data(), url_port.data());
- auto json_request = mNodeServer->createJsonRequest();
- json_request.request("updateReadNode");
+
+ //auto json_request = mNodeServer->createJsonRequest();
+ //json_request.request("updateReadNode");
}
return 0;
}
\ No newline at end of file
diff --git a/src/cpp/SingletonManager/CronManager.h b/src/cpp/SingletonManager/CronManager.h
index ba6305d3c..e7ff73114 100644
--- a/src/cpp/SingletonManager/CronManager.h
+++ b/src/cpp/SingletonManager/CronManager.h
@@ -24,7 +24,7 @@ public:
static CronManager* getInstance();
- bool init(long defaultPeriodicIntervallMilliseconds = 60000);
+ bool init(long defaultPeriodicIntervallMilliseconds = 600000);
void stop();
void runUpdateStep(Poco::Timer& timer);
diff --git a/src/cpp/lib/DataTypeConverter.cpp b/src/cpp/lib/DataTypeConverter.cpp
index a0fe756b1..e83663551 100644
--- a/src/cpp/lib/DataTypeConverter.cpp
+++ b/src/cpp/lib/DataTypeConverter.cpp
@@ -31,7 +31,7 @@ namespace DataTypeConverter
return NUMBER_PARSE_LOGIC_ERROR;
}
}
-
+#ifdef __linux__
NumberParseState strToInt(const std::string& input, unsigned long long& result)
{
try {
@@ -54,7 +54,7 @@ namespace DataTypeConverter
return NUMBER_PARSE_LOGIC_ERROR;
}
}
-
+#endif
NumberParseState strToInt(const std::string& input, Poco::UInt64& result)
{
try {
diff --git a/src/cpp/lib/DataTypeConverter.h b/src/cpp/lib/DataTypeConverter.h
index f93c40d87..ede606666 100644
--- a/src/cpp/lib/DataTypeConverter.h
+++ b/src/cpp/lib/DataTypeConverter.h
@@ -26,7 +26,9 @@ namespace DataTypeConverter {
};
NumberParseState strToInt(const std::string& input, int& result);
+#ifdef __linux__
NumberParseState strToInt(const std::string& input, unsigned long long& result);
+#endif
NumberParseState strToInt(const std::string& input, Poco::UInt64& result);
NumberParseState strToDouble(const std::string& input, double& result);
diff --git a/src/cpsp/checkEmail.cpsp b/src/cpsp/checkEmail.cpsp
index f60b7e647..145815842 100644
--- a/src/cpsp/checkEmail.cpsp
+++ b/src/cpsp/checkEmail.cpsp
@@ -21,6 +21,7 @@ enum PageState
auto lm = LanguageManager::getInstance();
auto em = EmailManager::getInstance();
+ auto user = mSession->getNewUser();
auto lang = chooseLanguage(request);
auto langCatalog = lm->getFreeCatalog(lang);
unsigned long long verificationCode = 0;
@@ -75,7 +76,7 @@ enum PageState