Replaced ReadKey and <STDIN> with IO::Prompt

awit-ssh

@@ -38,11 +38,13 @@ if (!eval {require Net::LDAP; 1;}) {
 	print STDERR "You're missing Net::LDAP, try 'apt-get install libnet-ldap-perl'\n";
 	exit 1;
 }
-# Check Term::ReadKey
-if (!eval {require Term::ReadKey; 1;}) {
-	print STDERR "You're missing Term::ReadKey, try 'apt-get install libterm-readkey-perl'\n";
+# Check IO::Prompt
+if (!eval {require IO::Prompt; 1;}) {
+	print STDERR "You're missing IO::Prompt, try 'apt-get install libio-prompt-perl'\n";
 	exit 1;
 }
+
+use IO::Prompt qw( prompt );
 use User::pwent;
 
 
@@ -211,12 +213,7 @@ KWALLET_END:
 
 # If kwallet returned nothing, try read from terminal
 if (!defined($password) || $password eq "") {
-	print STDERR "Your LDAP Password: ";
-	# Don't echo password
-	Term::ReadKey::ReadMode('noecho');
-	chomp($password = <STDIN>);
-	# Turn echo back on
-	Term::ReadKey::ReadMode(0);
+	$password = prompt("Your LDAP Password: ", '-echo' => "*");
 }
 print STDERR "\n";
 
@@ -271,9 +268,25 @@ if ($ldapNumResults < 1) {
 		logger('MENU '.$counter,"  ".color('red')."%s".color('reset'),$key);
 		$counter++;
 	}
-	print STDERR "Your selection: ";
-	chomp(my $menuSelection = <STDIN>);
-	if ($menuSelection =~ /\D/) {
+	my $menuSelection = prompt("Your selection [1-$ldapNumResults,q]: ",
+		'-onechar',
+		'-require' => {
+			"Invalid Value - Your selection [1-$ldapNumResults,q]: " => sub {
+				my $val = $_;
+				return (
+						# Check if is numeric and its within range
+						$val =~ /^\d$/ &&
+						$val > 0 &&
+						$val <= $ldapNumResults
+					) || (
+						# Else our only other option we accept is 'q'
+						$val eq "q"
+					);
+			}
+		}
+	);
+	if ($menuSelection eq "q") {
+		print STDERR "Exiting...\n";
 		exit 3;
 	}
 	$menuSelection--;