[freeside-commits] freeside/httemplate/view svc_dsl.cgi,1.1,1.2

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/httemplate/view
In directory wavetail.420.am:/tmp/cvs-serv32555/httemplate/view

Modified Files:
	svc_dsl.cgi 
Log Message:
unhack stuff from the last commit, RT7111


Index: svc_dsl.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_dsl.cgi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- svc_dsl.cgi	25 Nov 2010 01:46:34 -0000	1.1
+++ svc_dsl.cgi	25 Nov 2010 02:44:12 -0000	1.2
@@ -35,14 +35,14 @@
     # 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';
@@ -51,11 +51,7 @@
 	# 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
 };