small fixes

diff --git a/firma b/firma
index d003c9b34f48dbd2691379237b6b56aa7e6ffdcf..51edd34268bd778327b17c4e2ebed3c5695a05e7 100755 (executable)
--- a/firma
+++ b/firma
@@ -1155,7 +1155,7 @@ function CheckValidEmail {
   #          1 if not
   #-------------------------------------------------------------
 
-  if ! echo $2 | grep -q '[^@]\+@[^@]\+'; then
+  if ! echo $1 | grep -q '[^@]\+@[^@]\+'; then
     return 1
   else
     return 0
@@ -1177,8 +1177,6 @@ function UnsubscribeUser {
   local key
   local -i return_code=0
   local keyid="$($GPG_LIST_KEYS --with-fingerprint $1 2> /dev/null | grep ^fpr | cut -d : -f 10)"
-  local uid_count="$($GPG_LIST_KEYS --fixed-list-mode $keyid 2> /dev/null | grep ^uid | wc -l)"
-  local chosen_uid_number="$($GPG_LIST_KEYS --fixed-list-mode $keyid 2> /dev/null | grep ^uid | grep -ni "$1" | cut -d : -f 1)"
 
   if [ "$1" == "$LIST_ADDRESS" ]; then
     # check if user is trying to unsubscribe the list key