can't use File::Basename::basename for windows filenames! use a regex instead

diff --git a/htetc/global.asa b/htetc/global.asa
index ee5cfcb..2e31be3 100644 (file)
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -9,7 +9,6 @@ use CGI 2.47;
 use Date::Format;
 use Date::Parse;
 use Time::Local;
 use Date::Format;
 use Date::Parse;
 use Time::Local;

-use File::Basename;

 use Tie::IxHash;
 use HTML::Entities;
 use IO::Handle;
 use Tie::IxHash;
 use HTML::Entities;
 use IO::Handle;

diff --git a/htetc/handler.pl b/htetc/handler.pl
index b007353..ba73bcf 100644 (file)
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -67,7 +67,6 @@ sub handler
       use Date::Format;
       use Date::Parse;
       use Time::Local;
       use Date::Format;
       use Date::Parse;
       use Time::Local;

-      use File::Basename;

       use Tie::IxHash;
       use HTML::Entities;
       use IO::Handle;
       use Tie::IxHash;
       use HTML::Entities;
       use IO::Handle;

diff --git a/httemplate/misc/upload-batch.cgi b/httemplate/misc/upload-batch.cgi
index 565a6da..cc53466 100644 (file)
--- a/httemplate/misc/upload-batch.cgi
+++ b/httemplate/misc/upload-batch.cgi
@@ -2,7 +2,8 @@
 
   my $fh = $cgi->upload('batch_results');
   my $filename = $cgi->param('batch_results');
 
   my $fh = $cgi->upload('batch_results');
   my $filename = $cgi->param('batch_results');

-  my $paybatch = basename($filename);
+  $filename =~ /^.*[\/\\]([^\/\\]+)$/ or die;
+  my $paybatch = $1;

 
   my $error = defined($fh)
     ? FS::cust_pay_batch::import_results( {
 
   my $error = defined($fh)
     ? FS::cust_pay_batch::import_results( {