Remove by key id

This commit is contained in:
Bob Mottram 2017-01-25 23:11:14 +00:00
parent 703e53ccf9
commit 63f8de0023
1 changed files with 9 additions and 4 deletions

View File

@ -469,7 +469,7 @@ function remove_gpg_key {
trap "rm -f $data" 0 1 2 5 15
dialog --title $"Remove someone's PGP/GPG key" \
--backtitle $"Freedombone User Control Panel" \
--inputbox $"Enter their email address below" 8 60 2>$data
--inputbox $"Enter their email address or key ID below" 8 60 2>$data
sel=$?
case $sel in
0)
@ -485,9 +485,14 @@ function remove_gpg_key {
--msgbox $"It's not a good idea to remove your own encryption key" 6 65
fi
else
dialog --title $"Unrecognised email address" \
--backtitle $"Freedombone User Control Panel" \
--msgbox $"This doesn't look like an email address" 6 50
if [[ $REMOVE_EMAIL_ADDRESS == "0x"* ]]; then
clear
gpg --delete-key $REMOVE_EMAIL_ADDRESS
else
dialog --title $"Unrecognised email address" \
--backtitle $"Freedombone User Control Panel" \
--msgbox $"This doesn't look like an email address" 6 50
fi
fi
fi
;;