IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

update error

Browse Source
This commit is contained in:
Dario 2019-12-02 16:24:27 +01:00
parent edf2b1bdbe
commit 5fba92eb2d
4 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -117,6 +117,15 @@ else(WIN32)
target_link_libraries(Gradido_LoginServer libmariadb PocoNet PocoUtil PocoJSON PocoFoundation PocoData PocoNetSSL protoc protobuf -pthread) target_link_libraries(Gradido_LoginServer libmariadb PocoNet PocoUtil PocoJSON PocoFoundation PocoData PocoNetSSL protoc protobuf -pthread)
endif(WIN32) endif(WIN32)
# install
if(UNIX)
install(TARGETS Gradido_LoginServer /usr/local/bin)
install(DIRECTORY src/LOCALE DESTINATION /etc/grd_login/
FILES_MATCHING PATTERN "*.po(t)")
endif(UNIX)
enable_testing() enable_testing()
# ---------------------- Test ----------------------------------------- # ---------------------- Test -----------------------------------------

43
src/cpp/HTTPInterface/Error500Page.cpp
View File

@ -9,7 +9,7 @@
#include <Poco/Net/HTTPResponse.h> #include <Poco/Net/HTTPResponse.h>
#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
#include "../ServerConfig.h" #include "../ServerConfig.h"
@ -40,20 +40,20 @@ void Error500Page::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
if(mSession) { if(mSession) {
auto user = mSession->getUser(); auto user = mSession->getUser();
} }
// begin include header.cpsp // begin include header_old.cpsp
responseStream << "\n"; responseStream << "\n";
responseStream << "<!DOCTYPE html>\n"; responseStream << "<!DOCTYPE html>\n";
responseStream << "<html>\n"; responseStream << "<html>\n";
responseStream << "<head>\n"; responseStream << "<head>\n";
responseStream << "<meta charset=\"UTF-8\">\n"; responseStream << "<meta charset=\"UTF-8\">\n";
responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n"; responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n";
responseStream << "<title>Gradido Login Server: "; responseStream << "<title>Gradido Login Server: ";
#line 9 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 9 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
responseStream << ( pageName ); responseStream << ( pageName );
responseStream << "</title>\n"; responseStream << "</title>\n";
responseStream << "<!--<link rel=\"stylesheet\" type=\"text/css\" href=\"css/styles.min.css\">-->\n"; responseStream << "<!--<link rel=\"stylesheet\" type=\"text/css\" href=\"css/styles.min.css\">-->\n";
responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\""; responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
#line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "/css/styles.css\">\n"; responseStream << "/css/styles.css\">\n";
responseStream << "<style type=\"text/css\" >\n"; responseStream << "<style type=\"text/css\" >\n";
@ -97,43 +97,54 @@ void Error500Page::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
responseStream << "<body>\n"; responseStream << "<body>\n";
responseStream << "<div class=\"versionstring dev-info\">\n"; responseStream << "<div class=\"versionstring dev-info\">\n";
responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n"; responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n";
responseStream << "\t<p class=\"grd_small\">Alpha 0.6.0</p>\n"; responseStream << "\t<p class=\"grd_small\">Alpha 0.8.1</p>\n";
responseStream << "</div>\n"; responseStream << "</div>\n";
responseStream << "<!--<nav class=\"grd-left-bar expanded\" data-topbar role=\"navigation\">\n"; responseStream << "<!--<nav class=\"grd-left-bar expanded\" data-topbar role=\"navigation\">\n";
responseStream << "\t<div class=\"grd-left-bar-section\">\n"; responseStream << "\t<div class=\"grd-left-bar-section\">\n";
responseStream << "\t\t<ul class=\"grd-no-style\">\n"; responseStream << "\t\t<ul class=\"grd-no-style\">\n";
responseStream << "\t\t <li><a href=\""; responseStream << "\t\t <li><a href=\"";
#line 58 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 58 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n"; responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n";
responseStream << "\t\t <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n"; responseStream << "\t\t <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n";
responseStream << "\t\t</ul>\n"; responseStream << "\t\t</ul>\n";
responseStream << "\t</div>\n"; responseStream << "\t</div>\n";
responseStream << "</nav>-->"; responseStream << "</nav>-->";
// end include header.cpsp // end include header_old.cpsp
responseStream << "\n"; responseStream << "\n";
responseStream << "\t<h1>Ein Fehler auf dem Server trat ein, der Admin bekam eine E-Mail.</h1>\n"; responseStream << "<div class=\"grd_container\">\n";
responseStream << "\t<h2>Ein Fehler auf dem Server trat ein, der Admin bekam eine E-Mail.</h2>\n";
responseStream << "\t"; responseStream << "\t";
#line 19 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\Error500.cpsp" #line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\Error500.cpsp"
if(mSession) { responseStream << "\n"; if(mSession) { responseStream << "\n";
responseStream << "\t\t"; responseStream << "\t\t";
#line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\Error500.cpsp" #line 21 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\Error500.cpsp"
responseStream << ( mSession->getErrorsHtml() ); responseStream << ( mSession->getErrorsHtml() );
responseStream << "\n"; responseStream << "\n";
responseStream << "\t"; responseStream << "\t";
#line 21 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\Error500.cpsp" #line 22 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\Error500.cpsp"
} responseStream << "\n"; } responseStream << "\n";
responseStream << "\t"; responseStream << "\t";
#line 22 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\Error500.cpsp" #line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\Error500.cpsp"
if(!user.isNull()) { responseStream << "\n"; if(!user.isNull()) { responseStream << "\n";
responseStream << "\t\t"; responseStream << "\t\t";
#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\Error500.cpsp" #line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\Error500.cpsp"
responseStream << ( user->getErrorsHtml() ); responseStream << ( user->getErrorsHtml() );
responseStream << " \n"; responseStream << " \n";
responseStream << "\t"; responseStream << "\t";
#line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\Error500.cpsp" #line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\Error500.cpsp"
} responseStream << "\n"; } responseStream << "\n";
responseStream << "</div>\n";
// begin include footer.cpsp
responseStream << "\t<div class=\"grd-time-used dev-info\">\n";
responseStream << "\t\t\t";
#line 2 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
responseStream << ( mTimeProfiler.string() );
responseStream << "\n";
responseStream << "\t</div>\n";
responseStream << "</body>\n"; responseStream << "</body>\n";
responseStream << "</html>\n"; responseStream << "</html>";
// end include footer.cpsp
responseStream << "\n";
if (_compressResponse) _gzipStream.close(); if (_compressResponse) _gzipStream.close();
} }

