[Ispman-cvs] CVS: ispman-utils/bin ispman.listUserQuotas,1.1.2.1,1.1.2.2

[Atif G. <ma...@us...>]

Update of /cvsroot/ispman/ispman-utils/bin
In directory usw-pr-cvs1:/tmp/cvs-serv28173

Modified Files:
      Tag: REL_0_9
	ispman.listUserQuotas 
Log Message:
added FTPQuota and default filter

Index: ispman.listUserQuotas
===================================================================
RCS file: /cvsroot/ispman/ispman-utils/bin/Attic/ispman.listUserQuotas,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** ispman.listUserQuotas	25 Jul 2002 04:51:18 -0000	1.1.2.1
--- ispman.listUserQuotas	25 Jul 2002 04:59:50 -0000	1.1.2.2
***************
*** 14,18 ****
  
  
! my $uid_filter=$ARGV[0];
  
  my $users=$ispman->getEntriesAsHashRef($ispman->{'Config'}{'ldapBaseDN'},  "&(objectclass=ispmanDomainUser)(uid=$uid_filter)");
--- 14,18 ----
  
  
! my $uid_filter=$ARGV[0] || '*';
  
  my $users=$ispman->getEntriesAsHashRef($ispman->{'Config'}{'ldapBaseDN'},  "&(objectclass=ispmanDomainUser)(uid=$uid_filter)");
***************
*** 23,26 ****
--- 23,27 ----
     $uid=$uids[0];
     $mailQuota=$users->{$_}{'mailQuota'};
+    $ftpQuota=$users->{$_}{'FTPQuotaMBytes'};
     $mailbox=join "", ($mailbox_prefix, $uid);
     @q=$imap->get_quota($mailbox);
***************
*** 31,36 ****
  
  format STDOUT_TOP =
! UID                       MailQuota  MailQuota QuotaUsed
!                              (LDAP)    Cyrus
  -------------------------------------------------------------------------------
  .
--- 32,37 ----
  
  format STDOUT_TOP =
! UID                       FTPQuota MailQuota  MailQuota MailQuota
!                             MBytes  (in LDAP)    Cyrus    Used
  -------------------------------------------------------------------------------
  .
***************
*** 38,43 ****
  
  format STDOUT =
! @<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<< @<<<<<<<<<< @<<<<<<<<<< 
! $uid, $mailQuota , $q[2], $q[1]
  .
  
--- 39,44 ----
  
  format STDOUT =
! @<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<< @<<<<<<<<<< @<<<<<<<<<< @<<<<<<<<<< 
! $uid, $ftpQuota, $mailQuota , $q[2], $q[1]
  .