X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=maps%2Fbin%2Fexportlist.cgi;h=70907ba50995cedc8cec3ba5261187b93b4cc4ab;hb=7ddf095f187ca60d9a70fb83b2bc3c2b6d91f088;hp=d1900e4562e3639f0242ee3ef85953458a7e3728;hpb=16babf81ce331af378de565ba73e927ff5491f65;p=clearscm.git

diff --git a/maps/bin/exportlist.cgi b/maps/bin/exportlist.cgi
index d1900e4..70907ba 100755
--- a/maps/bin/exportlist.cgi
+++ b/maps/bin/exportlist.cgi
@@ -18,6 +18,7 @@ use FindBin;
 local $0 = $FindBin::Script;
 
 use lib "$FindBin::Bin/../lib";
+use lib "$FindBin::Bin/../../lib";
 
 use MAPS;
 use MAPSWeb;
@@ -35,9 +36,6 @@ sub PrintList($) {
 
   my $year = substr((scalar(localtime)), 20, 4);
 
-  my ($pattern, $domain, $comment, $hit_count, $last_hit);
-  my $sth = FindList($type);
-
   print "\################################################################################\n";
   print "\#\n";
   print "\# MAPS:\t\tMail Authorization and Permission System (MAPS)\n";
@@ -48,16 +46,23 @@ sub PrintList($) {
   print "\#\n";
   print "\################################################################################\n";
 
-  while (($_, $_, $pattern, $domain, $comment, $_, $hit_count, $last_hit) = GetList($sth)) {
-    last if !(defined $pattern or defined $domain);
-
-    $pattern //= '';
-    $domain  //= '';
-
-    if ($domain eq '') {
-      print "$pattern,$comment,$hit_count,$last_hit\n";
+  FindList(
+    userid   => $userid,
+    type     => $type,
+  );
+
+  while (my $rec = GetList) {
+    $rec->{pattern}   //= '';
+    $rec->{domain}    //= '';
+    $rec->{comment}   //= '';
+    $rec->{hit_count} //= 0;
+    $rec->{last_hit}  //= '';
+    $rec->{retention} //= '';
+
+    if ($rec->{domain} eq '') {
+      print "$rec->{pattern},$rec->{comment},$rec->{hit_count},$rec->{last_hit},$rec->{retention}\n";
     } else {
-      print "$pattern\@$domain,$comment,$hit_count,$last_hit\n";
+      print "$rec->{pattern}\@$rec->{domain},$rec->{comment},$rec->{hit_count},$rec->{last_hit},$rec->{retention}\n";
     } # if
   } # while