|
@@ -336,11 +336,11 @@ function block_unblock_subject {
|
336
|
336
|
if [[ $BLOCK == "y"* || $BLOCK == "Y"* ]]; then
|
337
|
337
|
${PROJECT_NAME}-ignore -u $USER -t "$BLOCK_SUBJECT"
|
338
|
338
|
dialog --title $"Block an email" \
|
339
|
|
- --msgbox "Email with subject $BLOCK_SUBJECT is now blocked" 6 40
|
|
339
|
+ --msgbox $"Email with subject $BLOCK_SUBJECT is now blocked" 6 40
|
340
|
340
|
else
|
341
|
341
|
${PROJECT_NAME}-unignore -u $USER -t "$BLOCK_SUBJECT"
|
342
|
342
|
dialog --title $"Unblock an email" \
|
343
|
|
- --msgbox "Email with subject $BLOCK_SUBJECT is now unblocked" 6 40
|
|
343
|
+ --msgbox $"Email with subject $BLOCK_SUBJECT is now unblocked" 6 40
|
344
|
344
|
fi
|
345
|
345
|
}
|
346
|
346
|
|
|
@@ -351,10 +351,32 @@ function show_gpg_key {
|
351
|
351
|
GPG_DATE=$(gpg --fingerprint $MY_EMAIL_ADDRESS | grep -i "pub" | head -n 1 | awk -F '/' '{print $2}' | awk -F ' ' '{print $2}')
|
352
|
352
|
dialog --title $"Your PGP/GPG Key" \
|
353
|
353
|
--backtitle $"Freedombone User Control Panel" \
|
354
|
|
- --msgbox "Email Address: $MY_EMAIL_ADDRESS\n\nKey ID: $GPG_ID\n\nFingerprint: $GPG_FINGERPRINT\n\nCreated: $GPG_DATE" 12 70
|
|
354
|
+ --msgbox $"Email Address: $MY_EMAIL_ADDRESS\n\nKey ID: $GPG_ID\n\nFingerprint: $GPG_FINGERPRINT\n\nCreated: $GPG_DATE" 12 70
|
355
|
355
|
}
|
356
|
356
|
|
357
|
357
|
function add_gpg_key {
|
|
358
|
+ data=$(tempfile 2>/dev/null)
|
|
359
|
+ trap "rm -f $data" 0 1 2 5 15
|
|
360
|
+ dialog --title $"Add someone's PGP/GPG key" \
|
|
361
|
+ --backtitle $"Freedombone User Control Panel" \
|
|
362
|
+ --inputbox $"Enter their email address below" 8 60 2>$data
|
|
363
|
+ sel=$?
|
|
364
|
+ case $sel in
|
|
365
|
+ 0)
|
|
366
|
+ ADD_EMAIL_ADDRESS=$(<$data)
|
|
367
|
+ if [ ${#ADD_EMAIL_ADDRESS} -gt 1 ]; then
|
|
368
|
+ if [[ $ADD_EMAIL_ADDRESS == *"@"* && $ADD_EMAIL_ADDRESS == *"."* ]]; then
|
|
369
|
+ clear
|
|
370
|
+ gpg --search-keys $ADD_EMAIL_ADDRESS
|
|
371
|
+ else
|
|
372
|
+ dialog --title $"Unrecognised email address" \
|
|
373
|
+ --backtitle $"Freedombone User Control Panel" \
|
|
374
|
+ --msgbox $"This doesn't look like an email address" 6 50
|
|
375
|
+ fi
|
|
376
|
+ fi
|
|
377
|
+ ;;
|
|
378
|
+ esac
|
|
379
|
+
|
358
|
380
|
}
|
359
|
381
|
|
360
|
382
|
function remove_gpg_key {
|