From 6f980ae5697a6e0cd5459bae448020b498c85bd2 Mon Sep 17 00:00:00 2001
From: levinse <levinse>
Date: Thu, 25 Nov 2010 02:44:12 +0000
Subject: [PATCH] unhack stuff from the last commit, RT7111

---
 FS/FS/part_export/ikano.pm  |  2 +-
 httemplate/view/svc_dsl.cgi | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/FS/FS/part_export/ikano.pm b/FS/FS/part_export/ikano.pm
index c44db64d1..b14f3a4d6 100644
--- a/FS/FS/part_export/ikano.pm
+++ b/FS/FS/part_export/ikano.pm
@@ -37,7 +37,7 @@ sub dsl_pull {
 }
 
 sub status_line {
-    my($svc_dsl,$date_format,$separator) = (shift,shift,shift);
+    my($self,$svc_dsl,$date_format,$separator) = (shift,shift,shift,shift);
     my %orderTypes = ( 'N' => 'New', 'X' => 'Cancel', 'C' => 'Change' );
     my %orderStatus = ( 'N' => 'New', 'P' => 'Pending', 'X' => 'Cancelled',
 			'C' => 'Completed', 'E' => 'Error' );
diff --git a/httemplate/view/svc_dsl.cgi b/httemplate/view/svc_dsl.cgi
index a4b2d4327..b460c010e 100644
--- a/httemplate/view/svc_dsl.cgi
+++ b/httemplate/view/svc_dsl.cgi
@@ -35,14 +35,14 @@ my $svc_cb = sub {
     # default behaviour implemented above
     return if ( scalar(@exports) == 0 );
 
+    my $export = @exports[0];
     $opt->{'disable_unprovision'} = 1;
-    my $exporttype = @exports[0]->exporttype;	
 
     # XXX: AJAX auto-pull
 	
     @fields = qw( svctn first last company username password );
 
-    if($exporttype eq 'ikano') {
+    if($export->exporttype eq 'ikano') {
 	push @fields, 'isp_chg';
 	push @fields, 'isp_prev';
 	push @fields, 'staticips';
@@ -50,12 +50,8 @@ my $svc_cb = sub {
     else {
 	# XXX
     }
-    
-    # hack against "can't use string ... as a subroutine ref while 'strict refs' in use"
-    my $statusSub = \&{'FS::part_export::'.$exporttype.'::status_line'};
-    my $statusLine = &$statusSub($svc_x,$date_format,"<BR>");
-    
-    $footer = "<B>$statusLine</B>";
+   
+    $footer = "<B>".$export->status_line($svc_x,$date_format,"<BR>")."</B>";
 
     # XXX: notes
 };
-- 
2.11.0