Use more descriptive variables in loops.

1 files changed, 12 insertions, 12 deletions

diff --git a/localmkpostfixvirtual b/localmkpostfixvirtual
index b89c7f4..f093d00 100755
--- a/localmkpostfixvirtual
+++ b/localmkpostfixvirtual
@@ -3,7 +3,7 @@
 # /usr/local/sbin/localmkpostfixvirtual
 # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk>
 #
-# $Id: localmkpostfixvirtual,v 1.18 2005-02-25 13:15:09 jonas Exp $
+# $Id: localmkpostfixvirtual,v 1.19 2006-08-02 16:00:12 jonas Exp $
 #
 # Generate virtual file for postfix
 #
@@ -83,8 +83,8 @@ if [ $# -lt 1 ]; then
 else
 	mailgroups="$@"
 fi
-for gid in $mailgroups; do
-	for maildomainchunk in `get_other_field $gid`; do
+for mailgroup in $mailgroups; do
+	for maildomainchunk in `get_other_field $mailgroup`; do
 		for maildomain in `get_domain $maildomainchunk`; do
 			if [ $loop ]; then
 				echo
@@ -95,19 +95,19 @@ for gid in $mailgroups; do
 			print_accounts root "$maildomain" "$maildomain VIRTUAL" "postmaster@$maildomain root"
 			mailgroupowners=""
 			mailusers=""
-			mailgroups="`get_roomnumber_field $gid`"
-			test -z "$mailgroups" && mailgroups=$gid
-			for mailgroup in $mailgroups; do
-				mailgroupowners="$mailgroupowners `members -p $mailgroup`"
-				mailusers="$mailusers `members -s $mailgroup`"
+			mailgroupgroups="`get_roomnumber_field $mailgroup`"
+			test -z "$mailgroupgroups" && mailgroupgroups="$mailgroup"
+			for mailgroupgroup in $mailgroupgroups; do
+				mailgroupowners="$mailgroupowners `members -p "$mailgroupgroup"`"
+				mailusers="$mailusers `members -s "$mailgroupgroup"`"
 			done
 			# Do mailgroup owners (and don't warn if there's no addresses attached)
-			for uid in `sort_u $mailgroupowners`; do
-				print_accounts $uid "$maildomain" "# `get_fullname_field $uid` (`get_groups $uid`)" ""
+			for mailgroupowner in `sort_u $mailgroupowners`; do
+				print_accounts $mailgroupowner "$maildomain" "# `get_fullname_field "$mailgroupowner"` (`get_groups "$mailgroupowner"`)" ""
 			done
 			# Do secondary mailgroup members
-			for uid in `sort_u $mailusers`; do
-				print_accounts $uid "$maildomain" "# `get_fullname_field $uid` (`get_groups $uid`)" "#WARNING: No addresses for $uid"
+			for mailuser in `sort_u $mailusers`; do
+				print_accounts "$mailuser" "$maildomain" "# `get_fullname_field "$mailuser"` (`get_groups "$mailuser"`)" "#WARNING: No addresses for $mailuser"
 			done
 		done
 	done