paramat · Jan 13, 2018 · srifqi · Jan 13, 2018 · paramat · Jan 13, 2018
diff --git a/src/gui/guiConfirmRegistration.cpp b/src/gui/guiConfirmRegistration.cpp
@@ -0,0 +1,231 @@
+/*
+Minetest
+Copyright (C) 2018 srifqi, Muhammad Rifqi Priyo Susanto
+		<muhammadrifqipriyosusanto@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "guiConfirmRegistration.h"
+#include "client.h"
+#include <IGUICheckBox.h>
+#include <IGUIEditBox.h>
+#include <IGUIButton.h>
+#include <IGUIStaticText.h>
+#include <IGUIFont.h>
+
+#include "gettext.h"
+
+// Continuing from guiPasswordChange.cpp
+const int ID_confirmPassword = 262;
+const int ID_confirm = 263;
+const int ID_message = 264;
+const int ID_cancel = 265;
+
+GUIConfirmRegistration::GUIConfirmRegistration(gui::IGUIEnvironment *env,
+		gui::IGUIElement *parent, s32 id, IMenuManager *menumgr, Client *client,
+		const std::string &playername, const std::string &password,
+		const std::string &address, bool *aborted) :
+		GUIModalMenu(env, parent, id, menumgr),
+		m_client(client), m_playername(playername), m_password(password),
+		m_address(address), m_aborted(aborted)
+{
+}
+
+GUIConfirmRegistration::~GUIConfirmRegistration()
+{
+	removeChildren();
+}
+
+void GUIConfirmRegistration::removeChildren()
+{
+	const core::list<gui::IGUIElement *> &children = getChildren();
+	core::list<gui::IGUIElement *> children_copy;
+	for (gui::IGUIElement *i : children)
+		children_copy.push_back(i);
+	for (gui::IGUIElement *i : children_copy)
+		i->remove();
+}
+void GUIConfirmRegistration::regenerateGui(v2u32 screensize)
+{
+	acceptInput();
+	removeChildren();
+
+	/*
+		Calculate new sizes and positions
+	*/
+	core::rect<s32> rect(screensize.X / 2 - 600 / 2, screensize.Y / 2 - 300 / 2,
+			screensize.X / 2 + 600 / 2, screensize.Y / 2 + 300 / 2);
+
+	DesiredRect = rect;
+	recalculateAbsolutePosition(false);
+
+	v2s32 size = rect.getSize();
+	v2s32 topleft_client(0, 0);
+
+	const wchar_t *text;
+
+	/*
+		Add stuff
+	*/
+	s32 ypos = 30;
+	{
+		std::string address = m_address;
+		if (address.empty())
+			address = "localhost";
+		core::rect<s32> rect(0, 0, 540, 90);
+		rect += topleft_client + v2s32(30, ypos);
+		static const std::string info_text_template = strgettext(
+				"You are about to join this server (%1$s) with the "
+				"name \"%2$s\" the first time. If you proceed, a "
+				"new account using your credentials will be created "
+				"on this server.\n"
+				"Please type your password once again to confirm "
+				"account creation or cancel to abort.");
+		char info_text_buf[1024];
+		snprintf(info_text_buf, sizeof(info_text_buf), info_text_template.c_str(),
+				address.c_str(), m_playername.c_str());
+		Environment->addStaticText(narrow_to_wide_c(info_text_buf), rect, false,
+				true, this, -1);
+	}
+
+	ypos += 120;
+	{
+		core::rect<s32> rect(0, 0, 540, 30);
+		rect += topleft_client + v2s32(30, ypos);
+		gui::IGUIEditBox *e = Environment->addEditBox(m_pass_confirm.c_str(),
+				rect, true, this, ID_confirmPassword);
+		e->setPasswordBox(true);
+	}
+
+	ypos += 90;
+	{
+		core::rect<s32> rect(0, 0, 230, 35);
+		rect = rect + v2s32(size.X / 2 - 220, ypos);
+		text = wgettext("Register and Join");
+		Environment->addButton(rect, this, ID_confirm, text);
+		delete[] text;
+	}
+	{
+		core::rect<s32> rect(0, 0, 120, 35);
+		rect = rect + v2s32(size.X / 2 + 70, ypos);
+		text = wgettext("Cancel");
+		Environment->addButton(rect, this, ID_cancel, text);
+		delete[] text;
+	}
+	{
+		core::rect<s32> rect(0, 0, 200, 20);
+		rect += topleft_client + v2s32(30, ypos - 40);
+		text = wgettext("Passwords do not match!");
+		IGUIElement *e = Environment->addStaticText(
+				text, rect, false, true, this, ID_message);
+		e->setVisible(false);
+		delete[] text;
+	}
+}
+
+void GUIConfirmRegistration::drawMenu()
+{
+	gui::IGUISkin *skin = Environment->getSkin();
+	if (!skin)
+		return;
+	video::IVideoDriver *driver = Environment->getVideoDriver();
+
+	video::SColor bgcolor(140, 0, 0, 0);
+	driver->draw2DRectangle(bgcolor, AbsoluteRect, &AbsoluteClippingRect);
+
+	gui::IGUIElement::draw();
+}
+
+void GUIConfirmRegistration::closeMenu(bool goNext)
+{
+	quitMenu();
+	if (goNext) {
+		m_client->confirmRegistration();
+	} else {
+		*m_aborted = true;
+		infostream << "Connect aborted [Escape]" << std::endl;
+	}
+}
+
+void GUIConfirmRegistration::acceptInput()
+{
+	gui::IGUIElement *e;
+	e = getElementFromId(ID_confirmPassword);
+	if (e)
+		m_pass_confirm = e->getText();
+}
+
+bool GUIConfirmRegistration::processInput()
+{
+	std::wstring m_password_ws = narrow_to_wide(m_password);
+	if (m_password_ws != m_pass_confirm) {
+		gui::IGUIElement *e = getElementFromId(ID_message);
+		if (e)
+			e->setVisible(true);
+		return false;
+	}
+	return true;
+}
+
+bool GUIConfirmRegistration::OnEvent(const SEvent &event)
+{
+	if (event.EventType == EET_KEY_INPUT_EVENT) {
+		if (event.KeyInput.Key == KEY_ESCAPE && event.KeyInput.PressedDown) {
+			closeMenu(false);
+			return true;
+		}
+		if (event.KeyInput.Key == KEY_RETURN && event.KeyInput.PressedDown) {
+			acceptInput();
+			if (processInput())
+				closeMenu(true);
+			return true;
+		}
+	}
+
+	if (event.EventType != EET_GUI_EVENT)
+		return Parent ? Parent->OnEvent(event) : false;
+
+	if (event.GUIEvent.EventType == gui::EGET_ELEMENT_FOCUS_LOST && isVisible()) {
+		if (!canTakeFocus(event.GUIEvent.Element)) {
+			dstream << "GUIConfirmRegistration: Not allowing focus "
+				   "change."
+				<< std::endl;
+			// Returning true disables focus change
+			return true;
+		}
+	} else if (event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED) {
+		switch (event.GUIEvent.Caller->getID()) {
+		case ID_confirm:
+			acceptInput();
+			if (processInput())
+				closeMenu(true);
+			return true;
+		case ID_cancel:
+			closeMenu(false);
+			return true;
+		}
+	} else if (event.GUIEvent.EventType == gui::EGET_EDITBOX_ENTER) {
+		switch (event.GUIEvent.Caller->getID()) {
+		case ID_confirmPassword:
+			acceptInput();
+			if (processInput())
+				closeMenu(true);
+			return true;
+		}
+	}
+
+	return false;
+}
diff --git a/src/gui/guiConfirmRegistration.h b/src/gui/guiConfirmRegistration.h
@@ -0,0 +1,61 @@
+/*
+Minetest
+Copyright (C) 2018 srifqi, Muhammad Rifqi Priyo Susanto
+		<muhammadrifqipriyosusanto@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#pragma once
+
+#include "irrlichttypes_extrabloated.h"
+#include "modalMenu.h"
+#include <string>
+
+class Client;
+
+class GUIConfirmRegistration : public GUIModalMenu
+{
+public:
+	GUIConfirmRegistration(gui::IGUIEnvironment *env, gui::IGUIElement *parent,
+			s32 id, IMenuManager *menumgr, Client *client,
+			const std::string &playername, const std::string &password,
+			const std::string &address, bool *aborted);
+	~GUIConfirmRegistration();
+
+	void removeChildren();
+	/*
+		Remove and re-add (or reposition) stuff
+	*/
+	void regenerateGui(v2u32 screensize);
+
+	void drawMenu();
+
+	void closeMenu(bool goNext);
+
+	void acceptInput();
+
+	bool processInput();
+
+	bool OnEvent(const SEvent &event);
+
+private:
+	Client *m_client = nullptr;
+	const std::string &m_playername;
+	const std::string &m_password;
+	const std::string &m_address;
+	bool *m_aborted = nullptr;
+	std::wstring m_pass_confirm = L"";
+};
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
@@ -96,7 +96,12 @@ void Client::handleCommand_Hello(NetworkPacket* pkt)
 
 	// Authenticate using that method, or abort if there wasn't any method found
 	if (chosen_auth_mechanism != AUTH_MECHANISM_NONE) {
-		startAuth(chosen_auth_mechanism);
+		if (chosen_auth_mechanism == AUTH_MECHANISM_FIRST_SRP
+				&& !m_simple_singleplayer_mode) {
+			promptConfirmRegistration(chosen_auth_mechanism);
+		} else {
+			startAuth(chosen_auth_mechanism);
+		}
 	} else {
 		m_chosen_auth_mech = AUTH_MECHANISM_NONE;
 		m_access_denied = true;