Merge lp:~par-hellstrom/forssim/removedGlobalFTPUser into lp:forssim

[parhe]

[parhe (par-hellstrom)]

Removed the global ftp user, now new users must be added to the ftp-server in the same way as the sql-server.

[Ulrika Dreifaldt (ulrika-dreifaldt)]

very good!

review: Approve

=== modified file 'FsWisdom/ApplicationNode.cpp'
--- FsWisdom/ApplicationNode.cpp	2009-07-16 12:58:12 +0000
+++ FsWisdom/ApplicationNode.cpp	2009-07-17 11:40:10 +0000
@@ -167,18 +167,10 @@
 	cout << "databaseIP: " << databaseIP.toStdString() << endl;
 	cout << "databaseName: " << databaseName.toStdString() << endl;
 
-	ftpUser = settings->value(ftpUserKey, "").toString();
-	if (ftpUser == "")
-		settings->setValue(ftpUserKey, "hiq");
-
 	ftpIP = settings->value(ftpIPKey, "").toString();
 	if (ftpIP == "")
 		settings->setValue(ftpIPKey, "217.151.194.60");
 
-	ftpPassword = settings->value(ftpPasswordKey, "").toString();
-	if (ftpIP == "")
-		settings->setValue(ftpPasswordKey, "hiqhiq");
-
 	/*Create ftp object. Connection is done in RegisterUser after login.*/
 	ftp.reset(new QFtp(this));
 	connect(ftp.get(), SIGNAL(commandFinished(int, bool)),
@@ -282,30 +274,6 @@
 			{
 				this->userId = query.value(0).toInt();
 			}
-			/*This is not needed anymore! New users has to ask Forssim mySQL-admin
-			 * for username and password.
-			 *
-			else
-			{
-				// insert new user
-				QSqlQuery query;
-				query.prepare("INSERT INTO user (name) "
-						"VALUES (:name)");
-				query.bindValue(":name", username);
-
-				if(!query.exec())
-					throw ApplicationNodeException("Failed to create new user in database");
-
-				// read user from database
-				query.prepare("select userId from user where name = :name;");
-				query.bindValue(":name",username);
-
-				if(!query.exec())
-					throw ApplicationNodeException("Failed to read user name from database after reading it");
-
-				query.next();
-				this->userId = query.value(0).toInt();
-			}*/
 		}
 		else
 			throw ApplicationNodeException("Failed to read user name from database");
@@ -313,7 +281,7 @@
 
 	/*Login is ok! Download usercases over ftp.*/
 	ftp->connectToHost(ftpIP);
-	ftp->login(ftpUser,ftpPassword);
+	ftp->login(hashUsername,hashPassword);
 	myCDcommand = ftp->cd("cases");
 
 	/*Ftp download of cases is started when cd command is finished.*/