From 8b9614cb0031a42cbeabc938f26f557c9e482171 Mon Sep 17 00:00:00 2001
From: Dario <dario.rekowski@gmx.de>
Date: Wed, 22 Apr 2020 15:40:40 +0200
Subject: [PATCH] finish format of email in admin user password reset

---
 src/cpp/HTTPInterface/AdminUserPasswordReset.cpp | 10 +++++++---
 src/cpp/controller/User.cpp                      |  2 +-
 src/cpp/controller/UserBackups.cpp               | 16 ++++++++++++++++
 src/cpp/controller/UserBackups.h                 |  3 +++
 src/cpsp/adminUserPasswordReset.cpsp             |  5 +++--
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/cpp/HTTPInterface/AdminUserPasswordReset.cpp b/src/cpp/HTTPInterface/AdminUserPasswordReset.cpp
index 76ef8d509..eaa224e4d 100644
--- a/src/cpp/HTTPInterface/AdminUserPasswordReset.cpp
+++ b/src/cpp/HTTPInterface/AdminUserPasswordReset.cpp
@@ -235,18 +235,22 @@ void AdminUserPasswordReset::handleRequest(Poco::Net::HTTPServerRequest& request
 	responseStream << "Bitte schreibe sie dir auf und packe sie gut weg.\n";
 	responseStream << "\n";
 #line 105 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp"
-	responseStream << ( userBackup->getPassphrase(ServerConfig::Mnemonic_Types::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER) );
+	responseStream << ( controller::UserBackups::formatPassphrase(userBackup->getPassphrase(ServerConfig::Mnemonic_Types::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER)) );
+	responseStream << "\n";
+	responseStream << " \n";
 	responseStream << "\n";
 	responseStream << "Unter diesem Link kannst du dir mit hilfe der Passphrase ein neues Passwort setzen:\n";
-#line 109 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp"
+#line 110 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp"
 	responseStream << ( code->getLink() );
 	responseStream << "\n";
+	responseStream << " \n";
+	responseStream << "\n";
 	responseStream << "Liebe Grüße\n";
 	responseStream << "Dario, Softwareentwickler bei Gradido\n";
 	responseStream << "</pre>\n";
 	responseStream << "\t\t</fieldset>\n";
 	responseStream << "\t";
-#line 116 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp"
+#line 117 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminUserPasswordReset.cpsp"
  } 	responseStream << "\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
diff --git a/src/cpp/controller/User.cpp b/src/cpp/controller/User.cpp
index 3a8617136..0a9473d9d 100644
--- a/src/cpp/controller/User.cpp
+++ b/src/cpp/controller/User.cpp
@@ -96,7 +96,7 @@ namespace controller {
 	{
 		std::stringstream ss;
 		auto model = getModel();
-		ss << model->getFirstName() << " " << model->getLastName() << "<" << model->getEmail() << ">";
+		ss << model->getFirstName() << " " << model->getLastName() << "&lt;" << model->getEmail() << "&gt;";
 		return ss.str();
 	}
 
diff --git a/src/cpp/controller/UserBackups.cpp b/src/cpp/controller/UserBackups.cpp
index 0d9a408a1..1680e8594 100644
--- a/src/cpp/controller/UserBackups.cpp
+++ b/src/cpp/controller/UserBackups.cpp
@@ -84,4 +84,20 @@ namespace controller {
 		}
 	}
 
+	std::string UserBackups::formatPassphrase(std::string passphrase, int targetLinesCount/* = 5*/) 
+	{
+		int count = passphrase.size();
+		int charPerLine = count / (targetLinesCount);
+		int cursor = 0;
+		for (int i = 1; i < targetLinesCount; i++) {
+			cursor = charPerLine * i;
+			while (cursor < count && passphrase.at(cursor) != ' ') {
+				cursor++;
+			}
+			if (cursor >= (count-2)) break;
+			passphrase.replace(cursor, 1, 1, '\n');
+		}
+		return passphrase;
+	}
+
 }
\ No newline at end of file
diff --git a/src/cpp/controller/UserBackups.h b/src/cpp/controller/UserBackups.h
index 780207a9d..d54e9f7d5 100644
--- a/src/cpp/controller/UserBackups.h
+++ b/src/cpp/controller/UserBackups.h
@@ -25,6 +25,9 @@ namespace controller {
 
 		//! \return create keyPair from passphrase if not exist, else return existing pointer
 		Poco::SharedPtr<KeyPair> getKeyPair();
+		//! \brief adding newlines to make block format
+		static std::string formatPassphrase(std::string passphrase, int targetLinesCount = 5);
+
 		std::string getPassphrase(ServerConfig::Mnemonic_Types type);
 
 	protected:
diff --git a/src/cpsp/adminUserPasswordReset.cpsp b/src/cpsp/adminUserPasswordReset.cpsp
index d1ab17ab6..80808c89e 100644
--- a/src/cpsp/adminUserPasswordReset.cpsp
+++ b/src/cpsp/adminUserPasswordReset.cpsp
@@ -102,12 +102,13 @@ enum PageState
 hier findst du deine Passphrase mit dessen Hilfe du dir ein neues Passwort einstellen kannst.
 Bitte schreibe sie dir auf und packe sie gut weg.
 
-<%= userBackup->getPassphrase(ServerConfig::Mnemonic_Types::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER) %>
+<%= controller::UserBackups::formatPassphrase(userBackup->getPassphrase(ServerConfig::Mnemonic_Types::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER)) %>
+ 
 
 
 Unter diesem Link kannst du dir mit hilfe der Passphrase ein neues Passwort setzen:
 <%= code->getLink() %>
-
+ 
 
 Liebe Grüße
 Dario, Softwareentwickler bei Gradido