From 6adc21b3b8fbe605782b5c5165b0565764b50ef0 Mon Sep 17 00:00:00 2001
From: Dario <dario.rekowski@gmx.de>
Date: Wed, 9 Dec 2020 18:57:33 +0100
Subject: [PATCH] new try (see last messages)

---
 src/cpsp/login.cpsp           | 6 +++---
 src/cpsp/userUpdateGroup.cpsp | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/cpsp/login.cpsp b/src/cpsp/login.cpsp
index 379cee7dc..24f744592 100644
--- a/src/cpsp/login.cpsp
+++ b/src/cpsp/login.cpsp
@@ -178,9 +178,9 @@
 		sm->deleteLoginCookies(request, response);
 	}
 	
-	std::string form_action_url = ServerConfig::g_serverPath;
+	std::string form_action_url = ServerConfig::g_serverPath + "/";
 	if(mSession && !mSession->getNewUser().isNull()) {
-		form_action_url = "https://" + mSession->getNewUser()->getGroupBaseUrl();
+		form_action_url = "https://" + mSession->getNewUser()->getGroupBaseUrl() + "/";
 	} else {
 	// TODO: find maybe a better way, especially together with language changer
 		form_action_url = "";
@@ -192,7 +192,7 @@
 <div class="center-form-container">
     <%@ include file="flags.cpsp" %>
     <div class="center-form-form">
-		<form action="<%= form_action_url %>/" method="POST">
+		<form action="<%= form_action_url %>" method="POST">
 			<input class="form-control" type="text" name="login-email" placeholder="<%= langCatalog->gettext("E-Mail") %>" value="<%= presetEmail %>"/>
 			<input class="form-control" type="password" name="login-password" placeholder="<%= langCatalog->gettext("Password") %>" />
 		    <button type="submit" name="submit" class="center-form-submit form-button"><%= langCatalog->gettext(" Login ") %></button>
diff --git a/src/cpsp/userUpdateGroup.cpsp b/src/cpsp/userUpdateGroup.cpsp
index 2c204fdc6..2d7e27b39 100644
--- a/src/cpsp/userUpdateGroup.cpsp
+++ b/src/cpsp/userUpdateGroup.cpsp
@@ -26,7 +26,7 @@ enum PageState {
 	PageState state = PAGE_STATE_OVERVIEW;
 	
 	auto groups = controller::Group::listAll();
-	
+	Poco::AutoPtr<controller::Group> choosen_group;
 
 	if(!form.empty()) {
 		auto group_id_string = form.get("group_id", "");
@@ -36,7 +36,7 @@ enum PageState {
 			int group_id = 0;
 			if(DataTypeConverter::NUMBER_PARSE_OKAY == DataTypeConverter::strToInt(group_id_string, group_id)) {
 				std::string group_alias = "";
-				Poco::AutoPtr<controller::Group> choosen_group;
+				
 				for(auto it = groups.begin(); it != groups.end(); it++) {
 					auto group_model = (*it)->getModel();
 					if(group_model->getID() == group_id) {
@@ -82,8 +82,9 @@ enum PageState {
 				// should be only one
 				Poco::AutoPtr<model::gradido::Transaction> transaction = tasks[0].cast<model::gradido::Transaction>();
 				if(transaction->getSignCount() == 0) {
+					
 					pt->unlock();
-					response.redirect(ServerConfig::g_serverPath + "/checkTransactions");
+					response.redirect("https://" + choosen_group->getModel()->getUrl() + "account/checkTransactions");
 					return;
 				}
 			} else if(referer_was_checkTransaction && user->getModel()->getGroupId()) {