From c8fdb2861073ffe0084d53ffa519266a082f1275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= <gambas@users.sourceforge.net>
Date: Fri, 24 Oct 2014 23:20:33 +0000
Subject: [PATCH] [CONFIGURATION] * BUG: The gbw3 symbolic link is correctly
 uninstalled now.

[FARM SERVER]
* BUG: Fix registration confirmation message.


git-svn-id: svn://localhost/gambas/trunk@6571 867c0c6c-44f3-4631-809d-bfa615b0a4ec
---
 app/Makefile.am                               | 1 +
 app/src/gambas3-farm-server/.src/MMain.module | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Makefile.am b/app/Makefile.am
index f04470afb..476b3fcf3 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -46,6 +46,7 @@ install-exec-local:
 uninstall-local:
 	@rm -f $(DESTDIR)$(bindir)/gambas$(GAMBAS_VERSION)
 	@rm -f $(DESTDIR)$(bindir)/gbs$(GAMBAS_VERSION)
+	@rm -f $(DESTDIR)$(bindir)/gbw$(GAMBAS_VERSION)
 	@(cd $(srcdir)/src; for p in `cat INSTALL`; do rm -f $(DESTDIR)$(bindir)/$$p.gambas; done)
 
 dist-hook:
diff --git a/app/src/gambas3-farm-server/.src/MMain.module b/app/src/gambas3-farm-server/.src/MMain.module
index c889e18ca..b6a20b392 100644
--- a/app/src/gambas3-farm-server/.src/MMain.module
+++ b/app/src/gambas3-farm-server/.src/MMain.module
@@ -112,6 +112,7 @@ Private Sub RegisterUser()
   sLogin = Request["login"]
   sPassword = Request["password"]
   sName = Request["name"]
+  If Not sName Then sName = sLogin
   sEmail = Request["email"]
   
   If Not sLogin Then
@@ -194,7 +195,7 @@ Private Sub ConfirmRegistration()
   rUser.Update
   
   Response.Begin
-  Print "<h1>Welcome "; Html(sLogin); "</h1><h2>Your account has been successfully activated!</h2>"
+  Print "<h1>Welcome "; Html(rUser!name); "!</h1><h2>Your account has been successfully activated.</h2>"
   Response.End
 
 End