1
src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp
View File

@ -95,6 +95,7 @@ Poco::Net::HTTPRequestHandler* PageRequestHandlerFactory::createRequestHandler(c
if (s) { if (s) {
auto user = s->getUser(); auto user = s->getUser();
if (s->errorCount() || (!user.isNull() && user->errorCount())) { if (s->errorCount() || (!user.isNull() && user->errorCount())) {
user->sendErrorsAsEmail();
auto pageRequestHandler = new Error500Page(s); auto pageRequestHandler = new Error500Page(s);
pageRequestHandler->setProfiler(timeUsed); pageRequestHandler->setProfiler(timeUsed);
return pageRequestHandler; return pageRequestHandler;

9
src/cpsp/Error500.cpsp
View File

@ -14,13 +14,14 @@
if(mSession) { if(mSession) {
auto user = mSession->getUser(); auto user = mSession->getUser();
} }
%><%@ include file="header.cpsp" %> %><%@ include file="header_old.cpsp" %>
<h1>Ein Fehler auf dem Server trat ein, der Admin bekam eine E-Mail.</h1> <div class="grd_container">
<h2>Ein Fehler auf dem Server trat ein, der Admin bekam eine E-Mail.</h2>
<% if(mSession) { %> <% if(mSession) { %>
<%= mSession->getErrorsHtml() %> <%= mSession->getErrorsHtml() %>
<% } %> <% } %>
<% if(!user.isNull()) {%> <% if(!user.isNull()) {%>
<%= user->getErrorsHtml() %> <%= user->getErrorsHtml() %>
<% } %> <% } %>
</body> </div>
</html> <%@ include file="footer.cpsp" %>