X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Faccess_user.pm;h=5b2cad8dd8f52c58054853a5f3f405e00cd889fc;hb=3438e7d6bea0f7917db89d678d553694094cc599;hp=c5ce1afd1f5ae739aea37dd517b17b4d06810994;hpb=7d3df502cdb301418ea0659e39c48bd940591d4c;p=freeside.git

diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm
index c5ce1afd1..5b2cad8dd 100644
--- a/FS/FS/access_user.pm
+++ b/FS/FS/access_user.pm
@@ -454,7 +454,7 @@ sub access_right {
     unless ( grep !exists($self->{_ACLcache}{$_}), @$rightname ) {
       warn "$me ACL cache hit for ". join(', ', @$rightname). "\n"
         if $DEBUG;
-      return grep $self->{_ACLcache}{$_}, @$rightname
+      return scalar( grep $self->{_ACLcache}{$_}, @$rightname );
     }
 
     warn "$me ACL cache miss for ". join(', ', @$rightname). "\n"
@@ -511,14 +511,16 @@ sub default_customer_view {
 
 }
 
-=item spreadsheet_format
+=item spreadsheet_format [ OVERRIDE ]
 
 Returns a hashref of this user's Excel spreadsheet download settings:
 'extension' (xls or xlsx), 'class' (Spreadsheet::WriteExcel or
-Excel::Writer::XLSX), and 'mime_type'.
+Excel::Writer::XLSX), and 'mime_type'.  If OVERRIDE is 'XLS' or 'XLSX',
+use that instead of the user's setting.
 
 =cut
 
+# is there a better place to put this?
 my %formats = (
   XLS => {
     extension => '.xls',
@@ -535,10 +537,12 @@ my %formats = (
 
 sub spreadsheet_format {
   my $self = shift;
+  my $override = shift;
 
-  my $f = $self->option('spreadsheet_format') 
-       || $conf->config('spreadsheet_format')
-       || 'XLS';
+  my $f =  $override
+        || $self->option('spreadsheet_format') 
+        || $conf->config('spreadsheet_format')
+        || 'XLS';
 
   $formats{$f};
 }