--- trunk/installer/ncurses-gui/usermanagement.sh	2010/05/30 18:29:43	1034
+++ trunk/installer/ncurses-gui/usermanagement.sh	2010/05/30 18:37:54	1035
@@ -2,8 +2,6 @@
 
 root_password_dialog()
 {
-	#ROOT_PASSWORD=$(passwordbox "root" "Enter a password for root:" 10 50)
-	#ROOT_PASSWORD_RETYPE=$(passwordbox "root" "Re-enter the password:" 10 50)
 	dialog \
 		--stdout \
 		--colors \
@@ -18,13 +16,6 @@
 
 add_user_dialog()
 {
-	#USER_NAME=$(inputbox "Create a user" "Please enter a username for daily use:" 10 50)
-	#if [[ ! -z ${USER_NAME} ]]
-	#then
-	#	USER_PASSWORD=$(passwordbox "${USER_NAME}" "Enter a password for '${USER_NAME}':" 10 50)
-	#	USER_PASSWORD_RETYPE=$(passwordbox "${USER_NAME}" "Enter a password for '${USER_NAME}':" 10 50)
-	#fi
-
 	dialog \
 		--stdout \
 		--colors \
@@ -59,24 +50,6 @@
 
 rundialog_root_password_dialog()
 {
-#	root_password_dialog
-# 	case $? in
-# 		-1)	die "Error!" ;;
-# 		255)	die "aborted by user" ;;
-# 
-# 		1)
-# 			root_password_dialog
-# 			;;
-# 
-# 		0)
-# 			export ROOT_PASSWORD
-# 			if ! check_password "${ROOT_PASSWORD}" "${ROOT_PASSWORD_RETYPE}"
-# 			then
-# 				rundialog_root_password_dialog
-# 			fi
-# 			;;
-# 	esac
-
 	local ROOT_USER_SETUP
 	ROOT_USER_SETUP=($(root_password_dialog))
 	case $? in
@@ -88,12 +61,6 @@
 			;;
 
 		0)
-			#export ROOT_PASSWORD
-			#if ! check_password "${ROOT_PASSWORD}" "${ROOT_PASSWORD_RETYPE}"
-			#then
-			#	rundialog_root_password_dialog
-			#fi
-
 			# root username is array item 0!
 			ROOT_PASSWORD="${ROOT_USER_SETUP[1]}"
 			ROOT_PASSWORD_RETYPE="${ROOT_USER_SETUP[2]}"
@@ -116,31 +83,6 @@
 
 rundialog_add_user_dialog()
 {
-# 	add_user_dialog
-# 	case $? in
-# 		-1)	die "Error!" ;;
-# 		255)	die "aborted by user" ;;
-# 
-# 		1)
-# 			rundialog_root_password_dialog
-# 			rundialog_add_user_dialog
-# 			;;
-# 
-# 		0)
-# 			export USER_NAME
-# 			export USER_PASSWORD
-# 			if [[ -z ${USER_NAME} ]]
-# 			then
-# 				messagebox "Warning" "No username given!" 10 40
-# 				rundialog_add_user_dialog
-# 			fi
-# 			if ! check_password "${USER_PASSWORD}" "${USER_PASSWORD_RETYPE}"
-# 			then
-# 				rundialog_add_user_dialog
-# 			fi
-# 			;;
-# 	esac
-
 	local USER_SETUP
 	USER_SETUP=($(add_user_dialog))
 	case $? in
@@ -153,18 +95,6 @@
 			;;
 
 		0)
-# 			export USER_NAME
-# 			export USER_PASSWORD
-# 			if [[ -z ${USER_NAME} ]]
-# 			then
-# 				messagebox "Warning" "No username given!" 10 40
-# 				rundialog_add_user_dialog
-# 			fi
-# 			if ! check_password "${USER_PASSWORD}" "${USER_PASSWORD_RETYPE}"
-# 			then
-# 				rundialog_add_user_dialog
-# 			fi
-
 			USER_NAME="${USER_SETUP[0]}"
 			USER_PASSWORD="${USER_SETUP[1]}"
 			USER_PASSWORD_RETYPE="${USER_SETUP[2]}"