added command listinfo

1 files changed, 27 insertions, 15 deletions

diff --git a/firma b/firma
index c46ff6c..b16afd8 100755
--- a/firma
+++ b/firma
@@ -1104,16 +1104,17 @@ function AdminHelp {
 
   # this will be printed to STDOUT, so no indentation here
   echo "
-  quit                 quit the admin prompt
-  help                 show this help
-  list                 show list subscribers
-  config               list configuration
-  info EMAIL-ADDRESS   show info of a given subscriber
-  sendkey SUBSCRIBER   send list pubkey to subscriber
-  subscribe [..]       subscribe users ('subscribe help' for options)
-  use EMAIL-ADDRESS    use the given address for message delivery instead
-                       of the primary address on key
-  unsub EMAIL-ADDRESS  unsubscribe an email from the list
+  quit                             quit the admin prompt
+  help                             show this help
+  list                             show list subscribers
+  listinfo                         show list information
+  config                           list configuration
+  info EMAIL-ADDRESS               show info of a given subscriber
+  sendkey SUBSCRIBER               send list pubkey to subscriber
+  sub|subscribe [..]               subscribe users ('subscribe help' for options)
+  unsub|unsubscribe EMAIL-ADDRESS  unsubscribe an email from the list
+  use EMAIL-ADDRESS                use the given address for message delivery instead
+                                   of the primary address on key
 "
 }
 
@@ -1150,7 +1151,7 @@ function ListAdministration {
           AdminLog "$1: missing arguments (try \"help\")"
           return_code=1
           ;;
-        unsub)
+        unsub|unsubscribe)
           AdminLog "$1: missing arguments (try \"help\")"
           return_code=1
           ;;
@@ -1160,7 +1161,7 @@ function ListAdministration {
             AdminLog "  $subscriber"
           done
           ;;
-        subscribe)
+        sub|subscribe)
           AdminLog "$1: missing arguments (try \"$1 help\")"
           return_code=1 
           ;;
@@ -1172,6 +1173,9 @@ function ListAdministration {
           AdminLog "$1: missing arguments (try \"help\")."
           return_code=1 
           ;;
+        listinfo)
+          GetSubscribersInfo $LIST_ADDRESS
+          ;;
         config)
           AdminLog "$1: missing arguments (try \"$1 help\")."
           return_code=1
@@ -1193,11 +1197,11 @@ function ListAdministration {
             return_code=1
           fi
           ;;
-        unsub)
+        unsub|unsubscribe)
           UnsubscribeUser $2
           return_code=$?
           ;;
-        subscribe)
+        sub|subscribe)
           SubscribeUsers $2
           return_code=$?
           ;;
@@ -1209,6 +1213,10 @@ function ListAdministration {
           GetSubscribersInfo $2
           return_code=$?
           ;;
+        listinfo)
+          AdminLog "$1: too many arguments -- $@ (try \"help\")"
+          return_code=1
+          ;;
         config)
           if [ "$2" == "help" ]; then
             ConfigHelp
@@ -1234,7 +1242,7 @@ function ListAdministration {
           AdminLog "$1: too many arguments -- $@ (try \"help\")"
           return_code=1
           ;;
-        subscribe)
+        sub|subscribe)
           shift
           SubscribeUsers $*
           return_code=$?
@@ -1249,6 +1257,10 @@ function ListAdministration {
           GetSubscribersInfo $*
           return_code=$?
           ;;
+        listinfo)
+          AdminLog "$1: too many arguments -- $@ (try \"help\")"
+          return_code=1
+          ;;
         *)
           AdminLog "Command not found -- $1 (try \"help\")"
           return_code=1