diff --git a/src/cpp/HTTPInterface/LoginPage.cpp b/src/cpp/HTTPInterface/LoginPage.cpp index a2a1a9701..d9e883214 100644 --- a/src/cpp/HTTPInterface/LoginPage.cpp +++ b/src/cpp/HTTPInterface/LoginPage.cpp @@ -168,18 +168,19 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: refererString = referer->second; } if(lastExternReferer != "") { - //printf("redirect to: %s\n", lastExternReferer.data()); + printf("redirect to: %s (last extern referer)\n", lastExternReferer.data()); response.redirect(lastExternReferer); } else if(refererString != "" && refererString.find("login") == std::string::npos && refererString.find("logout") == std::string::npos && refererString.find("user_delete") == std::string::npos && - refererString != ServerConfig::g_serverPath + request.getURI()) { + refererString != ServerConfig::g_serverPath + request.getURI() && + refererString != user->getGroupBaseUrl() + request.getURI()) { std::string uri = request.getURI(); printf("request uri: %s, redirect to: %s\n", uri.data(), refererString.data()); response.redirect(refererString); } else { - //printf("redirect to: %s\n", ServerConfig::g_php_serverPath.data()); + printf("redirect to: %s/\n", user->getGroupBaseUrl().data()); response.redirect(user->getGroupBaseUrl() + "/"); } return; @@ -258,11 +259,11 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: responseStream << " "; // end include header.cpsp responseStream << "\n"; -#line 170 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" +#line 171 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" responseStream << ( getErrorsHtml() ); responseStream << "\n"; responseStream << "\n"; responseStream << "
"; -#line 183 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" +#line 184 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" responseStream << ( langCatalog->gettext("You haven't any account yet? Please follow the link to create one.") ); responseStream << "
\n"; responseStream << "\t \n"; responseStream << "\t\t\t"; -#line 185 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" +#line 186 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" responseStream << ( langCatalog->gettext("Create New Account") ); responseStream << "\n"; responseStream << "\t\t \n"; responseStream << "\t